2 files changed, 3 insertions, 8 deletions

diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 0846922b2316..829b98c5c66f 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -1604,6 +1604,9 @@ static inline void pcs_irq_set(struct pcs_soc_data *pcs_soc,
                 pcs->write(mask, pcswi->reg);
                 raw_spin_unlock(&pcs->lock);
         }
+
+        if (pcs_soc->rearm)
+                pcs_soc->rearm();
 }
 
 /**
@@ -1626,8 +1629,6 @@ static void pcs_irq_unmask(struct irq_data *d)
         struct pcs_soc_data *pcs_soc = irq_data_get_irq_chip_data(d);
 
         pcs_irq_set(pcs_soc, d->irq, true);
-        if (pcs_soc->rearm)
-                pcs_soc->rearm();
 }
 
 /**
@@ -1678,11 +1679,6 @@ static int pcs_irq_handle(struct pcs_soc_data *pcs_soc)
                 }
         }
 
-        /*
-         * For debugging on omaps, you may want to call pcs_soc->rearm()
-         * here to see wake-up interrupts during runtime also.
-         */
-
         return count;
 }
 
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c
index 00b3a52c1d68..cee9602f9a7b 100644
--- a/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@ -141,7 +141,6 @@ static int exynos_mipi_dsi_early_blank_mode(struct mipi_dsim_device *dsim,
 
 static int exynos_mipi_dsi_blank_mode(struct mipi_dsim_device *dsim, int power)
 {
-        struct platform_device *pdev = to_platform_device(dsim->dev);
         struct mipi_dsim_lcd_driver *client_drv = dsim->dsim_lcd_drv;
         struct mipi_dsim_lcd_device *client_dev = dsim->dsim_lcd_dev;