[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>

7 files changed, 51 insertions, 69 deletions

diff --git a/drivers/video/backlight/corgi_bl.c b/drivers/video/backlight/corgi_bl.c
index 3c72c627e65e..1991fdb32dfb 100644
--- a/drivers/video/backlight/corgi_bl.c
+++ b/drivers/video/backlight/corgi_bl.c
@@ -73,17 +73,15 @@ static void corgibl_blank(int blank)
 }
 
 #ifdef CONFIG_PM
-static int corgibl_suspend(struct device *dev, pm_message_t state, u32 level)
+static int corgibl_suspend(struct device *dev, pm_message_t state)
 {
-        if (level == SUSPEND_POWER_DOWN)
-                corgibl_blank(FB_BLANK_POWERDOWN);
+        corgibl_blank(FB_BLANK_POWERDOWN);
         return 0;
 }
 
-static int corgibl_resume(struct device *dev, u32 level)
+static int corgibl_resume(struct device *dev)
 {
-        if (level == RESUME_POWER_ON)
-                corgibl_blank(FB_BLANK_UNBLANK);
+        corgibl_blank(FB_BLANK_UNBLANK);
         return 0;
 }
 #else
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 1d54d3d6960b..0b9301facbd3 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -424,23 +424,21 @@ static void imxfb_setup_gpio(struct imxfb_info *fbi)
  * Power management hooks.  Note that we won't be called from IRQ context,
  * unlike the blank functions above, so we may sleep.
  */
-static int imxfb_suspend(struct device *dev, pm_message_t state, u32 level)
+static int imxfb_suspend(struct device *dev, pm_message_t state)
 {
         struct imxfb_info *fbi = dev_get_drvdata(dev);
         pr_debug("%s\n",__FUNCTION__);
 
-        if (level == SUSPEND_DISABLE || level == SUSPEND_POWER_DOWN)
-                imxfb_disable_controller(fbi);
+        imxfb_disable_controller(fbi);
         return 0;
 }
 
-static int imxfb_resume(struct device *dev, u32 level)
+static int imxfb_resume(struct device *dev)
 {
         struct imxfb_info *fbi = dev_get_drvdata(dev);
         pr_debug("%s\n",__FUNCTION__);
 
-        if (level == RESUME_ENABLE)
-                imxfb_enable_controller(fbi);
+        imxfb_enable_controller(fbi);
         return 0;
 }
 #else
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 194eed0a238c..6206da9dd5da 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -981,21 +981,19 @@ pxafb_freq_policy(struct notifier_block *nb, unsigned long val, void *data)
  * Power management hooks.  Note that we won't be called from IRQ context,
  * unlike the blank functions above, so we may sleep.
  */
-static int pxafb_suspend(struct device *dev, pm_message_t state, u32 level)
+static int pxafb_suspend(struct device *dev, pm_message_t state)
 {
         struct pxafb_info *fbi = dev_get_drvdata(dev);
 
-        if (level == SUSPEND_DISABLE || level == SUSPEND_POWER_DOWN)
-                set_ctrlr_state(fbi, C_DISABLE_PM);
+        set_ctrlr_state(fbi, C_DISABLE_PM);
         return 0;
 }
 
-static int pxafb_resume(struct device *dev, u32 level)
+static int pxafb_resume(struct device *dev)
 {
         struct pxafb_info *fbi = dev_get_drvdata(dev);
 
-        if (level == RESUME_ENABLE)
-                set_ctrlr_state(fbi, C_ENABLE_PM);
+        set_ctrlr_state(fbi, C_ENABLE_PM);
         return 0;
 }
 #else
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index fa98d91c42eb..cb2f7a1de947 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -655,7 +655,7 @@ bail:
 }
 
 #ifdef CONFIG_PM
-static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state, u32 level)
+static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state)
 {
         struct fb_info *info = dev_get_drvdata(dev);
         struct s1d13xxxfb_par *s1dfb = info->par;
@@ -702,15 +702,12 @@ static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state, u32 level)
                 return 0;
 }
 
