Commit 09c521dc authored by Alex Elder's avatar Alex Elder Committed by Greg Kroah-Hartman

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: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 5b3db0dd
...@@ -146,6 +146,7 @@ int gb_battery_device_init(struct gb_connection *connection) ...@@ -146,6 +146,7 @@ int gb_battery_device_init(struct gb_connection *connection)
void gb_battery_disconnect(struct gb_module *gmod) void gb_battery_disconnect(struct gb_module *gmod)
{ {
#if 0
struct gb_battery *gb; struct gb_battery *gb;
gb = gmod->gb_battery; gb = gmod->gb_battery;
...@@ -155,6 +156,7 @@ void gb_battery_disconnect(struct gb_module *gmod) ...@@ -155,6 +156,7 @@ void gb_battery_disconnect(struct gb_module *gmod)
power_supply_unregister(&gb->bat); power_supply_unregister(&gb->bat);
kfree(gb); kfree(gb);
#endif
} }
#if 0 #if 0
......
...@@ -35,12 +35,7 @@ struct gb_module { ...@@ -35,12 +35,7 @@ struct gb_module {
struct greybus_host_device *hd; 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_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) #define to_gb_module(d) container_of(d, struct gb_module, dev)
......
...@@ -61,12 +61,13 @@ int gb_sdio_probe(struct gb_module *gmod, ...@@ -61,12 +61,13 @@ int gb_sdio_probe(struct gb_module *gmod,
mmc->ops = &gb_sd_ops; mmc->ops = &gb_sd_ops;
// FIXME - set up size limits we can handle. // FIXME - set up size limits we can handle.
gmod->gb_sdio_host = host; // gmod->gb_sdio_host = host;
return 0; return 0;
} }
void gb_sdio_disconnect(struct gb_module *gmod) void gb_sdio_disconnect(struct gb_module *gmod)
{ {
#if 0
struct mmc_host *mmc; struct mmc_host *mmc;
struct gb_sdio_host *host; struct gb_sdio_host *host;
...@@ -77,6 +78,7 @@ void gb_sdio_disconnect(struct gb_module *gmod) ...@@ -77,6 +78,7 @@ void gb_sdio_disconnect(struct gb_module *gmod)
mmc = host->mmc; mmc = host->mmc;
mmc_remove_host(mmc); mmc_remove_host(mmc);
mmc_free_host(mmc); mmc_free_host(mmc);
#endif
} }
#if 0 #if 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment