greybus: drop module descriptors
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 143e284..a338683 100644
--- a/drivers/staging/greybus/greybus_manifest.h
+++ b/drivers/staging/greybus/greybus_manifest.h
@@ -22,7 +22,6 @@
GREYBUS_TYPE_BUNDLE = 0x03,
GREYBUS_TYPE_CPORT = 0x04,
GREYBUS_TYPE_CLASS = 0x05,
- GREYBUS_TYPE_MODULE = 0x06,
};
enum greybus_protocol {
@@ -70,19 +69,6 @@
};
/*
- * A module descriptor describes information about a module as a
- * whole, *not* the functions within it.
- */
-struct greybus_descriptor_module {
- __le16 vendor;
- __le16 product;
- __le16 version; // TODO - remove after Dec demo.
- __u8 vendor_stringid;
- __u8 product_stringid;
- __le64 unique_id;
-};
-
-/*
* The string in a string descriptor is not NUL-terminated. The
* size of the descriptor will be rounded up to a multiple of 4
* bytes, by padding the string with 0x00 bytes if necessary.
@@ -158,7 +144,6 @@
struct greybus_descriptor {
struct greybus_descriptor_header header;
union {
- struct greybus_descriptor_module module;
struct greybus_descriptor_string string;
struct greybus_descriptor_interface interface;
struct greybus_descriptor_bundle bundle;
diff --git a/drivers/staging/greybus/manifest.c b/drivers/staging/greybus/manifest.c
index f3d3a2f..12eee3a 100644
--- a/drivers/staging/greybus/manifest.c
+++ b/drivers/staging/greybus/manifest.c
@@ -18,8 +18,6 @@
switch(type) {
case GREYBUS_TYPE_INVALID:
return "invalid";
- case GREYBUS_TYPE_MODULE:
- return "module";
case GREYBUS_TYPE_STRING:
return "string";
case GREYBUS_TYPE_INTERFACE:
@@ -99,9 +97,6 @@
expected_size = sizeof(*desc_header);
switch (desc_header->type) {
- case GREYBUS_TYPE_MODULE:
- expected_size += sizeof(struct greybus_descriptor_module);
- break;
case GREYBUS_TYPE_STRING:
expected_size += sizeof(struct greybus_descriptor_string);
expected_size += desc->string.length;