greybus: drop gb_* device fields from gb_module

A struct gb_module has a bunch of fields from the earlier skeleton
code, where a module was assumed to possibly have one of every
type of device available on the GP Bridge.  The manifest parsing
code changed it so these things will be related to connection
endpoints, so these gb_module fields are no longer needed.

A few of these (battery and sdio) haven't been implemented the "new
way" yet, so just leave a bit of the code that was there commented
out for now.

Also, gb_tty seems to be partially implemented and I don't want to
remove that without knowing where it's headed, so that one stays.

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

diff --git a/drivers/staging/greybus/battery-gb.c b/drivers/staging/greybus/battery-gb.c
index 3288101c6319add58eb4f08869b1a7aabf60f334..09c3290e1eaf1cd15dbda6fba231e37f17613b54 100644 (file)
--- a/drivers/staging/greybus/battery-gb.c
+++ b/drivers/staging/greybus/battery-gb.c
@@ -146,6 +146,7 @@ int gb_battery_device_init(struct gb_connection *connection)
 
 void gb_battery_disconnect(struct gb_module *gmod)
 {
+#if 0
        struct gb_battery *gb;
 
        gb = gmod->gb_battery;
@@ -155,6 +156,7 @@ void gb_battery_disconnect(struct gb_module *gmod)
        power_supply_unregister(&gb->bat);
 
        kfree(gb);
+#endif
 }
 
 #if 0

diff --git a/drivers/staging/greybus/module.h b/drivers/staging/greybus/module.h
index 114f15750380ea16d65028fb1d04411cc6697541..e32135f3b7384b464d6787e0cbd155f1a8c3e21a 100644 (file)
--- a/drivers/staging/greybus/module.h
+++ b/drivers/staging/greybus/module.h
@@ -35,12 +35,7 @@ struct gb_module {
 
        struct greybus_host_device *hd;
 
-       struct gb_i2c_device *gb_i2c_dev;
-       struct gb_gpio_device *gb_gpio_dev;
-       struct gb_sdio_host *gb_sdio_host;
        struct gb_tty *gb_tty;
-       struct gb_usb_device *gb_usb_dev;
-       struct gb_battery *gb_battery;
 };
 #define to_gb_module(d) container_of(d, struct gb_module, dev)
 

diff --git a/drivers/staging/greybus/sdio-gb.c b/drivers/staging/greybus/sdio-gb.c
index 239fcf773acb4cc9132ccad971b7b8b5d8722dc5..19c7c4ac81ebe76fc89dddffd37ce62efd95a7e1 100644 (file)
--- a/drivers/staging/greybus/sdio-gb.c
+++ b/drivers/staging/greybus/sdio-gb.c
@@ -61,12 +61,13 @@ int gb_sdio_probe(struct gb_module *gmod,
        mmc->ops = &gb_sd_ops;
        // FIXME - set up size limits we can handle.
 
-       gmod->gb_sdio_host = host;
+       // gmod->gb_sdio_host = host;
        return 0;
 }
 
 void gb_sdio_disconnect(struct gb_module *gmod)
 {
+#if 0
        struct mmc_host *mmc;
        struct gb_sdio_host *host;
 
@@ -77,6 +78,7 @@ void gb_sdio_disconnect(struct gb_module *gmod)
        mmc = host->mmc;
        mmc_remove_host(mmc);
        mmc_free_host(mmc);
+#endif
 }
 
 #if 0