greybus: fix vendor and product matching

Fix vendor and product matching by matching on the 32-bit Ara vendor and
product ids.

Remove the "fake" 16-bit vendor and product ids and export the Ara ids
using the "vendor" and "product" interface attributes instead.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/staging/greybus/interface.h b/drivers/staging/greybus/interface.h
index f0ef4e9a6206..28d2bac2b7b1 100644
--- a/drivers/staging/greybus/interface.h
+++ b/drivers/staging/greybus/interface.h
@@ -22,16 +22,14 @@ struct gb_interface {
 	u8 device_id;		/* Device id allocated for the interface block by the SVC */
 
 	/* Information taken from the manifest descriptor */
-	u16 vendor;
-	u16 product;
 	char *vendor_string;
 	char *product_string;
 
 	/* Information taken from the hotplug event */
 	u32 unipro_mfg_id;
 	u32 unipro_prod_id;
-	u32 ara_vend_id;
-	u32 ara_prod_id;
+	u32 vendor;
+	u32 product;
 
 	struct gb_module *module;
 	struct gb_host_device *hd;