Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5ddb547 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Linus Torvalds
Browse files

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: default avatarDmitry Torokhov <dtor@mail.ru>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bcf889f9

drivers/hwmon/ams/ams-input.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/hwmon/applesmc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/hwmon/hdaps.c

+1 −1
Original line number Diff line number Diff line
@@ -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);