summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/greybus/core.c4
-rw-r--r--drivers/staging/greybus/greybus.h4
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c
index 9bbbf374c8c7..23e0359d18c2 100644
--- 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 86b2f9c67d0b..05eab4c5f9a0 100644
--- 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