6 files changed, 46 insertions, 66 deletions

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 01c2cf4efcdd..cc273226dbd0 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -247,8 +247,7 @@ static int amba_pm_restore(struct device *dev)
 /*
  * Hooks to provide runtime PM of the pclk (bus clock).  It is safe to
  * enable/disable the bus clock at runtime PM suspend/resume as this
- * does not result in loss of context.  However, disabling vcore power
- * would do, so we leave that to the driver.
+ * does not result in loss of context.
  */
 static int amba_pm_runtime_suspend(struct device *dev)
 {
@@ -354,39 +353,6 @@ static void amba_put_disable_pclk(struct amba_device *pcdev)
         clk_put(pclk);
 }
 
-static int amba_get_enable_vcore(struct amba_device *pcdev)
-{
-        struct regulator *vcore = regulator_get(&pcdev->dev, "vcore");
-        int ret;
-
-        pcdev->vcore = vcore;
-
-        if (IS_ERR(vcore)) {
-                /* It is OK not to supply a vcore regulator */
-                if (PTR_ERR(vcore) == -ENODEV)
-                        return 0;
-                return PTR_ERR(vcore);
-        }
-
-        ret = regulator_enable(vcore);
-        if (ret) {
-                regulator_put(vcore);
-                pcdev->vcore = ERR_PTR(-ENODEV);
-        }
-
-        return ret;
-}
-
-static void amba_put_disable_vcore(struct amba_device *pcdev)
-{
-        struct regulator *vcore = pcdev->vcore;
-
-        if (!IS_ERR(vcore)) {
-                regulator_disable(vcore);
-                regulator_put(vcore);
-        }
-}
-
 /*
  * These are the device model conversion veneers; they convert the
  * device model structures to our more specific structures.
@@ -399,10 +365,6 @@ static int amba_probe(struct device *dev)
         int ret;
 
         do {
-                ret = amba_get_enable_vcore(pcdev);
-                if (ret)
-                        break;
-
                 ret = amba_get_enable_pclk(pcdev);
                 if (ret)
                         break;
@@ -420,7 +382,6 @@ static int amba_probe(struct device *dev)
                 pm_runtime_put_noidle(dev);
 
                 amba_put_disable_pclk(pcdev);
-                amba_put_disable_vcore(pcdev);
         } while (0);
 
         return ret;
@@ -442,7 +403,6 @@ static int amba_remove(struct device *dev)
         pm_runtime_put_noidle(dev);
 
         amba_put_disable_pclk(pcdev);
-        amba_put_disable_vcore(pcdev);
 
         return ret;
 }
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index ebc1e8658226..5be32489714f 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2788,6 +2788,7 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = {
                 .constraints = {
                         .name = "db8500-vape",
                         .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+                        .always_on = true,
                 },
                 .consumer_supplies = db8500_vape_consumers,
                 .num_consumer_supplies = ARRAY_SIZE(db8500_vape_consumers),
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 815674415267..d20f1334792b 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -967,16 +967,47 @@ pci_save_state(struct pci_dev *dev)
         return 0;
 }
 
+static void pci_restore_config_dword(struct pci_dev *pdev, int offset,
+                                     u32 saved_val, int retry)
+{
+        u32 val;
+
+        pci_read_config_dword(pdev, offset, &val);
+        if (val == saved_val)
+                return;
+
+        for (;;) {
+                dev_dbg(&pdev->dev, "restoring config space at offset "
+                        "%#x (was %#x, writing %#x)\n", offset, val, saved_val);
+                pci_write_config_dword(pdev, offset, saved_val);
+                if (retry-- <= 0)
+                        return;
+
+                pci_read_config_dword(pdev, offset, &val);
+                if (val == saved_val)
+                        return;
+
+                mdelay(1);
+        }
+}
+
+static void pci_restore_config_space(struct pci_dev *pdev, int start, int end,
+                                     int retry)
+{
+        int index;
+
+        for (index = end; index >= start; index--)
+                pci_restore_config_dword(pdev, 4 * index,
+                                         pdev->saved_config_space[index],
+                                         retry);
+}
+
 /** 
  * pci_restore_state - Restore the saved state of a PCI device
  * @dev: - PCI device that we're dealing with
  */
 void pci_restore_state(struct pci_dev *dev)
 {
-        int i;
-        u32 val;
-        int tries;
-
         if (!dev->state_saved)
                 return;
 
@@ -984,24 +1015,14 @@ void pci_restore_state(struct pci_dev *dev)
         pci_restore_pcie_state(dev);
         pci_restore_ats_state(dev);
 
+        pci_restore_config_space(dev, 10, 15, 0);
         /*
          * The Base Address register should be programmed before the command
          * register(s)
          */
-        for (i = 15; i >= 0; i--) {
-                pci_read_config_dword(dev, i * 4, &val);
-                tries = 10;             
-                while (tries && val != dev->saved_config_space[i]) {
-                        dev_dbg(&dev->dev, "restoring config "
-                                "space at offset %#x (was %#x, writing %#x)\n",
-                                i, val, (int)dev->saved_config_space[i]);
-                        pci_write_config_dword(dev,i * 4,
-                                dev->saved_config_space[i]);
-                        pci_read_config_dword(dev, i * 4, &val);
-                        mdelay(10);
-                        tries--;
-                }
-        }
+        pci_restore_config_space(dev, 4, 9, 10);
+        pci_restore_config_space(dev, 0, 3, 0);
+
         pci_restore_pcix_state(dev);
         pci_restore_msi_state(dev);
         pci_restore_iov_state(dev);
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 2cfcbffa41fd..386f0c53bea7 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -835,7 +835,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
 
         scsi_eh_restore_cmnd(scmd, &ses);
 
-        if (sdrv->eh_action)
+        if (sdrv && sdrv->eh_action)
                 rtn = sdrv->eh_action(scmd, cmnd, cmnd_size, rtn);
 
         return rtn;
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index 96f0da66b185..09c925aaf320 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -2195,7 +2195,6 @@ static int pl022_runtime_suspend(struct device *dev)
         struct pl022 *pl022 = dev_get_drvdata(dev);
 
         clk_disable(pl022->clk);
-        amba_vcore_disable(pl022->adev);
 
         return 0;
 }
@@ -2204,7 +2203,6 @@ static int pl022_runtime_resume(struct device *dev)
 {
         struct pl022 *pl022 = dev_get_drvdata(dev);
 
-        amba_vcore_enable(pl022->adev);
         clk_enable(pl022->clk);
 
         return 0;
diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c
index 4527cbf0a4ec..b061d709bc44 100644
--- a/drivers/video/msm/mddi.c
+++ b/drivers/video/msm/mddi.c
@@ -420,7 +420,7 @@ static void mddi_resume(struct msm_mddi_client_data *cdata)
         mddi_set_auto_hibernate(&mddi->client_data, 1);
 }
 
-static int __init mddi_get_client_caps(struct mddi_info *mddi)
+static int __devinit mddi_get_client_caps(struct mddi_info *mddi)
 {
         int i, j;
 
@@ -622,9 +622,9 @@ uint32_t mddi_remote_read(struct msm_mddi_client_data *cdata, uint32_t reg)
 
 static struct mddi_info mddi_info[2];
 
-static int __init mddi_clk_setup(struct platform_device *pdev,
-                                 struct mddi_info *mddi,
-                                 unsigned long clk_rate)
+static int __devinit mddi_clk_setup(struct platform_device *pdev,
+                                    struct mddi_info *mddi,
+                                    unsigned long clk_rate)
 {
         int ret;