From fd1c2e541cbc48fe4a49e9fe1e98fd02af4bcf84 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Mon, 8 Jun 2015 12:05:13 -0500 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/core.c | 4 ++-- drivers/staging/greybus/greybus.h | 4 +++- 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 -- 2.11.0