From: Johan Hovold Date: Sat, 21 Nov 2015 09:51:59 +0000 (+0100) Subject: greybus: fix bundle-id match macros X-Git-Tag: v4.9-rc1~119^2~378^2~21^2~1029 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=358e9400f41a74467380cef38a6797c1747f7b1a;p=linux.git 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 Signed-off-by: Greg Kroah-Hartman --- 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 */