greybus: core: rename greybus_deregister()

Rename greybus_deregister() to be greybus_deregister_driver(), so
its name mirrors the greybus_register_driver() function it matches.
Define greybus_deregister() to be a trivial macro.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c
index 9bbbf374c8c71d6dd7672ed2b0e98e8d951010c8..23e0359d18c228b255cc4f00871cde89fb6b1ee7 100644 (file)
--- a/drivers/staging/greybus/core.c
+++ b/drivers/staging/greybus/core.c
@@ -155,11 +155,11 @@ int greybus_register_driver(struct greybus_driver *driver, struct module *owner,
 }
 EXPORT_SYMBOL_GPL(greybus_register_driver);
 
-void greybus_deregister(struct greybus_driver *driver)
+void greybus_deregister_driver(struct greybus_driver *driver)
 {
        driver_unregister(&driver->driver);
 }
-EXPORT_SYMBOL_GPL(greybus_deregister);
+EXPORT_SYMBOL_GPL(greybus_deregister_driver);
 
 
 static DEFINE_MUTEX(hd_mutex);

diff --git a/drivers/staging/greybus/greybus.h b/drivers/staging/greybus/greybus.h
index 86b2f9c67d0bfe857595c61752494f9ffe0bba64..05eab4c5f9a0ddc8c448608aaf7415c3b1f958d7 100644 (file)
--- a/drivers/staging/greybus/greybus.h
+++ b/drivers/staging/greybus/greybus.h
@@ -132,11 +132,13 @@ struct greybus_driver {
 /* Don't call these directly, use the module_greybus_driver() macro instead */
 int greybus_register_driver(struct greybus_driver *driver,
                            struct module *module, const char *mod_name);
-void greybus_deregister(struct greybus_driver *driver);
+void greybus_deregister_driver(struct greybus_driver *driver);
 
 /* define to get proper THIS_MODULE and KBUILD_MODNAME values */
 #define greybus_register(driver) \
        greybus_register_driver(driver, THIS_MODULE, KBUILD_MODNAME)
+#define greybus_deregister(driver) \
+       greybus_deregister_driver(driver)
 
 /**
  * module_greybus_driver() - Helper macro for registering a Greybus driver