-static int s1d13xxxfb_resume(struct device *dev, u32 level)
+static int s1d13xxxfb_resume(struct device *dev)
 {
         struct fb_info *info = dev_get_drvdata(dev);
         struct s1d13xxxfb_par *s1dfb = info->par;
         struct s1d13xxxfb_pdata *pdata = NULL;
 
-        if (level != RESUME_ENABLE)
-                return 0;
-
         /* awaken the chip */
         s1d13xxxfb_writereg(s1dfb, S1DREG_PS_CNF, 0x10);
 
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 5ab79afb53b7..3862d3cb1fb2 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -847,37 +847,32 @@ static int s3c2410fb_remove(struct device *dev)
 
 /* suspend and resume support for the lcd controller */
 
-static int s3c2410fb_suspend(struct device *dev, pm_message_t state, u32 level)
+static int s3c2410fb_suspend(struct device *dev, pm_message_t state)
 {
         struct fb_info     *fbinfo = dev_get_drvdata(dev);
         struct s3c2410fb_info *info = fbinfo->par;
 
-        if (level == SUSPEND_DISABLE || level == SUSPEND_POWER_DOWN) {
-                s3c2410fb_stop_lcd();
+        s3c2410fb_stop_lcd();
 
-                /* sleep before disabling the clock, we need to ensure
-                 * the LCD DMA engine is not going to get back on the bus
-                 * before the clock goes off again (bjd) */
+        /* sleep before disabling the clock, we need to ensure
+         * the LCD DMA engine is not going to get back on the bus
+         * before the clock goes off again (bjd) */
 
-                msleep(1);
-                clk_disable(info->clk);
-        }
+        msleep(1);
+        clk_disable(info->clk);
 
         return 0;
 }
 
-static int s3c2410fb_resume(struct device *dev, u32 level)
+static int s3c2410fb_resume(struct device *dev)
 {
         struct fb_info     *fbinfo = dev_get_drvdata(dev);
         struct s3c2410fb_info *info = fbinfo->par;
 
-        if (level == RESUME_ENABLE) {
-                clk_enable(info->clk);
-                msleep(1);
-
-                s3c2410fb_init_registers(info);
+        clk_enable(info->clk);
+        msleep(1);
 
-        }
+        s3c2410fb_init_registers(info);
 
         return 0;
 }
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index 8000890e4271..78e5f194b0df 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1309,21 +1309,19 @@ sa1100fb_freq_policy(struct notifier_block *nb, unsigned long val,
  * Power management hooks.  Note that we won't be called from IRQ context,
  * unlike the blank functions above, so we may sleep.
  */
-static int sa1100fb_suspend(struct device *dev, pm_message_t state, u32 level)
+static int sa1100fb_suspend(struct device *dev, pm_message_t state)
 {
         struct sa1100fb_info *fbi = dev_get_drvdata(dev);
 
-        if (level == SUSPEND_DISABLE || level == SUSPEND_POWER_DOWN)
-                set_ctrlr_state(fbi, C_DISABLE_PM);
+        set_ctrlr_state(fbi, C_DISABLE_PM);
         return 0;
 }
 
-static int sa1100fb_resume(struct device *dev, u32 level)
+static int sa1100fb_resume(struct device *dev)
 {
         struct sa1100fb_info *fbi = dev_get_drvdata(dev);
 
-        if (level == RESUME_ENABLE)
-                set_ctrlr_state(fbi, C_ENABLE_PM);
+        set_ctrlr_state(fbi, C_ENABLE_PM);
         return 0;
 }
 #else
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index 0030c071da8f..752bf88906a9 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -438,36 +438,34 @@ static void w100fb_restore_vidmem(struct w100fb_par *par)
         }
 }
 
-static int w100fb_suspend(struct device *dev, pm_message_t state, uint32_t level)
+static int w100fb_suspend(struct device *dev, pm_message_t state)
 {
-        if (level == SUSPEND_POWER_DOWN) {
-                struct fb_info *info = dev_get_drvdata(dev);
-                struct w100fb_par *par=info->par;
-                struct w100_tg_info *tg = par->mach->tg;
-
-                w100fb_save_vidmem(par);
-                if(tg && tg->suspend)
-                        tg->suspend(par);
-                w100_suspend(W100_SUSPEND_ALL);
-                par->blanked = 1;
-        }
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct w100fb_par *par=info->par;
+        struct w100_tg_info *tg = par->mach->tg;
+
+        w100fb_save_vidmem(par);
+        if(tg && tg->suspend)
+                tg->suspend(par);
+        w100_suspend(W100_SUSPEND_ALL);
+        par->blanked = 1;
+
         return 0;
 }
 
-static int w100fb_resume(struct device *dev, uint32_t level)
+static int w100fb_resume(struct device *dev)
 {
-        if (level == RESUME_POWER_ON) {
-                struct fb_info *info = dev_get_drvdata(dev);
-                struct w100fb_par *par=info->par;
-                struct w100_tg_info *tg = par->mach->tg;
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct w100fb_par *par=info->par;
+        struct w100_tg_info *tg = par->mach->tg;
+
+        w100_hw_init(par);
+        w100fb_activate_var(par);
+        w100fb_restore_vidmem(par);
+        if(tg && tg->resume)
+                tg->resume(par);
+        par->blanked = 0;
 
-                w100_hw_init(par);
-                w100fb_activate_var(par);
-                w100fb_restore_vidmem(par);
-                if(tg && tg->resume)
-                        tg->resume(par);
-                par->blanked = 0;
-        }
         return 0;
 }
 #else