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

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

Browse Source 
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>
This commit is contained in:
Viresh Kumar 2015-04-28 19:51:37 +05:30 committed by Greg Kroah-Hartman
parent 22fd2a8ade
commit 8a5286ed2a
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/greybus/greybus_manifest.h
View File

@ -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;
/*

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

@ -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);