extcon: Remove optional print_name() function pointer of extcon_dev

This patch removes the optional print_name() function pointer included in
'struct extcon_dev' because the extcon must maintain the consistent name of
extcon device on sysfs instead of inconsistent name. After merged patch[1],
extcon can maintain the consistent name of extcon device without any hard-coded
device name.
[1] https://lkml.org/lkml/2015/4/27/258

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c
index 5099c11d88339cdfe58c13f62abc8b0ed1c13b42..fafd428cae7f30142b91bc45ff766624d11826ce 100644 (file)
--- a/drivers/extcon/extcon.c
+++ b/drivers/extcon/extcon.c
@@ -207,14 +207,6 @@ static ssize_t name_show(struct device *dev, struct device_attribute *attr,
 {
        struct extcon_dev *edev = dev_get_drvdata(dev);
 
-       /* Optional callback given by the user */
-       if (edev->print_name) {
-               int ret = edev->print_name(edev, buf);
-
-               if (ret >= 0)
-                       return ret;
-       }
-
        return sprintf(buf, "%s\n", edev->name);
 }
 static DEVICE_ATTR_RO(name);

diff --git a/include/linux/extcon.h b/include/linux/extcon.h
index be9652b3a15427ddf9eb98ae2014746033480ccf..a7b224b20eccb74e1fbe8f96a3aea614ee7fc87f 100644 (file)
--- a/include/linux/extcon.h
+++ b/include/linux/extcon.h
@@ -83,8 +83,6 @@ struct extcon_cable;
  *                     be attached simulataneously. {0x7, 0} is equivalent to
  *                     {0x3, 0x6, 0x5, 0}. If it is {0xFFFFFFFF, 0}, there
  *                     can be no simultaneous connections.
- * @print_name:                An optional callback to override the method to print the
- *                     name of the extcon device.
  * @print_state:       An optional callback to override the method to print the
  *                     status of the extcon device.
  * @dev:               Device of this extcon.
@@ -111,7 +109,6 @@ struct extcon_dev {
        const u32 *mutually_exclusive;
 
        /* Optional callbacks to override class functions */
-       ssize_t (*print_name)(struct extcon_dev *edev, char *buf);
        ssize_t (*print_state)(struct extcon_dev *edev, char *buf);
 
        /* Internal data. Please do not set. */