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 a0e0af5c23d28198e3a8a81acf89be10b3b7ec62..96410cbdc0b60037c8cacbc304d4ebfd13ff26ee 100644 (file)
--- 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 bca0e6682eef9915d45a988643406ad8dcbe46bc..4db595674f2b49291b80192534eda47525d62073 100644 (file)
--- 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 da70aab54ab0817c97403394aa900fff30506b03..53da8e71d674a0d0bd95deeffad88bcaf10006d6 100644 (file)
--- 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 f2c935439a9b96cb348dd8e52e9212bce82f19d8..d840ae66aab31dd39621c43cacc4d8beecaa7db2 100644 (file)
--- 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 52adc83dd19fe2d50bdc819cdef9b58ab54e6f39..f6f16df04730735932c5ec138fe8f545e34dc5be 100644 (file)
--- 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);