ixp4xx-beeper: add MODULE_ALIAS

[sfrench/cifs-2.6.git] / drivers / input / misc / ixp4xx-beeper.c

diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
index 105c6fc27823e368cd445d63a8787b5fdfe9ac28..798d84c44d036e7550a63c0b7c9448c67076c5ce 100644 (file)
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ b/drivers/input/misc/ixp4xx-beeper.c
@@ -25,6 +25,7 @@
 MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
 MODULE_DESCRIPTION("ixp4xx beeper driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:ixp4xx-beeper");
 
 static DEFINE_SPINLOCK(beep_lock);
 
@@ -51,7 +52,7 @@ static void ixp4xx_spkr_control(unsigned int pin, unsigned int count)
 
 static int ixp4xx_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
-       unsigned int pin = (unsigned int) dev->private;
+       unsigned int pin = (unsigned int) input_get_drvdata(dev);
        unsigned int count = 0;
 
        if (type != EV_SND)
@@ -99,17 +100,18 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev)
        if (!input_dev)
                return -ENOMEM;
 
-       input_dev->private = (void *) dev->id;
+       input_set_drvdata(input_dev, (void *) dev->id);
+
        input_dev->name = "ixp4xx beeper",
        input_dev->phys = "ixp4xx/gpio";
        input_dev->id.bustype = BUS_HOST;
        input_dev->id.vendor  = 0x001f;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &dev->dev;
+       input_dev->dev.parent = &dev->dev;
 
-       input_dev->evbit[0] = BIT(EV_SND);
-       input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
+       input_dev->evbit[0] = BIT_MASK(EV_SND);
+       input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);
        input_dev->event = ixp4xx_spkr_event;
 
        err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt,
@@ -136,7 +138,7 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev)
 static int __devexit ixp4xx_spkr_remove(struct platform_device *dev)
 {
        struct input_dev *input_dev = platform_get_drvdata(dev);
-       unsigned int pin = (unsigned int) input_dev->private;
+       unsigned int pin = (unsigned int) input_get_drvdata(input_dev);
 
        input_unregister_device(input_dev);
        platform_set_drvdata(dev, NULL);
@@ -153,7 +155,7 @@ static int __devexit ixp4xx_spkr_remove(struct platform_device *dev)
 static void ixp4xx_spkr_shutdown(struct platform_device *dev)
 {
        struct input_dev *input_dev = platform_get_drvdata(dev);
-       unsigned int pin = (unsigned int) input_dev->private;
+       unsigned int pin = (unsigned int) input_get_drvdata(input_dev);
 
        /* turn off the speaker */
        disable_irq(IRQ_IXP4XX_TIMER2);