greybus: Remove class descriptor

We carry this information as part of bundle descriptor now and this can
be removed.

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 bea4de2..60f183a 100644 (file)
--- a/drivers/staging/greybus/greybus_manifest.h
+++ b/drivers/staging/greybus/greybus_manifest.h
@@ -19,7 +19,6 @@ enum greybus_descriptor_type {
        GREYBUS_TYPE_STRING             = 0x02,
        GREYBUS_TYPE_BUNDLE             = 0x03,
        GREYBUS_TYPE_CPORT              = 0x04,
-       GREYBUS_TYPE_CLASS              = 0x05,
 };
 
 enum greybus_protocol {
@@ -122,14 +121,6 @@ struct greybus_descriptor_cport {
        __u8    protocol_id;    /* enum greybus_protocol */
 } __packed;
 
-/*
- * A class descriptor defines functionality supplied by a module.
- * Beyond that, not much else is defined yet...
- */
-struct greybus_descriptor_class {
-       __u8    class;          /* enum greybus_class_type */
-} __packed;
-
 struct greybus_descriptor_header {
        __le16  size;
        __u8    type;           /* enum greybus_descriptor_type */
@@ -142,7 +133,6 @@ struct greybus_descriptor {
                struct greybus_descriptor_interface     interface;
                struct greybus_descriptor_bundle        bundle;
                struct greybus_descriptor_cport         cport;
-               struct greybus_descriptor_class         class;
        };
 } __packed;
 

diff --git a/drivers/staging/greybus/manifest.c b/drivers/staging/greybus/manifest.c
index de234d2..597ba70 100644 (file)
--- a/drivers/staging/greybus/manifest.c
+++ b/drivers/staging/greybus/manifest.c
@@ -26,8 +26,6 @@ static const char *get_descriptor_type_string(u8 type)
                return "cport";
        case GREYBUS_TYPE_BUNDLE:
                return "bundle";
-       case GREYBUS_TYPE_CLASS:
-               return "class";
        default:
                WARN_ON(1);
                return "unknown";
@@ -113,9 +111,6 @@ static int identify_descriptor(struct gb_interface *intf,
        case GREYBUS_TYPE_CPORT:
                expected_size += sizeof(struct greybus_descriptor_cport);
                break;
-       case GREYBUS_TYPE_CLASS:
-               pr_warn("class descriptor found (ignoring)\n");
-               break;
        case GREYBUS_TYPE_INVALID:
        default:
                pr_err("invalid descriptor type (%hhu)\n", desc_header->type);