aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2007-05-10 06:15:47 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-10 12:26:53 -0400
commitc5ddb547e899993be56dc7d0bf72bfd7a8d4ae1e (patch)
tree8fd92eb230ac482efd44b02796414a0dcfbb9f28
parentbcf889f96597137760c6edfdd0ee59fd37cb108c (diff)
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>
-rw-r--r--drivers/hwmon/ams/ams-input.c2
-rw-r--r--drivers/hwmon/applesmc.c2
-rw-r--r--drivers/hwmon/hdaps.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hwmon/ams/ams-input.c b/drivers/hwmon/ams/ams-input.c
index 18210164e307..ca7095d96ad0 100644
--- a/drivers/hwmon/ams/ams-input.c
+++ b/drivers/hwmon/ams/ams-input.c
@@ -87,7 +87,7 @@ static void ams_input_enable(void)
87 ams_info.idev->id.vendor = 0; 87 ams_info.idev->id.vendor = 0;
88 ams_info.idev->open = ams_input_open; 88 ams_info.idev->open = ams_input_open;
89 ams_info.idev->close = ams_input_close; 89 ams_info.idev->close = ams_input_close;
90 ams_info.idev->cdev.dev = &ams_info.of_dev->dev; 90 ams_info.idev->dev.parent = &ams_info.of_dev->dev;
91 91
92 input_set_abs_params(ams_info.idev, ABS_X, -50, 50, 3, 0); 92 input_set_abs_params(ams_info.idev, ABS_X, -50, 50, 3, 0);
93 input_set_abs_params(ams_info.idev, ABS_Y, -50, 50, 3, 0); 93 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 b51c104a28a2..0c160675b3ac 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -1100,7 +1100,7 @@ static int applesmc_create_accelerometer(void)
1100 /* initialize the input class */ 1100 /* initialize the input class */
1101 applesmc_idev->name = "applesmc"; 1101 applesmc_idev->name = "applesmc";
1102 applesmc_idev->id.bustype = BUS_HOST; 1102 applesmc_idev->id.bustype = BUS_HOST;
1103 applesmc_idev->cdev.dev = &pdev->dev; 1103 applesmc_idev->dev.parent = &pdev->dev;
1104 applesmc_idev->evbit[0] = BIT(EV_ABS); 1104 applesmc_idev->evbit[0] = BIT(EV_ABS);
1105 applesmc_idev->open = applesmc_idev_open; 1105 applesmc_idev->open = applesmc_idev_open;
1106 applesmc_idev->close = applesmc_idev_close; 1106 applesmc_idev->close = applesmc_idev_close;
diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index f82fa2d23f95..e0cf5e6fe5bc 100644
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -574,7 +574,7 @@ static int __init hdaps_init(void)
574 574
575 /* initialize the input class */ 575 /* initialize the input class */
576 hdaps_idev->name = "hdaps"; 576 hdaps_idev->name = "hdaps";
577 hdaps_idev->cdev.dev = &pdev->dev; 577 hdaps_idev->dev.parent = &pdev->dev;
578 hdaps_idev->evbit[0] = BIT(EV_ABS); 578 hdaps_idev->evbit[0] = BIT(EV_ABS);
579 input_set_abs_params(hdaps_idev, ABS_X, 579 input_set_abs_params(hdaps_idev, ABS_X,
580 -256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT); 580 -256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT);