Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35a84ba7 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

greybus: use decimal notation for interface and cport ids 



Fix up the few places where hexadecimal rather than decimal notation was
used for interface and cport ids.

Note that this includes the endo sysfs-attribute for the AP interface
id.

Signed-off-by: default avatarJohan Hovold <johan@hovoldconsulting.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent febe2521

drivers/staging/greybus/endo.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static ssize_t ap_intf_id_show(struct device *dev, 
{

	struct gb_endo *endo = to_gb_endo(dev);



	return sprintf(buf, "0x%02x\n", endo->ap_intf_id);

	return sprintf(buf, "%u\n", endo->ap_intf_id);

}

static DEVICE_ATTR_RO(ap_intf_id);

drivers/staging/greybus/interface.c

+1 −2
Original line number Diff line number Diff line
@@ -157,8 +157,7 @@ struct gb_interface *gb_interface_create(struct gb_host_device *hd, 


	retval = device_add(&intf->dev);

	if (retval) {

		pr_err("failed to add interface device for id 0x%02hhx\n",

		       interface_id);

		pr_err("failed to add interface %u\n", interface_id);

		goto free_intf;

	}

drivers/staging/greybus/svc.c

+2 −2
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ void gb_svc_connection_destroy(struct gb_svc *svc, u8 intf1_id, u16 cport1_id, 
	ret = gb_operation_sync(connection, GB_SVC_TYPE_CONN_DESTROY,

				&request, sizeof(request), NULL, 0);

	if (ret)

		pr_err("failed to destroy connection (%hhx:%hx %hhx:%hx) %d\n",

		pr_err("failed to destroy connection (%hhu:%hu %hhu:%hu) %d\n",

		       intf1_id, cport1_id, intf2_id, cport2_id, ret);

}

EXPORT_SYMBOL_GPL(gb_svc_connection_destroy);
@@ -300,7 +300,7 @@ static void gb_svc_route_destroy(struct gb_svc *svc, u8 intf1_id, u8 intf2_id) 
	ret = gb_operation_sync(svc->connection, GB_SVC_TYPE_ROUTE_DESTROY,

				&request, sizeof(request), NULL, 0);

	if (ret)

		pr_err("failed to destroy route (%hhx %hhx) %d\n",

		pr_err("failed to destroy route (%hhu %hhu) %d\n",

			intf1_id, intf2_id, ret);

}