greybus: interface: remove unique id

Remove the unimplemented interface unique-id.

There will eventually be an interface-serial-number attribute provided,
but let's not export it or commit to a name for this attribute until we
need it.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/Documentation/sysfs-bus-greybus b/drivers/staging/greybus/Documentation/sysfs-bus-greybus
index 22a0c7f..8363f23 100644 (file)
--- a/drivers/staging/greybus/Documentation/sysfs-bus-greybus
+++ b/drivers/staging/greybus/Documentation/sysfs-bus-greybus
@@ -107,13 +107,6 @@ Contact:   Greg Kroah-Hartman <greg@kroah.com>
 Description:
                Product ID string of a Greybus interface block.
 
-What:          /sys/bus/greybus/device/endoE:M:I/unique_id
-Date:          October 2015
-KernelVersion: 4.XX
-Contact:       Greg Kroah-Hartman <greg@kroah.com>
-Description:
-               Unique ID of a Greybus interface block.
-
 What:          /sys/bus/greybus/device/endoE:M:I/vendor
 Date:          October 2015
 KernelVersion: 4.XX

diff --git a/drivers/staging/greybus/interface.c b/drivers/staging/greybus/interface.c
index 4c96adc..b57cc09 100644 (file)
--- a/drivers/staging/greybus/interface.c
+++ b/drivers/staging/greybus/interface.c
@@ -23,7 +23,6 @@ static DEVICE_ATTR_RO(field)
 gb_interface_attr(device_id, d);
 gb_interface_attr(vendor, x);
 gb_interface_attr(product, x);
-gb_interface_attr(unique_id, llX);
 gb_interface_attr(vendor_string, s);
 gb_interface_attr(product_string, s);
 
@@ -31,7 +30,6 @@ static struct attribute *interface_attrs[] = {
        &dev_attr_device_id.attr,
        &dev_attr_vendor.attr,
        &dev_attr_product.attr,
-       &dev_attr_unique_id.attr,
        &dev_attr_vendor_string.attr,
        &dev_attr_product_string.attr,
        NULL,

diff --git a/drivers/staging/greybus/interface.h b/drivers/staging/greybus/interface.h
index 248c991..f0ef4e9 100644 (file)
--- a/drivers/staging/greybus/interface.h
+++ b/drivers/staging/greybus/interface.h
@@ -26,7 +26,6 @@ struct gb_interface {
        u16 product;
        char *vendor_string;
        char *product_string;
-       u64 unique_id;
 
        /* Information taken from the hotplug event */
        u32 unipro_mfg_id;

diff --git a/drivers/staging/greybus/manifest.c b/drivers/staging/greybus/manifest.c
index 084e07e..4b4dd99 100644 (file)
--- a/drivers/staging/greybus/manifest.c
+++ b/drivers/staging/greybus/manifest.c
@@ -396,7 +396,6 @@ static bool gb_manifest_parse_interface(struct gb_interface *intf,
        // 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);