diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2007-04-12 01:35:32 -0400 |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-04-12 01:35:32 -0400 |
commit | 293e6392d72dfaef1f6aef605769869512bec45d (patch) | |
tree | 997d2e3ef4df9f8d5a65ed2e9344251c4dff0a1f /drivers/input/misc/sparcspkr.c | |
parent | 935e658e89678a7e3427b90cd7a1c86025d95bfe (diff) |
Input: misc devices - 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>
Diffstat (limited to 'drivers/input/misc/sparcspkr.c')
-rw-r--r-- | drivers/input/misc/sparcspkr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c index 106c94f33b93..e36ec1d92be8 100644 --- a/drivers/input/misc/sparcspkr.c +++ b/drivers/input/misc/sparcspkr.c | |||
@@ -28,7 +28,7 @@ struct sparcspkr_state { | |||
28 | 28 | ||
29 | static int ebus_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) | 29 | static int ebus_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) |
30 | { | 30 | { |
31 | struct sparcspkr_state *state = dev_get_drvdata(dev->cdev.dev); | 31 | struct sparcspkr_state *state = dev_get_drvdata(dev->dev.parent); |
32 | unsigned int count = 0; | 32 | unsigned int count = 0; |
33 | unsigned long flags; | 33 | unsigned long flags; |
34 | 34 | ||
@@ -61,7 +61,7 @@ static int ebus_spkr_event(struct input_dev *dev, unsigned int type, unsigned in | |||
61 | 61 | ||
62 | static int isa_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) | 62 | static int isa_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) |
63 | { | 63 | { |
64 | struct sparcspkr_state *state = dev_get_drvdata(dev->cdev.dev); | 64 | struct sparcspkr_state *state = dev_get_drvdata(dev->dev.parent); |
65 | unsigned int count = 0; | 65 | unsigned int count = 0; |
66 | unsigned long flags; | 66 | unsigned long flags; |
67 | 67 | ||
@@ -113,7 +113,7 @@ static int __devinit sparcspkr_probe(struct device *dev) | |||
113 | input_dev->id.vendor = 0x001f; | 113 | input_dev->id.vendor = 0x001f; |
114 | input_dev->id.product = 0x0001; | 114 | input_dev->id.product = 0x0001; |
115 | input_dev->id.version = 0x0100; | 115 | input_dev->id.version = 0x0100; |
116 | input_dev->cdev.dev = dev; | 116 | input_dev->dev.parent = dev; |
117 | 117 | ||
118 | input_dev->evbit[0] = BIT(EV_SND); | 118 | input_dev->evbit[0] = BIT(EV_SND); |
119 | input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE); | 119 | input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE); |