From: Johan Hovold Date: Wed, 9 Mar 2016 11:20:42 +0000 (+0100) Subject: greybus: interface: rename initialisation function X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=35580af0bd620056506ed51fff024fc4ade66f67;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git greybus: interface: rename initialisation function Rename the interface-initialisation function gb_interface_enable(), which is more descriptive. Signed-off-by: Johan Hovold Reviewed-by: Viresh Kumar Reviewed-by: Jeffrey Carlyle Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/greybus/interface.c b/drivers/staging/greybus/interface.c index ebf008161120..072e7c5a72e6 100644 --- a/drivers/staging/greybus/interface.c +++ b/drivers/staging/greybus/interface.c @@ -168,10 +168,10 @@ void gb_interface_remove(struct gb_interface *intf) } /* - * Intialise an interface by enabling the control connection and fetching the + * Enable an interface by enabling its control connection and fetching the * manifest and other information over it. */ -int gb_interface_init(struct gb_interface *intf) +int gb_interface_enable(struct gb_interface *intf) { struct gb_bundle *bundle, *tmp; int ret, size; diff --git a/drivers/staging/greybus/interface.h b/drivers/staging/greybus/interface.h index 7fc7d29257d9..4b69e9ee9070 100644 --- a/drivers/staging/greybus/interface.h +++ b/drivers/staging/greybus/interface.h @@ -47,7 +47,7 @@ struct gb_interface *gb_interface_find(struct gb_host_device *hd, struct gb_interface *gb_interface_create(struct gb_host_device *hd, u8 interface_id); -int gb_interface_init(struct gb_interface *intf); +int gb_interface_enable(struct gb_interface *intf); int gb_interface_add(struct gb_interface *intf); void gb_interface_remove(struct gb_interface *intf); diff --git a/drivers/staging/greybus/svc.c b/drivers/staging/greybus/svc.c index 446cb25b49c0..631a76965b53 100644 --- a/drivers/staging/greybus/svc.c +++ b/drivers/staging/greybus/svc.c @@ -626,9 +626,9 @@ static void gb_svc_process_intf_hotplug(struct gb_operation *operation) if (ret) goto out_interface_add; - ret = gb_interface_init(intf); + ret = gb_interface_enable(intf); if (ret) { - dev_err(&svc->dev, "failed to initialize interface %u: %d\n", + dev_err(&svc->dev, "failed to enable interface %u: %d\n", intf_id, ret); goto out_interface_add; }