4 files changed, 5 insertions, 35 deletions

diff --git a/drivers/mfd/wm8350-irq.c b/drivers/mfd/wm8350-irq.c
index 2ea2b8b4c72a..c8df547c4747 100644
--- a/drivers/mfd/wm8350-irq.c
+++ b/drivers/mfd/wm8350-irq.c
@@ -445,6 +445,8 @@ int wm8350_register_irq(struct wm8350 *wm8350, int irq,
         wm8350->irq[irq].data = data;
         mutex_unlock(&wm8350->irq_mutex);
 
+        wm8350_unmask_irq(wm8350, irq);
+
         return 0;
 }
 EXPORT_SYMBOL_GPL(wm8350_register_irq);
@@ -454,6 +456,8 @@ int wm8350_free_irq(struct wm8350 *wm8350, int irq)
         if (irq < 0 || irq > WM8350_NUM_IRQ)
                 return -EINVAL;
 
+        wm8350_mask_irq(wm8350, irq);
+
         mutex_lock(&wm8350->irq_mutex);
         wm8350->irq[irq].handler = NULL;
         mutex_unlock(&wm8350->irq_mutex);
diff --git a/drivers/power/wm8350_power.c b/drivers/power/wm8350_power.c
index 6e634cf7fc14..ad4f071e1287 100644
--- a/drivers/power/wm8350_power.c
+++ b/drivers/power/wm8350_power.c
@@ -391,80 +391,54 @@ static void wm8350_init_charger(struct wm8350 *wm8350)
         /* register our interest in charger events */
         wm8350_register_irq(wm8350, WM8350_IRQ_CHG_BAT_HOT,
                             wm8350_charger_handler, 0, "Battery hot", wm8350);
-        wm8350_unmask_irq(wm8350, WM8350_IRQ_CHG_BAT_HOT);
         wm8350_register_irq(wm8350, WM8350_IRQ_CHG_BAT_COLD,
                             wm8350_charger_handler, 0, "Battery cold", wm8350);
-        wm8350_unmask_irq(wm8350, WM8350_IRQ_CHG_BAT_COLD);
         wm8350_register_irq(wm8350, WM8350_IRQ_CHG_BAT_FAIL,
                             wm8350_charger_handler, 0, "Battery fail", wm8350);
-        wm8350_unmask_irq(wm8350, WM8350_IRQ_CHG_BAT_FAIL);
         wm8350_register_irq(wm8350, WM8350_IRQ_CHG_TO,
                             wm8350_charger_handler, 0,
                             "Charger timeout", wm8350);
-        wm8350_unmask_irq(wm8350, WM8350_IRQ_CHG_TO);
         wm8350_register_irq(wm8350, WM8350_IRQ_CHG_END,
                             wm8350_charger_handler, 0,
                             "Charge end", wm8350);
-        wm8350_unmask_irq(wm8350, WM8350_IRQ_CHG_END);
         wm8350_register_irq(wm8350, WM8350_IRQ_CHG_START,
                             wm8350_charger_handler, 0,
                             "Charge start", wm8350);
-        wm8350_unmask_irq(wm8350, WM8350_IRQ_CHG_START);
         wm8350_register_irq(wm8350, WM8350_IRQ_CHG_FAST_RDY,
                             wm8350_charger_handler, 0,
                             "Fast charge ready", wm8350);
-        wm8350_unmask_irq(wm8350, WM8350_IRQ_CHG_FAST_RDY);
         wm8350_register_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P9,
                             wm8350_charger_handler, 0,
                             "Battery <3.9V", wm8350);
-        wm8350_unmask_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P9);
         wm8350_register_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P1,
                             wm8350_charger_handler, 0,
                             "Battery <3.1V", wm8350);
-        wm8350_unmask_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P1);
         wm8350_register_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_2P85,
                             wm8350_charger_handler, 0,
                             "Battery <2.85V", wm8350);
 
-        wm8350_unmask_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_2P85);
-
         /* and supply change events */
         wm8350_register_irq(wm8350, WM8350_IRQ_EXT_USB_FB,
                             wm8350_charger_handler, 0, "USB", wm8350);
-        wm8350_unmask_irq(wm8350, WM8350_IRQ_EXT_USB_FB);
         wm8350_register_irq(wm8350, WM8350_IRQ_EXT_WALL_FB,
                             wm8350_charger_handler, 0, "Wall", wm8350);
-        wm8350_unmask_irq(wm8350, WM8350_IRQ_EXT_WALL_FB);
         wm8350_register_irq(wm8350, WM8350_IRQ_EXT_BAT_FB,
                             wm8350_charger_handler, 0, "Battery", wm8350);
