From: Greg Kroah-Hartman <greg@kroah.com>
Date: Fri, 19 Dec 2014 22:56:32 +0000 (-0800)
Subject: greybus: interface: rename greybus_interface_block_id to greybus_interface_id
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=edb0e0b5a17d28c7207197f415c41ab25e75b5d5;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

greybus: interface: rename greybus_interface_block_id to greybus_interface_id

This moves the id structure name to not have "block" in it, as that
doesn't make sense anymore with the renaming of the gb_interface
structure.

Reviewed-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 a0e0af5c23d2..96410cbdc0b6 100644
--- a/drivers/staging/greybus/core.c
+++ b/drivers/staging/greybus/core.c
@@ -35,7 +35,7 @@ static int greybus_module_match(struct device *dev, struct device_driver *drv)
 {
 	struct greybus_driver *driver = to_greybus_driver(drv);
 	struct gb_interface *intf = to_gb_interface(dev);
-	const struct greybus_interface_block_id *id;
+	const struct greybus_interface_id *id;
 
 	id = gb_interface_match_id(intf, driver->id_table);
 	if (id)
@@ -95,7 +95,7 @@ static int greybus_probe(struct device *dev)
 {
 	struct greybus_driver *driver = to_greybus_driver(dev->driver);
 	struct gb_interface *intf = to_gb_interface(dev);
-	const struct greybus_interface_block_id *id;
+	const struct greybus_interface_id *id;
 	int retval;
 
 	/* match id */
diff --git a/drivers/staging/greybus/greybus.h b/drivers/staging/greybus/greybus.h
index bca0e6682eef..4db595674f2b 100644
--- a/drivers/staging/greybus/greybus.h
+++ b/drivers/staging/greybus/greybus.h
@@ -120,13 +120,13 @@ struct greybus_driver {
 	const char *name;
 
 	int (*probe)(struct gb_interface *intf,
-		     const struct greybus_interface_block_id *id);
+		     const struct greybus_interface_id *id);
 	void (*disconnect)(struct gb_interface *intf);
 
 	int (*suspend)(struct gb_interface *intf, pm_message_t message);
 	int (*resume)(struct gb_interface *intf);
 
-	const struct greybus_interface_block_id *id_table;
+	const struct greybus_interface_id *id_table;
 
 	struct device_driver driver;
 };
diff --git a/drivers/staging/greybus/greybus_id.h b/drivers/staging/greybus/greybus_id.h
index da70aab54ab0..53da8e71d674 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_interface_block_id {
+struct greybus_interface_id {
 	__u16	match_flags;
 	__u16	vendor;
 	__u16	product;
@@ -18,7 +18,7 @@ struct greybus_interface_block_id {
 	kernel_ulong_t	driver_info __aligned(sizeof(kernel_ulong_t));
 };
 
-/* Used to match the greybus_interface_block_id */
+/* Used to match the greybus_interface_id */
 #define GREYBUS_ID_MATCH_VENDOR		BIT(0)
 #define GREYBUS_ID_MATCH_PRODUCT		BIT(1)
 #define GREYBUS_ID_MATCH_SERIAL		BIT(2)
diff --git a/drivers/staging/greybus/interface.c b/drivers/staging/greybus/interface.c
index f2c935439a9b..d840ae66aab3 100644
--- a/drivers/staging/greybus/interface.c
+++ b/drivers/staging/greybus/interface.c
@@ -41,7 +41,7 @@ ATTRIBUTE_GROUPS(interface);
 static DEFINE_SPINLOCK(gb_modules_lock);
 
 static int gb_interface_match_one_id(struct gb_interface *intf,
-				     const struct greybus_interface_block_id *id)
+				     const struct greybus_interface_id *id)
 {
 	if ((id->match_flags & GREYBUS_ID_MATCH_VENDOR) &&
 	    (id->vendor != intf->vendor))
@@ -58,9 +58,9 @@ static int gb_interface_match_one_id(struct gb_interface *intf,
 	return 1;
 }
 
-const struct greybus_interface_block_id *
+const struct greybus_interface_id *
 gb_interface_match_id(struct gb_interface *intf,
-		      const struct greybus_interface_block_id *id)
+		      const struct greybus_interface_id *id)
 {
 	if (id == NULL)
 		return NULL;
diff --git a/drivers/staging/greybus/interface.h b/drivers/staging/greybus/interface.h
index 52adc83dd19f..f6f16df04730 100644
--- a/drivers/staging/greybus/interface.h
+++ b/drivers/staging/greybus/interface.h
@@ -47,9 +47,9 @@ static inline void * gb_interface__get_drvdata(struct gb_interface *intf)
 
 /* Greybus "private" definitions */
 
-const struct greybus_interface_block_id *
+const struct greybus_interface_id *
 	gb_interface_match_id(struct gb_interface *intf,
-			      const struct greybus_interface_block_id *id);
+			      const struct greybus_interface_id *id);
 
 struct gb_interface *gb_interface_find(struct greybus_host_device *hd,
 				       u8 module_id);