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>

diff --git a/drivers/staging/greybus/ap.c b/drivers/staging/greybus/ap.c
index 1dc13396a567fe9b5b28aefbbc3d6869ed921bf9..843ddc24f41cd9bc514adb6c36a8e2b336c6d00a 100644 (file)
--- 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 db1da8a377870e7727f0b9e6564dac63fa798b4b..45fa4c3dfd2b768e41bc3325ccd55f983e74a7b6 100644 (file)
--- 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 28b3c4fccf24a25b8d904f7dca78cba134719029..7a4c7dc2e9412387fb6e8d46bfea80ec53dcc78a 100644 (file)
--- 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 9ee5b551029ece2b06f6c51be0a10e3ae50b9b3f..88a7a80568062c8f23e2f3bb6b4fd06b1bb9484b 100644 (file)
--- 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 */