[PATCH] DRIVER MODEL: Get rid of the obsolete tri-level suspend/resume callbacks

In PM v1, all devices were called at SUSPEND_DISABLE level.  Then
all devices were called at SUSPEND_SAVE_STATE level, and finally
SUSPEND_POWER_DOWN level.  However, with PM v2, to maintain
compatibility for platform devices, I arranged for the PM v2
suspend/resume callbacks to call the old PM v1 suspend/resume
callbacks three times with each level in order so that existing
drivers continued to work.

Since this is obsolete infrastructure which is no longer necessary,
we can remove it.  Here's an (untested) patch to do exactly that.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

4 files changed, 51 insertions, 62 deletions

diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index 564bb365f6fc..3210d298b3bc 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -259,24 +259,22 @@ static void corgikbd_hinge_timer(unsigned long data)
 }
 
 #ifdef CONFIG_PM
-static int corgikbd_suspend(struct device *dev, pm_message_t state, uint32_t level)
+static int corgikbd_suspend(struct device *dev, pm_message_t state)
 {
-        if (level == SUSPEND_POWER_DOWN) {
-                struct corgikbd *corgikbd = dev_get_drvdata(dev);
-                corgikbd->suspended = 1;
-        }
+        struct corgikbd *corgikbd = dev_get_drvdata(dev);
+        corgikbd->suspended = 1;
+
         return 0;
 }
 
-static int corgikbd_resume(struct device *dev, uint32_t level)
+static int corgikbd_resume(struct device *dev)
 {
-        if (level == RESUME_POWER_ON) {
-                struct corgikbd *corgikbd = dev_get_drvdata(dev);
+        struct corgikbd *corgikbd = dev_get_drvdata(dev);
+
+        /* Upon resume, ignore the suspend key for a short while */
+        corgikbd->suspend_jiffies=jiffies;
+        corgikbd->suspended = 0;
 
-                /* Upon resume, ignore the suspend key for a short while */
-                corgikbd->suspend_jiffies=jiffies;
-                corgikbd->suspended = 0;
-        }
         return 0;
 }
 #else
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c
index 732fb310e487..cee9c734a048 100644
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
@@ -309,34 +309,32 @@ static void spitzkbd_hinge_timer(unsigned long data)
 }
 
 #ifdef CONFIG_PM
-static int spitzkbd_suspend(struct device *dev, pm_message_t state, uint32_t level)
+static int spitzkbd_suspend(struct device *dev, pm_message_t state)
 {
-        if (level == SUSPEND_POWER_DOWN) {
-                int i;
-                struct spitzkbd *spitzkbd = dev_get_drvdata(dev);
-                spitzkbd->suspended = 1;
-
-                /* Set Strobe lines as inputs - *except* strobe line 0 leave this
-                   enabled so we can detect a power button press for resume */
-                for (i = 1; i < SPITZ_KEY_STROBE_NUM; i++)
-                        pxa_gpio_mode(spitz_strobes[i] | GPIO_IN);
-        }
+        int i;
+        struct spitzkbd *spitzkbd = dev_get_drvdata(dev);
+        spitzkbd->suspended = 1;
+
+        /* Set Strobe lines as inputs - *except* strobe line 0 leave this
+           enabled so we can detect a power button press for resume */
+        for (i = 1; i < SPITZ_KEY_STROBE_NUM; i++)
+                pxa_gpio_mode(spitz_strobes[i] | GPIO_IN);
+
         return 0;
 }
 
-static int spitzkbd_resume(struct device *dev, uint32_t level)
+static int spitzkbd_resume(struct device *dev)
 {
-        if (level == RESUME_POWER_ON) {
-                int i;
-                struct spitzkbd *spitzkbd = dev_get_drvdata(dev);
+        int i;
+        struct spitzkbd *spitzkbd = dev_get_drvdata(dev);
+
+        for (i = 0; i < SPITZ_KEY_STROBE_NUM; i++)
+                pxa_gpio_mode(spitz_strobes[i] | GPIO_OUT | GPIO_DFLT_HIGH);
 
-                for (i = 0; i < SPITZ_KEY_STROBE_NUM; i++)
-                        pxa_gpio_mode(spitz_strobes[i] | GPIO_OUT | GPIO_DFLT_HIGH);
+        /* Upon resume, ignore the suspend key for a short while */
+        spitzkbd->suspend_jiffies = jiffies;
+        spitzkbd->suspended = 0;
 
-                /* Upon resume, ignore the suspend key for a short while */
-                spitzkbd->suspend_jiffies = jiffies;
-                spitzkbd->suspended = 0;
-        }
         return 0;
 }
 #else
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 40d451ce07ff..4bc40f159996 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -911,12 +911,10 @@ static long i8042_panic_blink(long count)
  * Here we try to restore the original BIOS settings
  */
 
-static int i8042_suspend(struct device *dev, pm_message_t state, u32 level)
+static int i8042_suspend(struct device *dev, pm_message_t state)
 {
-        if (level == SUSPEND_DISABLE) {
-                del_timer_sync(&i8042_timer);
-                i8042_controller_reset();
-        }
+        del_timer_sync(&i8042_timer);
+        i8042_controller_reset();
 
         return 0;
 }
@@ -926,13 +924,10 @@ static int i8042_suspend(struct device *dev, pm_message_t state, u32 level)
  * Here we try to reset everything back to a state in which suspended
  */
 
-static int i8042_resume(struct device *dev, u32 level)
+static int i8042_resume(struct device *dev)
 {
         int i;
 
-        if (level != RESUME_ENABLE)
-                return 0;
-
         if (i8042_ctl_test())
                 return -1;
 
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index 40ae183ba1cd..0ba3e6562bff 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -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 device *dev, pm_message_t state)
 {
-        if (level == SUSPEND_POWER_DOWN) {
-                struct corgi_ts *corgi_ts = dev_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;
+        struct corgi_ts *corgi_ts = dev_get_drvdata(dev);
 
-                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 device *dev)
 {
-        if (level == RESUME_POWER_ON) {
-                struct corgi_ts *corgi_ts = dev_get_drvdata(dev);
+        struct corgi_ts *corgi_ts = dev_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