aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGravatar Viresh Kumar <viresh.kumar@linaro.org> 2015-05-20 17:33:51 +0530
committerGravatar Greg Kroah-Hartman <gregkh@google.com> 2015-05-20 22:39:18 -0700
commit51b5d8d783fe8ee6b272f09ef645747e53166c7f (patch)
treea4b156fe354f144ea0b4cb68aad6b9c8d7ac8c05 /drivers
parentgreybus: endo: name routines consistently (diff)
downloadlinux-51b5d8d783fe8ee6b272f09ef645747e53166c7f.tar.gz
linux-51b5d8d783fe8ee6b272f09ef645747e53166c7f.tar.bz2
linux-51b5d8d783fe8ee6b272f09ef645747e53166c7f.zip
greybus: interface: name routines consistently
Routines should be named this way: gb_<object>_<operation>. Fix all routines that don't match this. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Alex Elder <elder@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/greybus/ap.c4
-rw-r--r--drivers/staging/greybus/core.c2
-rw-r--r--drivers/staging/greybus/interface.c12
-rw-r--r--drivers/staging/greybus/interface.h6
4 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/greybus/ap.c b/drivers/staging/greybus/ap.c
index 1dc13396a567..843ddc24f41c 100644
--- a/drivers/staging/greybus/ap.c
+++ b/drivers/staging/greybus/ap.c
@@ -175,7 +175,7 @@ static void svc_hotplug(struct svc_function_hotplug *hotplug,
return;
}
dev_dbg(hd->parent, "interface id %d added\n", interface_id);
- gb_add_interface(hd, interface_id, hotplug->data,
+ gb_interface_add(hd, interface_id, hotplug->data,
payload_length - 0x02);
break;
@@ -189,7 +189,7 @@ static void svc_hotplug(struct svc_function_hotplug *hotplug,
return;
}
dev_dbg(hd->parent, "interface id %d removed\n", interface_id);
- gb_remove_interface(hd, interface_id);
+ gb_interface_remove(hd, interface_id);
break;
default:
diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c
index db1da8a37787..45fa4c3dfd2b 100644
--- a/drivers/staging/greybus/core.c
+++ b/drivers/staging/greybus/core.c
@@ -215,7 +215,7 @@ void greybus_remove_hd(struct greybus_host_device *hd)
* with this host controller before freeing the memory associated with
* the host controller.
*/
- gb_remove_interfaces(hd);
+ gb_interfaces_remove(hd);
gb_endo_remove(hd->endo);
kref_put_mutex(&hd->kref, free_hd, &hd_mutex);
}
diff --git a/drivers/staging/greybus/interface.c b/drivers/staging/greybus/interface.c
index 28b3c4fccf24..7a4c7dc2e941 100644
--- a/drivers/staging/greybus/interface.c
+++ b/drivers/staging/greybus/interface.c
@@ -54,7 +54,7 @@ struct gb_interface *gb_interface_find(struct greybus_host_device *hd,
return NULL;
}
-static void greybus_interface_release(struct device *dev)
+static void gb_interface_release(struct device *dev)
{
struct gb_interface *intf = to_gb_interface(dev);
@@ -63,7 +63,7 @@ static void greybus_interface_release(struct device *dev)
struct device_type greybus_interface_type = {
.name = "greybus_interface",
- .release = greybus_interface_release,
+ .release = gb_interface_release,
};
/*
@@ -161,12 +161,12 @@ static void gb_interface_destroy(struct gb_interface *intf)
}
/**
- * gb_add_interface
+ * gb_interface_add
*
* Pass in a buffer that _should_ contain a Greybus manifest
* and register a greybus device structure with the kernel core.
*/
-void gb_add_interface(struct greybus_host_device *hd, u8 interface_id, u8 *data,
+void gb_interface_add(struct greybus_host_device *hd, u8 interface_id, u8 *data,
int size)
{
struct gb_interface *intf;
@@ -201,7 +201,7 @@ err_parse:
gb_interface_destroy(intf);
}
-void gb_remove_interface(struct greybus_host_device *hd, u8 interface_id)
+void gb_interface_remove(struct greybus_host_device *hd, u8 interface_id)
{
struct gb_interface *intf = gb_interface_find(hd, interface_id);
@@ -212,7 +212,7 @@ void gb_remove_interface(struct greybus_host_device *hd, u8 interface_id)
interface_id);
}
-void gb_remove_interfaces(struct greybus_host_device *hd)
+void gb_interfaces_remove(struct greybus_host_device *hd)
{
struct gb_interface *intf, *temp;
diff --git a/drivers/staging/greybus/interface.h b/drivers/staging/greybus/interface.h
index 9ee5b551029e..88a7a8056806 100644
--- a/drivers/staging/greybus/interface.h
+++ b/drivers/staging/greybus/interface.h
@@ -47,10 +47,10 @@ static inline void *gb_interface_get_drvdata(struct gb_interface *intf)
struct gb_interface *gb_interface_find(struct greybus_host_device *hd,
u8 interface_id);
-void gb_add_interface(struct greybus_host_device *hd, u8 interface_id, u8 *data,
+void gb_interface_add(struct greybus_host_device *hd, u8 interface_id, u8 *data,
int size);
-void gb_remove_interface(struct greybus_host_device *hd, u8 interface_id);
-void gb_remove_interfaces(struct greybus_host_device *hd);
+void gb_interface_remove(struct greybus_host_device *hd, u8 interface_id);
+void gb_interfaces_remove(struct greybus_host_device *hd);
#endif /* __INTERFACE_H */