greybus: endo: delete "0xXXXX" portion in sysfs "endo" directory

With the Endo "id" attribute in place, there's no need to encode
the ID of an Endo in its sysfs path.  So get rid of it.

Signed-off-by: Alex Elder <elder@linaro.org>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
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 9cd3e02..0268dd2 100644 (file)
--- a/drivers/staging/greybus/Documentation/sysfs-bus-greybus
+++ b/drivers/staging/greybus/Documentation/sysfs-bus-greybus
@@ -1,4 +1,4 @@
-What:          /sys/bus/greybus/device/endo-0xXXXX
+What:          /sys/bus/greybus/device/endo
 Date:          October 2015
 KernelVersion: 4.XX
 Contact:       Greg Kroah-Hartman <greg@kroah.com>
@@ -7,7 +7,7 @@ Description:
                replaced with the numeric value of the endo layout
                scheme as documented in the ARA Module Developer Kit.
 
-What:          /sys/bus/greybus/device/endo-0xXXXX/id
+What:          /sys/bus/greybus/device/endo/id
 Date:          October 2015
 KernelVersion: 4.XX
 Contact:       Greg Kroah-Hartman <greg@kroah.com>
@@ -16,7 +16,7 @@ Description:
                defined by the the Endo layout scheme, documented in
                the ARA Module Developer Kit.
 
-What:          /sys/bus/greybus/device/endo-0xXXXX/ap_intf_id
+What:          /sys/bus/greybus/device/endo/ap_intf_id
 Date:          October 2015
 KernelVersion: 4.XX
 Contact:       Greg Kroah-Hartman <greg@kroah.com>
@@ -26,21 +26,21 @@ Description:
                The interface positions are defined in the ARA
                Module Developer Kit.
 
-What:          /sys/bus/greybus/device/endo-0xXXXX/svc/serial_number
+What:          /sys/bus/greybus/device/endo/svc/serial_number
 Date:          October 2015
 KernelVersion: 4.XX
 Contact:       Greg Kroah-Hartman <greg@kroah.com>
 Description:
                The serial number of the SVC device
 
-What:          /sys/bus/greybus/device/endo-0xXXXX/svc/version
+What:          /sys/bus/greybus/device/endo/svc/version
 Date:          October 2015
 KernelVersion: 4.XX
 Contact:       Greg Kroah-Hartman <greg@kroah.com>
 Description:
                The version number of the firmware in the SVC device.
 
-What:          /sys/bus/greybus/device/endo-0xXXXX/.../epm
+What:          /sys/bus/greybus/device/endo/../epm
 Date:          October 2015
 KernelVersion: 4.XX
 Contact:       Greg Kroah-Hartman <greg@kroah.com>
@@ -50,7 +50,7 @@ Description:
                Writing 1 to it turns it on, writing 0 to it turns it
                off.  Reading the value returns if it is on or off.
 
-What:          /sys/bus/greybus/device/endo-0xXXXX/.../power_control
+What:          /sys/bus/greybus/device/endo/.../power_control
 Date:          October 2015
 KernelVersion: 4.XX
 Contact:       Greg Kroah-Hartman <greg@kroah.com>
@@ -60,7 +60,7 @@ Description:
                to the module, writing 0 to it turns power off to the
                module.  Reading the value returns if it is on or off.
 
-What:          /sys/bus/greybus/device/endo-0xXXXX/.../present
+What:          /sys/bus/greybus/device/endo/.../present
 Date:          October 2015
 KernelVersion: 4.XX
 Contact:       Greg Kroah-Hartman <greg@kroah.com>

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/01/gpbridge00/gpio/.gitignore b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/gpio/.gitignore
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/01/gpbridge00/gpio/.gitignore
rename to drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/gpio/.gitignore

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/01/gpbridge00/i2c/.gitignore b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/i2c/.gitignore
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/01/gpbridge00/i2c/.gitignore
rename to drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/i2c/.gitignore

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/01/gpbridge00/usb/.gitignore b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/usb/.gitignore
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/01/gpbridge00/usb/.gitignore
rename to drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/usb/.gitignore

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/firmware b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/firmware
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/firmware
rename to drivers/staging/greybus/Documentation/sysfs/endo/01/01/firmware

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/manifest b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/manifest
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/manifest
rename to drivers/staging/greybus/Documentation/sysfs/endo/01/01/manifest

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/product_id b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/product_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/product_id
rename to drivers/staging/greybus/Documentation/sysfs/endo/01/01/product_id

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/product_name b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/product_name
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/product_name
rename to drivers/staging/greybus/Documentation/sysfs/endo/01/01/product_name

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/state b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/state
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/state
rename to drivers/staging/greybus/Documentation/sysfs/endo/01/01/state

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/uid b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/uid
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/uid
rename to drivers/staging/greybus/Documentation/sysfs/endo/01/01/uid

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/version_major b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/version_major
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/version_major
rename to drivers/staging/greybus/Documentation/sysfs/endo/01/01/version_major

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/version_minor b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/version_minor
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/version_minor
rename to drivers/staging/greybus/Documentation/sysfs/endo/01/01/version_minor

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/epm b/drivers/staging/greybus/Documentation/sysfs/endo/01/epm
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/epm
rename to drivers/staging/greybus/Documentation/sysfs/endo/01/epm

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/power b/drivers/staging/greybus/Documentation/sysfs/endo/01/power
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/power
rename to drivers/staging/greybus/Documentation/sysfs/endo/01/power

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/present b/drivers/staging/greybus/Documentation/sysfs/endo/01/present
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/present
rename to drivers/staging/greybus/Documentation/sysfs/endo/01/present

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/02/.gitignore b/drivers/staging/greybus/Documentation/sysfs/endo/02/02/.gitignore
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/02/.gitignore
rename to drivers/staging/greybus/Documentation/sysfs/endo/02/02/.gitignore

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/ap_intf_id b/drivers/staging/greybus/Documentation/sysfs/endo/ap_intf_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/ap_intf_id
rename to drivers/staging/greybus/Documentation/sysfs/endo/ap_intf_id

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/id b/drivers/staging/greybus/Documentation/sysfs/endo/id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/id
rename to drivers/staging/greybus/Documentation/sysfs/endo/id

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/svc/firmware b/drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/firmware
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/svc/firmware
rename to drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/firmware

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/svc/serial_number b/drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/serial_number
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/svc/serial_number
rename to drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/serial_number

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/svc/version b/drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/version
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/endo-TYPE/svc/version
rename to drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/version

diff --git a/drivers/staging/greybus/endo.c b/drivers/staging/greybus/endo.c
index aa89868..d71f328 100644 (file)
--- a/drivers/staging/greybus/endo.c
+++ b/drivers/staging/greybus/endo.c
@@ -438,6 +438,7 @@ static int gb_endo_register(struct greybus_host_device *hd,
        int retval;
 
        endo->dev.parent = hd->parent;
+       endo->dev.init_name = "endo";
        endo->dev.bus = &greybus_bus_type;
        endo->dev.type = &greybus_endo_type;
        endo->dev.groups = endo_groups;
@@ -450,7 +451,6 @@ static int gb_endo_register(struct greybus_host_device *hd,
        strcpy(&endo->svc_info.serial_number[0], "042");
        strcpy(&endo->svc_info.version[0], "0.0");
 
-       dev_set_name(&endo->dev, "endo-0x%04x", endo->id);
        retval = device_add(&endo->dev);
        if (retval) {
                dev_err(hd->parent, "failed to add endo device of id 0x%04x\n",