iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

greybus: remove unique-id matching

Browse Source 
Remove unique-id matching as it does not make much sense to have a
driver match a specific device serial number.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Johan Hovold 2015-11-21 10:52:00 +01:00 committed by Greg Kroah-Hartman
parent 358e9400f4
commit 9784a591f0
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/greybus/bundle.c
View File

@ -79,10 +79,6 @@ static int gb_bundle_match_one_id(struct gb_bundle *bundle,
(id->product != bundle->intf->product))
return 0;
if ((id->match_flags & GREYBUS_ID_MATCH_SERIAL) &&
(id->unique_id != bundle->intf->unique_id))
return 0;
if ((id->match_flags & GREYBUS_ID_MATCH_CLASS) &&
(id->class != bundle->class))
return 0;
@ -97,8 +93,8 @@ gb_bundle_match_id(struct gb_bundle *bundle,
if (id == NULL)
return NULL;
for (; id->vendor || id->product || id->unique_id || id->class ||
id->driver_info; id++) {
for (; id->vendor || id->product || id->class || id->driver_info;
id++) {
if (gb_bundle_match_one_id(bundle, id))
return id;
}

4
drivers/staging/greybus/greybus.h
View File

@ -50,10 +50,6 @@
.vendor = (v), \
.product = (p),
#define GREYBUS_DEVICE_SERIAL(s) \
.match_flags = GREYBUS_ID_MATCH_SERIAL, \
.serial_number = (s),
/* Maximum number of CPorts */
#define CPORT_ID_MAX 4095 /* UniPro max id is 4095 */
#define CPORT_ID_BAD U16_MAX

2
drivers/staging/greybus/greybus_id.h
View File

@ -14,7 +14,6 @@ struct greybus_bundle_id {
__u16 vendor;
__u16 product;
__u8 class;
__u64 unique_id;
kernel_ulong_t driver_info __aligned(sizeof(kernel_ulong_t));
};
@ -22,7 +21,6 @@ struct greybus_bundle_id {
/* Used to match the greybus_bundle_id */
#define GREYBUS_ID_MATCH_VENDOR BIT(0)
#define GREYBUS_ID_MATCH_PRODUCT BIT(1)
#define GREYBUS_ID_MATCH_SERIAL BIT(2)
#define GREYBUS_ID_MATCH_CLASS BIT(3)
#endif /* __LINUX_GREYBUS_ID_H */