-        wm8350_unmask_irq(wm8350, WM8350_IRQ_EXT_BAT_FB);
 }
 
 static void free_charger_irq(struct wm8350 *wm8350)
 {
-        wm8350_mask_irq(wm8350, WM8350_IRQ_CHG_BAT_HOT);
         wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_HOT);
-        wm8350_mask_irq(wm8350, WM8350_IRQ_CHG_BAT_COLD);
         wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_COLD);
-        wm8350_mask_irq(wm8350, WM8350_IRQ_CHG_BAT_FAIL);
         wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_FAIL);
-        wm8350_mask_irq(wm8350, WM8350_IRQ_CHG_TO);
         wm8350_free_irq(wm8350, WM8350_IRQ_CHG_TO);
-        wm8350_mask_irq(wm8350, WM8350_IRQ_CHG_END);
         wm8350_free_irq(wm8350, WM8350_IRQ_CHG_END);
-        wm8350_mask_irq(wm8350, WM8350_IRQ_CHG_START);
         wm8350_free_irq(wm8350, WM8350_IRQ_CHG_START);
-        wm8350_mask_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P9);
         wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P9);
-        wm8350_mask_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P1);
         wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P1);
-        wm8350_mask_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_2P85);
         wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_2P85);
-        wm8350_mask_irq(wm8350, WM8350_IRQ_EXT_USB_FB);
         wm8350_free_irq(wm8350, WM8350_IRQ_EXT_USB_FB);
-        wm8350_mask_irq(wm8350, WM8350_IRQ_EXT_WALL_FB);
         wm8350_free_irq(wm8350, WM8350_IRQ_EXT_WALL_FB);
-        wm8350_mask_irq(wm8350, WM8350_IRQ_EXT_BAT_FB);
         wm8350_free_irq(wm8350, WM8350_IRQ_EXT_BAT_FB);
 }
 
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c
index 8c289fd4add2..1bbff099a546 100644
--- a/drivers/regulator/wm8350-regulator.c
+++ b/drivers/regulator/wm8350-regulator.c
@@ -1399,8 +1399,6 @@ static int wm8350_regulator_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        wm8350_unmask_irq(wm8350, wm8350_reg[pdev->id].irq);
-
         return 0;
 }
 
@@ -1409,7 +1407,6 @@ static int wm8350_regulator_remove(struct platform_device *pdev)
         struct regulator_dev *rdev = platform_get_drvdata(pdev);
         struct wm8350 *wm8350 = rdev_get_drvdata(rdev);
 
-        wm8350_mask_irq(wm8350, wm8350_reg[pdev->id].irq);
         wm8350_free_irq(wm8350, wm8350_reg[pdev->id].irq);
 
         regulator_unregister(rdev);
diff --git a/drivers/rtc/rtc-wm8350.c b/drivers/rtc/rtc-wm8350.c
index 56e56e552813..f16486635a8e 100644
--- a/drivers/rtc/rtc-wm8350.c
+++ b/drivers/rtc/rtc-wm8350.c
@@ -459,17 +459,14 @@ static int wm8350_rtc_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        wm8350_mask_irq(wm8350, WM8350_IRQ_RTC_SEC);
-        wm8350_mask_irq(wm8350, WM8350_IRQ_RTC_PER);
-
         wm8350_register_irq(wm8350, WM8350_IRQ_RTC_SEC,
                             wm8350_rtc_update_handler, 0,
                             "RTC Seconds", wm8350);
+        wm8350_mask_irq(wm8350, WM8350_IRQ_RTC_SEC);
 
         wm8350_register_irq(wm8350, WM8350_IRQ_RTC_ALM,
                             wm8350_rtc_alarm_handler, 0,
                             "RTC Alarm", wm8350);
-        wm8350_unmask_irq(wm8350, WM8350_IRQ_RTC_ALM);
 
         return 0;
 }
@@ -479,8 +476,6 @@ static int __devexit wm8350_rtc_remove(struct platform_device *pdev)
         struct wm8350 *wm8350 = platform_get_drvdata(pdev);
         struct wm8350_rtc *wm_rtc = &wm8350->rtc;
 
-        wm8350_mask_irq(wm8350, WM8350_IRQ_RTC_SEC);
-
         wm8350_free_irq(wm8350, WM8350_IRQ_RTC_SEC);
         wm8350_free_irq(wm8350, WM8350_IRQ_RTC_ALM);