Commit 8a5286ed authored by Viresh Kumar's avatar Viresh Kumar Committed by Greg Kroah-Hartman
Browse files

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: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 22fd2a8a

drivers/staging/greybus/greybus_manifest.h

+0 −3
Original line number Diff line number Diff line
@@ -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;



/*

drivers/staging/greybus/manifest.c

+5 −3
Original line number Diff line number Diff line
@@ -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);