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 9cd3e02e57016e81b838306dabe9026d7d574d37..0268dd24d2a4f86e5051047d16047972c955b857 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-TYPE/01/01/01/gpbridge00/gpio/.gitignore
deleted file mode 100644 (file)
index f935021..0000000
--- a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/01/gpbridge00/gpio/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!.gitignore

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/01/gpbridge00/i2c/.gitignore b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/01/gpbridge00/i2c/.gitignore
deleted file mode 100644 (file)
index f935021..0000000
--- a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/01/gpbridge00/i2c/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!.gitignore

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/01/gpbridge00/usb/.gitignore b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/01/gpbridge00/usb/.gitignore
deleted file mode 100644 (file)
index f935021..0000000
--- a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/01/gpbridge00/usb/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!.gitignore

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/firmware b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/firmware
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/manifest b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/manifest
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/product_id b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/product_id
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/product_name b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/product_name
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/state b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/state
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/uid b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/uid
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/version_major b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/version_major
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/version_minor b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/01/version_minor
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/epm b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/epm
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/power b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/power
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/present b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/01/present
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/02/.gitignore b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/02/.gitignore
deleted file mode 100644 (file)
index f935021..0000000
--- a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/02/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!.gitignore

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/ap_intf_id b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/ap_intf_id
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/id b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/id
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/svc/firmware b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/svc/firmware
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/svc/serial_number b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/svc/serial_number
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/svc/version b/drivers/staging/greybus/Documentation/sysfs/endo-TYPE/svc/version
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/gpio/.gitignore b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/gpio/.gitignore
new file mode 100644 (file)
index 0000000..f935021
--- /dev/null
+++ b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/gpio/.gitignore
@@ -0,0 +1 @@
+!.gitignore

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/i2c/.gitignore b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/i2c/.gitignore
new file mode 100644 (file)
index 0000000..f935021
--- /dev/null
+++ b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/i2c/.gitignore
@@ -0,0 +1 @@
+!.gitignore

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/usb/.gitignore b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/usb/.gitignore
new file mode 100644 (file)
index 0000000..f935021
--- /dev/null
+++ b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/01/01/gpbridge00/usb/.gitignore
@@ -0,0 +1 @@
+!.gitignore

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/firmware b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/firmware
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/manifest b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/manifest
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/product_id b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/product_id
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/product_name b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/product_name
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/state b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/state
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/uid b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/uid
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/version_major b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/version_major
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/01/version_minor b/drivers/staging/greybus/Documentation/sysfs/endo/01/01/version_minor
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/epm b/drivers/staging/greybus/Documentation/sysfs/endo/01/epm
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/power b/drivers/staging/greybus/Documentation/sysfs/endo/01/power
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/01/present b/drivers/staging/greybus/Documentation/sysfs/endo/01/present
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/02/02/.gitignore b/drivers/staging/greybus/Documentation/sysfs/endo/02/02/.gitignore
new file mode 100644 (file)
index 0000000..f935021
--- /dev/null
+++ b/drivers/staging/greybus/Documentation/sysfs/endo/02/02/.gitignore
@@ -0,0 +1 @@
+!.gitignore

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/ap_intf_id b/drivers/staging/greybus/Documentation/sysfs/endo/ap_intf_id
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/id b/drivers/staging/greybus/Documentation/sysfs/endo/id
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/firmware b/drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/firmware
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/serial_number b/drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/serial_number
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/version b/drivers/staging/greybus/Documentation/sysfs/endo/svc/svc/version
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drivers/staging/greybus/endo.c b/drivers/staging/greybus/endo.c
index aa89868726d97d7397dab06f323a262bb527aaa5..d71f328dd40e605562c3e1e1f98258fa32c52ce3 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",