diff options
Diffstat (limited to 'drivers/input/misc/ixp4xx-beeper.c')
-rw-r--r-- | drivers/input/misc/ixp4xx-beeper.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c index 105c6fc27823..da6650caf7b5 100644 --- a/drivers/input/misc/ixp4xx-beeper.c +++ b/drivers/input/misc/ixp4xx-beeper.c | |||
@@ -51,7 +51,7 @@ static void ixp4xx_spkr_control(unsigned int pin, unsigned int count) | |||
51 | 51 | ||
52 | static int ixp4xx_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) | 52 | static int ixp4xx_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) |
53 | { | 53 | { |
54 | unsigned int pin = (unsigned int) dev->private; | 54 | unsigned int pin = (unsigned int) input_get_drvdata(input_dev); |
55 | unsigned int count = 0; | 55 | unsigned int count = 0; |
56 | 56 | ||
57 | if (type != EV_SND) | 57 | if (type != EV_SND) |
@@ -99,7 +99,8 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev) | |||
99 | if (!input_dev) | 99 | if (!input_dev) |
100 | return -ENOMEM; | 100 | return -ENOMEM; |
101 | 101 | ||
102 | input_dev->private = (void *) dev->id; | 102 | input_set_drvdata(input_dev, (void *) dev->id); |
103 | |||
103 | input_dev->name = "ixp4xx beeper", | 104 | input_dev->name = "ixp4xx beeper", |
104 | input_dev->phys = "ixp4xx/gpio"; | 105 | input_dev->phys = "ixp4xx/gpio"; |
105 | input_dev->id.bustype = BUS_HOST; | 106 | input_dev->id.bustype = BUS_HOST; |
@@ -136,7 +137,7 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev) | |||
136 | static int __devexit ixp4xx_spkr_remove(struct platform_device *dev) | 137 | static int __devexit ixp4xx_spkr_remove(struct platform_device *dev) |
137 | { | 138 | { |
138 | struct input_dev *input_dev = platform_get_drvdata(dev); | 139 | struct input_dev *input_dev = platform_get_drvdata(dev); |
139 | unsigned int pin = (unsigned int) input_dev->private; | 140 | unsigned int pin = (unsigned int) input_get_drvdata(input_dev); |
140 | 141 | ||
141 | input_unregister_device(input_dev); | 142 | input_unregister_device(input_dev); |
142 | platform_set_drvdata(dev, NULL); | 143 | platform_set_drvdata(dev, NULL); |
@@ -153,7 +154,7 @@ static int __devexit ixp4xx_spkr_remove(struct platform_device *dev) | |||
153 | static void ixp4xx_spkr_shutdown(struct platform_device *dev) | 154 | static void ixp4xx_spkr_shutdown(struct platform_device *dev) |
154 | { | 155 | { |
155 | struct input_dev *input_dev = platform_get_drvdata(dev); | 156 | struct input_dev *input_dev = platform_get_drvdata(dev); |
156 | unsigned int pin = (unsigned int) input_dev->private; | 157 | unsigned int pin = (unsigned int) input_get_drvdata(input_dev); |
157 | 158 | ||
158 | /* turn off the speaker */ | 159 | /* turn off the speaker */ |
159 | disable_irq(IRQ_IXP4XX_TIMER2); | 160 | disable_irq(IRQ_IXP4XX_TIMER2); |