diff options
| author | Johan Hovold <johan@hovoldconsulting.com> | 2015-11-21 10:52:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2015-11-21 17:15:35 -0800 |
| commit | 9784a591f00134c02d152d6d07c539a136db7c12 (patch) | |
| tree | 86a5cf51ad141c66f8d60b09df268a8c93146e39 /drivers/staging/greybus/bundle.c | |
| parent | 358e9400f41a74467380cef38a6797c1747f7b1a (diff) | |
greybus: remove unique-id matching
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>
Diffstat (limited to 'drivers/staging/greybus/bundle.c')
| -rw-r--r-- | drivers/staging/greybus/bundle.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/greybus/bundle.c b/drivers/staging/greybus/bundle.c index 01745f40f6e6..fbc043998e08 100644 --- a/drivers/staging/greybus/bundle.c +++ b/drivers/staging/greybus/bundle.c @@ -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; } |