diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c
index 887aa601fd22..e41689f5562c 100644
--- a/drivers/staging/greybus/core.c
+++ b/drivers/staging/greybus/core.c
@@ -31,7 +31,7 @@ int greybus_disabled(void)
 EXPORT_SYMBOL_GPL(greybus_disabled);
 
 static int greybus_match_one_id(struct greybus_device *gdev,
-				const struct greybus_device_id *id)
+				const struct greybus_module_id *id)
 {
 	struct greybus_descriptor *des = &gdev->descriptor;
 
@@ -50,9 +50,9 @@ static int greybus_match_one_id(struct greybus_device *gdev,
 	return 1;
 }
 
-static const struct greybus_device_id *greybus_match_id(
+static const struct greybus_module_id *greybus_match_id(
 		struct greybus_device *gdev,
-		const struct greybus_device_id *id)
+		const struct greybus_module_id *id)
 {
 	if (id == NULL)
 		return NULL;
@@ -70,7 +70,7 @@ static int greybus_device_match(struct device *dev, struct device_driver *drv)
 {
 	struct greybus_driver *driver = to_greybus_driver(dev->driver);
 	struct greybus_device *gdev = to_greybus_device(dev);
-	const struct greybus_device_id *id;
+	const struct greybus_module_id *id;
 
 	id = greybus_match_id(gdev, driver->id_table);
 	if (id)
@@ -97,7 +97,7 @@ static int greybus_probe(struct device *dev)
 {
 	struct greybus_driver *driver = to_greybus_driver(dev->driver);
 	struct greybus_device *gdev = to_greybus_device(dev);
-	const struct greybus_device_id *id;
+	const struct greybus_module_id *id;
 	int retval;
 
 	/* match id */
@@ -152,7 +152,7 @@ EXPORT_SYMBOL_GPL(greybus_deregister);
 
 
 static int new_device(struct greybus_device *gdev,
-		      const struct greybus_device_id *id)
+		      const struct greybus_module_id *id)
 {
 	int retval;
 
diff --git a/drivers/staging/greybus/gpio-gb.c b/drivers/staging/greybus/gpio-gb.c
index 204779426b64..c4cb6a2f34c9 100644
--- a/drivers/staging/greybus/gpio-gb.c
+++ b/drivers/staging/greybus/gpio-gb.c
@@ -20,7 +20,7 @@ struct gb_gpio_device {
 	// FIXME - some lock?
 };
 
-static const struct greybus_device_id id_table[] = {
+static const struct greybus_module_id id_table[] = {
 	{ GREYBUS_DEVICE(0x44, 0x44) },	/* make shit up */
 	{ },	/* terminating NULL entry */
 };
@@ -52,7 +52,7 @@ static void gpio_set(struct gpio_chip *gpio, unsigned nr, int val)
 }
 
 int gb_gpio_probe(struct greybus_device *gdev,
-		  const struct greybus_device_id *id)
+		  const struct greybus_module_id *id)
 {
 	struct gb_gpio_device *gb_gpio;
 	struct gpio_chip *gpio;
diff --git a/drivers/staging/greybus/greybus.h b/drivers/staging/greybus/greybus.h
index f878453b31c9..45720ce74d78 100644
--- a/drivers/staging/greybus/greybus.h
+++ b/drivers/staging/greybus/greybus.h
@@ -115,13 +115,13 @@ struct greybus_driver {
 	const char *name;
 
 	int (*probe)(struct greybus_device *gdev,
-		     const struct greybus_device_id *id);
+		     const struct greybus_module_id *id);
 	void (*disconnect)(struct greybus_device *gdev);
 
 	int (*suspend)(struct greybus_device *gdev, pm_message_t message);
 	int (*resume)(struct greybus_device *gdev);
 
-	const struct greybus_device_id *id_table;
+	const struct greybus_module_id *id_table;
 
 	struct device_driver driver;
 };
@@ -173,13 +173,13 @@ void gb_debugfs_cleanup(void);
  * we have static functions for this, not "dynamic" drivers like we really
  * should in the end.
  */
-int gb_i2c_probe(struct greybus_device *gdev, const struct greybus_device_id *id);
+int gb_i2c_probe(struct greybus_device *gdev, const struct greybus_module_id *id);
 void gb_i2c_disconnect(struct greybus_device *gdev);
-int gb_gpio_probe(struct greybus_device *gdev, const struct greybus_device_id *id);
+int gb_gpio_probe(struct greybus_device *gdev, const struct greybus_module_id *id);
 void gb_gpio_disconnect(struct greybus_device *gdev);
-int gb_sdio_probe(struct greybus_device *gdev, const struct greybus_device_id *id);
+int gb_sdio_probe(struct greybus_device *gdev, const struct greybus_module_id *id);
 void gb_sdio_disconnect(struct greybus_device *gdev);
-int gb_tty_probe(struct greybus_device *gdev, const struct greybus_device_id *id);
+int gb_tty_probe(struct greybus_device *gdev, const struct greybus_module_id *id);
 void gb_tty_disconnect(struct greybus_device *gdev);
 
 int gb_tty_init(void);
diff --git a/drivers/staging/greybus/greybus_id.h b/drivers/staging/greybus/greybus_id.h
index 4afbfe2d5cb9..b6fe26a44ea8 100644
--- a/drivers/staging/greybus/greybus_id.h
+++ b/drivers/staging/greybus/greybus_id.h
@@ -9,7 +9,7 @@
 #include <linux/mod_devicetable.h>
 
 
-struct greybus_device_id {
+struct greybus_module_id {
 	__u16	match_flags;
 	__u16	wVendor;
 	__u16	wProduct;
diff --git a/drivers/staging/greybus/i2c-gb.c b/drivers/staging/greybus/i2c-gb.c
index bb107f8ce490..3c1d947208c9 100644
--- a/drivers/staging/greybus/i2c-gb.c
+++ b/drivers/staging/greybus/i2c-gb.c
@@ -17,7 +17,7 @@ struct gb_i2c_device {
 	struct greybus_device *gdev;
 };
 
-static const struct greybus_device_id id_table[] = {
+static const struct greybus_module_id id_table[] = {
 	{ GREYBUS_DEVICE(0x42, 0x42) },	/* make shit up */
 	{ },	/* terminating NULL entry */
 };
@@ -76,7 +76,7 @@ static const struct i2c_algorithm smbus_algorithm = {
 };
 
 int gb_i2c_probe(struct greybus_device *gdev,
-		 const struct greybus_device_id *id)
+		 const struct greybus_module_id *id)
 {
 	struct gb_i2c_device *gb_i2c_dev;
 	struct i2c_adapter *adapter;
diff --git a/drivers/staging/greybus/sdio-gb.c b/drivers/staging/greybus/sdio-gb.c
index 81eb33d2c887..665767d31f8f 100644
--- a/drivers/staging/greybus/sdio-gb.c
+++ b/drivers/staging/greybus/sdio-gb.c
@@ -18,7 +18,7 @@ struct gb_sdio_host {
 	// FIXME - some lock?
 };
 
-static const struct greybus_device_id id_table[] = {
+static const struct greybus_module_id id_table[] = {
 	{ GREYBUS_DEVICE(0x43, 0x43) },	/* make shit up */
 	{ },	/* terminating NULL entry */
 };
@@ -46,7 +46,7 @@ static const struct mmc_host_ops gb_sd_ops = {
 };
 
 int gb_sdio_probe(struct greybus_device *gdev,
-		  const struct greybus_device_id *id)
+		  const struct greybus_module_id *id)
 {
 	struct mmc_host *mmc;
 	struct gb_sdio_host *host;
diff --git a/drivers/staging/greybus/uart-gb.c b/drivers/staging/greybus/uart-gb.c
index f667b5c0f393..d104d9cc1221 100644
--- a/drivers/staging/greybus/uart-gb.c
+++ b/drivers/staging/greybus/uart-gb.c
@@ -46,7 +46,7 @@ struct gb_tty {
 	struct mutex mutex;
 };
 
-static const struct greybus_device_id id_table[] = {
+static const struct greybus_module_id id_table[] = {
 	{ GREYBUS_DEVICE(0x45, 0x45) },	/* make shit up */
 	{ },	/* terminating NULL entry */
 };
@@ -383,7 +383,7 @@ static const struct tty_operations gb_ops = {
 
 
 int gb_tty_probe(struct greybus_device *gdev,
-		 const struct greybus_device_id *id)
+		 const struct greybus_module_id *id)
 {
 	struct gb_tty *gb_tty;
 	struct device *tty_dev;