diff --git a/drivers/staging/greybus/battery-gb.c b/drivers/staging/greybus/battery-gb.c
index 3288101c6319..09c3290e1eaf 100644
--- 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 114f15750380..e32135f3b738 100644
--- 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 239fcf773acb..19c7c4ac81eb 100644
--- 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