greybus: endo: define endo_init() and endo_exit()

Define init and exit functions to do one-time setup and teardown
of endo-related functionality.  Currently they're place holders;
the next patch will populate them.

Note that we now call gb_operation_exit() from gb_init(), so
we can no longer mark that function with __exit.

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 e7a280cfbe81de88f05de05c7961ed5e5d132fec..8da120bcdf3d3924d512a354a1796b7a1f2a4332 100644 (file)
--- a/drivers/staging/greybus/core.c
+++ b/drivers/staging/greybus/core.c
@@ -252,7 +252,7 @@ static int __init gb_init(void)
 
        retval = bus_register(&greybus_bus_type);
        if (retval) {
-               pr_err("bus_register failed\n");
+               pr_err("bus_register failed (%d)\n", retval);
                goto error_bus;
        }
 
@@ -260,18 +260,26 @@ static int __init gb_init(void)
 
        retval = gb_ap_init();
        if (retval) {
-               pr_err("gb_ap_init failed\n");
+               pr_err("gb_ap_init failed (%d)\n", retval);
                goto error_ap;
        }
 
        retval = gb_operation_init();
        if (retval) {
-               pr_err("gb_operation_init failed\n");
+               pr_err("gb_operation_init failed (%d)\n", retval);
                goto error_operation;
        }
 
+       retval = gb_endo_init();
+       if (retval) {
+               pr_err("gb_endo_init failed (%d)\n", retval);
+               goto error_endo;
+       }
+
        return 0;       /* Success */
 
+error_endo:
+       gb_operation_exit();
 error_operation:
        gb_ap_exit();
 error_ap:
@@ -285,12 +293,12 @@ module_init(gb_init);
 
 static void __exit gb_exit(void)
 {
+       gb_endo_exit();
        gb_operation_exit();
        gb_ap_exit();
        bus_unregister(&greybus_bus_type);
        gb_debugfs_cleanup();
 }
 module_exit(gb_exit);
-
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Greg Kroah-Hartman <gregkh@linuxfoundation.org>");

diff --git a/drivers/staging/greybus/endo.c b/drivers/staging/greybus/endo.c
index b89b14f59fb23f0822d5d2e8a189d6acc77d64e0..37bd8ae15bfe49b414176a90f99276dde9ee2207 100644 (file)
--- a/drivers/staging/greybus/endo.c
+++ b/drivers/staging/greybus/endo.c
@@ -551,3 +551,11 @@ void gb_endo_remove(struct gb_endo *endo)
        device_unregister(&endo->dev);
 }
 
+int __init gb_endo_init(void)
+{
+       return 0;
+}
+
+void __exit gb_endo_exit(void)
+{
+}

diff --git a/drivers/staging/greybus/endo.h b/drivers/staging/greybus/endo.h
index 63dbadf5589fb1d2cfa4ddee4bdf1a40d395fb64..0ff40e990ab8c1d3a37f6bd0650b81e7356e0b16 100644 (file)
--- a/drivers/staging/greybus/endo.h
+++ b/drivers/staging/greybus/endo.h
@@ -51,6 +51,9 @@ extern struct ida greybus_endo_id_map;
 /* Greybus "private" definitions */
 struct greybus_host_device;
 
+int gb_endo_init(void) __init;
+void gb_endo_exit(void) __exit;
+
 struct gb_endo *gb_endo_create(struct greybus_host_device *hd,
                                u16 endo_id, u8 ap_intf_id);
 void gb_endo_remove(struct gb_endo *endo);

diff --git a/drivers/staging/greybus/operation.c b/drivers/staging/greybus/operation.c
index 49bc628e621b069407e5de3e8f0e048b273c41ec..a713dafabf6ead72794f30b3e73aa6d9eeab610e 100644 (file)
--- a/drivers/staging/greybus/operation.c
+++ b/drivers/staging/greybus/operation.c
@@ -959,7 +959,7 @@ err_destroy_message_cache:
        return -ENOMEM;
 }
 
-void __exit gb_operation_exit(void)
+void gb_operation_exit(void)
 {
        destroy_workqueue(gb_operation_workqueue);
        gb_operation_workqueue = NULL;

diff --git a/drivers/staging/greybus/operation.h b/drivers/staging/greybus/operation.h
index fcd6566f4bc8891aaac2fce0c2e1d0d7af79fdd8..6eed6bc621486192e16699b1bc0dfcfff3da64d3 100644 (file)
--- a/drivers/staging/greybus/operation.h
+++ b/drivers/staging/greybus/operation.h
@@ -159,6 +159,6 @@ int gb_operation_sync(struct gb_connection *connection, int type,
                      void *response, int response_size);
 
 int gb_operation_init(void) __init;
-void gb_operation_exit(void) __exit;
+void gb_operation_exit(void);
 
 #endif /* !__OPERATION_H */