greybus: remove cports and strings from gb_module

We no longer keep copies of strings found in the manifuest in
a module's strings array, so we can get rid of the strings array.
Similarly, the new manifest parsing code sets up connections for
each cport id advertised for a module, so the cport array is
no longer needed either.

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

diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c
index 0a37b95d226b018197b09517e4bf0f94dd2bb2a0..b59dee171446bfd372df1707baa75368f9ca5cfa 100644 (file)
--- a/drivers/staging/greybus/core.c
+++ b/drivers/staging/greybus/core.c
@@ -118,10 +118,7 @@ EXPORT_SYMBOL_GPL(greybus_deregister);
 static void greybus_module_release(struct device *dev)
 {
        struct gb_module *gmod = to_gb_module(dev);
-       int i;
 
-       for (i = 0; i < gmod->num_strings; ++i)
-               kfree(gmod->string[i]);
        kfree(gmod);
 }
 

diff --git a/drivers/staging/greybus/module.h b/drivers/staging/greybus/module.h
index e32135f3b7384b464d6787e0cbd155f1a8c3e21a..2c6707d6d85fa2f94e2b0178a3ee0a14fa75297c 100644 (file)
--- a/drivers/staging/greybus/module.h
+++ b/drivers/staging/greybus/module.h
@@ -28,11 +28,6 @@ struct gb_module {
        char *product_string;
        u64 unique_id;
 
-       int num_cports;
-       int num_strings;
-       u16 cport_ids[MAX_CPORTS_PER_MODULE];
-       struct gmod_string *string[MAX_STRINGS_PER_MODULE];
-
        struct greybus_host_device *hd;
 
        struct gb_tty *gb_tty;