drivers/hwmon: switch to using input_dev->dev.parent

In preparation for struct class_device -> struct device input core
conversion, switch to using input_dev->dev.parent when specifying device
position in sysfs tree.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/hwmon/ams/ams-input.c b/drivers/hwmon/ams/ams-input.c
index 18210164e307621c7edf41b3f51d221988b0899d..ca7095d96ad0f0f1a786b095f414bb27138c8a00 100644 (file)
--- a/drivers/hwmon/ams/ams-input.c
+++ b/drivers/hwmon/ams/ams-input.c
@@ -87,7 +87,7 @@ static void ams_input_enable(void)
        ams_info.idev->id.vendor = 0;
        ams_info.idev->open = ams_input_open;
        ams_info.idev->close = ams_input_close;
-       ams_info.idev->cdev.dev = &ams_info.of_dev->dev;
+       ams_info.idev->dev.parent = &ams_info.of_dev->dev;
 
        input_set_abs_params(ams_info.idev, ABS_X, -50, 50, 3, 0);
        input_set_abs_params(ams_info.idev, ABS_Y, -50, 50, 3, 0);

diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index b51c104a28a2ce53760621340f65f1ddce09af28..0c160675b3acc54d70b2580dfbf507edff00a85d 100644 (file)
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -1100,7 +1100,7 @@ static int applesmc_create_accelerometer(void)
        /* initialize the input class */
        applesmc_idev->name = "applesmc";
        applesmc_idev->id.bustype = BUS_HOST;
-       applesmc_idev->cdev.dev = &pdev->dev;
+       applesmc_idev->dev.parent = &pdev->dev;
        applesmc_idev->evbit[0] = BIT(EV_ABS);
        applesmc_idev->open = applesmc_idev_open;
        applesmc_idev->close = applesmc_idev_close;

diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index f82fa2d23f9529febecc64209a129e60b1d9c269..e0cf5e6fe5bc4498f61df424a7cfd06fcd0c1f6d 100644 (file)
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -574,7 +574,7 @@ static int __init hdaps_init(void)
 
        /* initialize the input class */
        hdaps_idev->name = "hdaps";
-       hdaps_idev->cdev.dev = &pdev->dev;
+       hdaps_idev->dev.parent = &pdev->dev;
        hdaps_idev->evbit[0] = BIT(EV_ABS);
        input_set_abs_params(hdaps_idev, ABS_X,
                        -256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT);