sky2: Factor out code to calculate packet sizes

[safe/jmp/linux-2.6] / drivers / power / wm8350_power.c

diff --git a/drivers/power/wm8350_power.c b/drivers/power/wm8350_power.c
index 6e634cf..ad4f071 100644 (file)
--- 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);
 }