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

Commit e0712985 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Jiri Kosina
Browse files

HID: 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>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent fed76ab3

drivers/hid/hid-input.c

+7 −5
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
				     struct hid_usage *usage)

{

	struct input_dev *input = hidinput->input;

	struct hid_device *device = input->private;

	struct hid_device *device = input_get_drvdata(input);

	int max = 0, code;

	unsigned long *bit = NULL;
@@ -859,13 +859,15 @@ EXPORT_SYMBOL_GPL(hidinput_find_field); 


static int hidinput_open(struct input_dev *dev)

{

	struct hid_device *hid = dev->private;

	struct hid_device *hid = input_get_drvdata(dev);



	return hid->hid_open(hid);

}



static void hidinput_close(struct input_dev *dev)

{

	struct hid_device *hid = dev->private;

	struct hid_device *hid = input_get_drvdata(dev);



	hid->hid_close(hid);

}
@@ -913,7 +915,7 @@ int hidinput_connect(struct hid_device *hid) 
					return -1;

				}



				input_dev->private = hid;

				input_set_drvdata(input_dev, hid);

				input_dev->event = hid->hidinput_input_event;

				input_dev->open = hidinput_open;

				input_dev->close = hidinput_close;
@@ -925,7 +927,7 @@ int hidinput_connect(struct hid_device *hid) 
				input_dev->id.vendor  = hid->vendor;

				input_dev->id.product = hid->product;

				input_dev->id.version = hid->version;

				input_dev->cdev.dev = hid->dev;

				input_dev->dev.parent = hid->dev;

				hidinput->input = input_dev;

				list_add_tail(&hidinput->list, &hid->inputs);

			}

drivers/hid/usbhid/hid-core.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns 


static int usb_hidinput_input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)

{

	struct hid_device *hid = dev->private;

	struct hid_device *hid = input_get_drvdata(dev);

	struct hid_field *field;

	int offset;

drivers/hid/usbhid/hid-lgff.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static const struct dev_type devices[] = { 


static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *effect)

{

	struct hid_device *hid = dev->private;

	struct hid_device *hid = input_get_drvdata(dev);

	struct list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT].report_list;

	struct hid_report *report = list_entry(report_list->next, struct hid_report, list);

	int x, y;

drivers/hid/usbhid/hid-plff.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ struct plff_device { 
static int hid_plff_play(struct input_dev *dev, void *data,

			 struct ff_effect *effect)

{

	struct hid_device *hid = dev->private;

	struct hid_device *hid = input_get_drvdata(dev);

	struct plff_device *plff = data;

	int left, right;

drivers/hid/usbhid/hid-tmff.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static inline int hid_tmff_scale(unsigned int in, int minimum, int maximum) 


static int hid_tmff_play(struct input_dev *dev, void *data, struct ff_effect *effect)

{

	struct hid_device *hid = dev->private;

	struct hid_device *hid = input_get_drvdata(dev);

	struct tmff_device *tmff = data;

	int left, right;	/* Rumbling */