diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-09 10:17:31 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2007-05-09 10:17:31 +0200 |
| commit | e071298589418076ef0a9813677f2d7032b65baa (patch) | |
| tree | 1ec366c95456511dc0820aed22b333caf89e0a2d /drivers/hid/hid-input.c | |
| parent | USB HID: Logitech wheel 0x046d/0xc294 needs HID_QUIRK_NOGET quirk (diff) | |
| download | linux-e071298589418076ef0a9813677f2d7032b65baa.tar.xz linux-e071298589418076ef0a9813677f2d7032b65baa.zip | |
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: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-input.c')
| -rw-r--r-- | drivers/hid/hid-input.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 52de9a914a82..a87b059f866f 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -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); } |