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

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / hwmon / applesmc.c

diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index 3215f9c..0c16067 100644 (file)
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -981,7 +981,7 @@ static SENSOR_DEVICE_ATTR_2(fan##offset##_output, S_IRUGO | S_IWUSR, \
 static SENSOR_DEVICE_ATTR(fan##offset##_manual, S_IRUGO | S_IWUSR, \
        applesmc_show_fan_manual, applesmc_store_fan_manual, offset-1); \
 \
-static SENSOR_DEVICE_ATTR(fan##offset##_position, S_IRUGO, \
+static SENSOR_DEVICE_ATTR(fan##offset##_label, S_IRUGO, \
        applesmc_show_fan_position, NULL, offset-1); \
 \
 static struct attribute *fan##offset##_attributes[] = { \
@@ -991,7 +991,7 @@ static struct attribute *fan##offset##_attributes[] = { \
        &sensor_dev_attr_fan##offset##_safe.dev_attr.attr, \
        &sensor_dev_attr_fan##offset##_output.dev_attr.attr, \
        &sensor_dev_attr_fan##offset##_manual.dev_attr.attr, \
-       &sensor_dev_attr_fan##offset##_position.dev_attr.attr, \
+       &sensor_dev_attr_fan##offset##_label.dev_attr.attr, \
        NULL \
 };
 
@@ -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;
@@ -1190,7 +1190,8 @@ static int __init applesmc_init(void)
        if (ret)
                goto out_region;
 
-       pdev = platform_device_register_simple("applesmc", -1, NULL, 0);
+       pdev = platform_device_register_simple("applesmc", APPLESMC_DATA_PORT,
+                                              NULL, 0);
        if (IS_ERR(pdev)) {
                ret = PTR_ERR(pdev);
                goto out_driver;