From: Alex Elder Date: Sat, 27 Sep 2014 01:55:33 +0000 (-0500) Subject: greybus: descriptor type is 1 byte X-Git-Tag: v4.9-rc1~119^2~378^2~21^2~2075 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=72b0ffc019137b4877145ef7143cd69a6194b9c6;p=karo-tx-linux.git greybus: descriptor type is 1 byte The spec was changed to require only one byte to represent the type of a module descriptor. Update our data type and the values used to reflect that. Signed-off-by: Alex Elder Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/greybus/greybus_manifest.h b/drivers/staging/greybus/greybus_manifest.h index 75dea816fa69..086705404536 100644 --- a/drivers/staging/greybus/greybus_manifest.h +++ b/drivers/staging/greybus/greybus_manifest.h @@ -21,17 +21,17 @@ struct greybus_manifest_header { }; enum greybus_descriptor_type { - GREYBUS_TYPE_INVALID = 0x0000, - GREYBUS_TYPE_MODULE = 0x0001, - GREYBUS_TYPE_FUNCTION = 0x0002, - GREYBUS_TYPE_CLASS = 0x0003, - GREYBUS_TYPE_STRING = 0x0004, - GREYBUS_TYPE_CPORT = 0x0005, + GREYBUS_TYPE_INVALID = 0x00, + GREYBUS_TYPE_MODULE = 0x01, + GREYBUS_TYPE_FUNCTION = 0x02, + GREYBUS_TYPE_CLASS = 0x03, + GREYBUS_TYPE_STRING = 0x04, + GREYBUS_TYPE_CPORT = 0x05, }; struct greybus_descriptor_header { __le16 size; - __le16 type; /* enum greybus_descriptor_type */ + __u8 type; /* enum greybus_descriptor_type */ }; enum greybus_function_type {