greybus: manifest: Remove vendor, product and unique-id from interface descriptor

These should come from control protocol instead.

For now, initialize this statically with a FIXME to not forget it later.

Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/greybus_manifest.h b/drivers/staging/greybus/greybus_manifest.h
index 90965766dceb4aaa5356574805e263e0e4297c2b..1fb01319b9a310845a453c37d102bc97e383fb31 100644 (file)
--- a/drivers/staging/greybus/greybus_manifest.h
+++ b/drivers/staging/greybus/greybus_manifest.h
@@ -82,12 +82,9 @@ struct greybus_descriptor_string {
  * *not* the functions within it.
  */
 struct greybus_descriptor_interface {
-       __le16  vendor;
-       __le16  product;
        __le16  version;        // TODO - remove after Dec demo.
        __u8    vendor_stringid;
        __u8    product_stringid;
-       __le64  unique_id;
 } __packed;
 
 /*

diff --git a/drivers/staging/greybus/manifest.c b/drivers/staging/greybus/manifest.c
index 2346ead2a977dce823e0f9128846b5112b7f1795..de234d2386f62eff04b0dd2f8774abee4fbf5192 100644 (file)
--- a/drivers/staging/greybus/manifest.c
+++ b/drivers/staging/greybus/manifest.c
@@ -304,9 +304,11 @@ static bool gb_manifest_parse_interface(struct gb_interface *intf,
                goto out_free_vendor_string;
        }
 
-       intf->vendor = le16_to_cpu(desc_intf->vendor);
-       intf->product = le16_to_cpu(desc_intf->product);
-       intf->unique_id = le64_to_cpu(desc_intf->unique_id);
+       // FIXME
+       // Vendor, Product and Unique id must come via control protocol
+       intf->vendor = 0xffff;
+       intf->product = 0x0001;
+       intf->unique_id = 0;
 
        /* Release the interface descriptor, now that we're done with it */
        release_manifest_descriptor(interface_desc);