summaryrefslogtreecommitdiff
path: root/drivers/staging/greybus/greybus.h
diff options
context:
space:
mode:
authorJohan Hovold <johan@hovoldconsulting.com>2015-11-21 10:51:59 +0100
committerGreg Kroah-Hartman <gregkh@google.com>2015-11-21 17:15:35 -0800
commit358e9400f41a74467380cef38a6797c1747f7b1a (patch)
treedf104e7bacb1dfd2159882d2a50ab548701f618a /drivers/staging/greybus/greybus.h
parent55510843c1630f6067aae4c45ff2929a51f56b4d (diff)
greybus: fix bundle-id match macros
The matching flags were renamed over a year ago but the so far unused id-macros were never updated. Also rename the GREYBUS_ID_MATCH_DEVICE mask to use the common GREYBUS_ID_MATCH-prefix. Signed-off-by: Johan Hovold <johan@hovoldconsulting.com> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/greybus.h')
-rw-r--r--drivers/staging/greybus/greybus.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/greybus/greybus.h b/drivers/staging/greybus/greybus.h
index 1b6f56f9e506..4a6b23528490 100644
--- a/drivers/staging/greybus/greybus.h
+++ b/drivers/staging/greybus/greybus.h
@@ -42,16 +42,16 @@
#define GREYBUS_VERSION_MAJOR 0x00
#define GREYBUS_VERSION_MINOR 0x01
-#define GREYBUS_DEVICE_ID_MATCH_DEVICE \
- (GREYBUS_DEVICE_ID_MATCH_VENDOR | GREYBUS_DEVICE_ID_MATCH_PRODUCT)
+#define GREYBUS_ID_MATCH_DEVICE \
+ (GREYBUS_ID_MATCH_VENDOR | GREYBUS_ID_MATCH_PRODUCT)
#define GREYBUS_DEVICE(v, p) \
- .match_flags = GREYBUS_DEVICE_ID_MATCH_DEVICE, \
+ .match_flags = GREYBUS_ID_MATCH_DEVICE, \
.vendor = (v), \
.product = (p),
#define GREYBUS_DEVICE_SERIAL(s) \
- .match_flags = GREYBUS_DEVICE_ID_MATCH_SERIAL, \
+ .match_flags = GREYBUS_ID_MATCH_SERIAL, \
.serial_number = (s),
/* Maximum number of CPorts */