Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[powerpc.git] / drivers / input / touchscreen / corgi_ts.c

diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index 40ae183..1042987 100644 (file)
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -11,7 +11,7 @@
 
 
 #include <linux/delay.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
@@ -231,34 +231,32 @@ static irqreturn_t ts_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 #ifdef CONFIG_PM
-static int corgits_suspend(struct device *dev, pm_message_t state, uint32_t level)
+static int corgits_suspend(struct platform_device *dev, pm_message_t state)
 {
-       if (level == SUSPEND_POWER_DOWN) {
-               struct corgi_ts *corgi_ts = dev_get_drvdata(dev);
+       struct corgi_ts *corgi_ts = platform_get_drvdata(dev);
 
-               if (corgi_ts->pendown) {
-                       del_timer_sync(&corgi_ts->timer);
-                       corgi_ts->tc.pressure = 0;
-                       new_data(corgi_ts, NULL);
-                       corgi_ts->pendown = 0;
-               }
-               corgi_ts->power_mode = PWR_MODE_SUSPEND;
-
-               corgi_ssp_ads7846_putget((1u << ADSCTRL_ADR_SH) | ADSCTRL_STS);
+       if (corgi_ts->pendown) {
+               del_timer_sync(&corgi_ts->timer);
+               corgi_ts->tc.pressure = 0;
+               new_data(corgi_ts, NULL);
+               corgi_ts->pendown = 0;
        }
+       corgi_ts->power_mode = PWR_MODE_SUSPEND;
+
+       corgi_ssp_ads7846_putget((1u << ADSCTRL_ADR_SH) | ADSCTRL_STS);
+
        return 0;
 }
 
-static int corgits_resume(struct device *dev, uint32_t level)
+static int corgits_resume(struct platform_device *dev)
 {
-       if (level == RESUME_POWER_ON) {
-               struct corgi_ts *corgi_ts = dev_get_drvdata(dev);
+       struct corgi_ts *corgi_ts = platform_get_drvdata(dev);
+
+       corgi_ssp_ads7846_putget((4u << ADSCTRL_ADR_SH) | ADSCTRL_STS);
+       /* Enable Falling Edge */
+       set_irq_type(corgi_ts->irq_gpio, IRQT_FALLING);
+       corgi_ts->power_mode = PWR_MODE_ACTIVE;
 
-               corgi_ssp_ads7846_putget((4u << ADSCTRL_ADR_SH) | ADSCTRL_STS);
-               /* Enable Falling Edge */
-               set_irq_type(corgi_ts->irq_gpio, IRQT_FALLING);
-               corgi_ts->power_mode = PWR_MODE_ACTIVE;
-       }
        return 0;
 }
 #else
@@ -266,10 +264,9 @@ static int corgits_resume(struct device *dev, uint32_t level)
 #define corgits_resume         NULL
 #endif
 
-static int __init corgits_probe(struct device *dev)
+static int __init corgits_probe(struct platform_device *pdev)
 {
        struct corgi_ts *corgi_ts;
-       struct platform_device *pdev = to_platform_device(dev);
        struct input_dev *input_dev;
        int err = -ENOMEM;
 
@@ -278,9 +275,9 @@ static int __init corgits_probe(struct device *dev)
        if (!corgi_ts || !input_dev)
                goto fail;
 
-       dev_set_drvdata(dev, corgi_ts);
+       platform_set_drvdata(pdev, corgi_ts);
 
-       corgi_ts->machinfo = dev->platform_data;
+       corgi_ts->machinfo = pdev->dev.platform_data;
        corgi_ts->irq_gpio = platform_get_irq(pdev, 0);
 
        if (corgi_ts->irq_gpio < 0) {
@@ -300,7 +297,7 @@ static int __init corgits_probe(struct device *dev)
        input_dev->id.vendor = 0x0001;
        input_dev->id.product = 0x0002;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = dev;
+       input_dev->cdev.dev = &pdev->dev;
        input_dev->private = corgi_ts;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
@@ -341,9 +338,9 @@ static int __init corgits_probe(struct device *dev)
 
 }
 
-static int corgits_remove(struct device *dev)
+static int corgits_remove(struct platform_device *pdev)
 {
-       struct corgi_ts *corgi_ts = dev_get_drvdata(dev);
+       struct corgi_ts *corgi_ts = platform_get_drvdata(pdev);
 
        free_irq(corgi_ts->irq_gpio, NULL);
        del_timer_sync(&corgi_ts->timer);
@@ -353,23 +350,24 @@ static int corgits_remove(struct device *dev)
        return 0;
 }
 
-static struct device_driver corgits_driver = {
-       .name           = "corgi-ts",
-       .bus            = &platform_bus_type,
+static struct platform_driver corgits_driver = {
        .probe          = corgits_probe,
        .remove         = corgits_remove,
        .suspend        = corgits_suspend,
        .resume         = corgits_resume,
+       .driver         = {
+               .name   = "corgi-ts",
+       },
 };
 
 static int __devinit corgits_init(void)
 {
-       return driver_register(&corgits_driver);
+       return platform_driver_register(&corgits_driver);
 }
 
 static void __exit corgits_exit(void)
 {
-       driver_unregister(&corgits_driver);
+       platform_driver_unregister(&corgits_driver);
 }
 
 module_init(corgits_init);