Merge tag 'lsk-v3.10-android-14.07' into develop-3.10

[firefly-linux-kernel-4.4.55.git] / drivers / power / wm831x_charger_display.c

diff --git a/drivers/power/wm831x_charger_display.c b/drivers/power/wm831x_charger_display.c
index 01a6cb36cc0378cbbccd341fe3f44c0bcb57f82f..c08fa6bbcc18801bc2faa5dddfa0faaf47a81641 100755 (executable)
--- a/drivers/power/wm831x_charger_display.c
+++ b/drivers/power/wm831x_charger_display.c
@@ -355,7 +355,7 @@ static int rk29_charger_display(struct wm831x_chg *wm831x_chg)
                #else
                        if(wm831x_chg->flag_bl != 0)
                        charger_logo_display(chargerlogo[7]);
-               #endif  
+               #endif
                        msleep(200);
                        wm831x_check_on_pin(wm831x_chg);
                        msleep(200);
@@ -374,7 +374,7 @@ static int rk29_charger_display(struct wm831x_chg *wm831x_chg)
                #ifdef CONFIG_RK29_CHARGE_EARLYSUSPEND
                                wm831x_chg->flag_suspend = 0;
                #endif
-                               
+
                        }
                        wm831x_chg->cnt_disp = 0;
                }
@@ -413,10 +413,10 @@ static int __devinit wm831x_chg_probe(struct platform_device *pdev)
 {
        struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);;
        struct wm831x_chg *wm831x_chg;
-       
+
 //     struct wm831x_on *wm831x_on = container_of(wm831x,struct wm831x_on,*(wm831x));
-       
-       
+
+
        int ret;
        
        wm831x_chg = kzalloc(sizeof(struct wm831x_chg), GFP_KERNEL);
@@ -439,14 +439,14 @@ static int __devinit wm831x_chg_probe(struct platform_device *pdev)
        if(wm831x_chg->flag_chg != 0)
        {
                free_irq(wm831x_chg->wm831x->irq_base + WM831X_IRQ_ON,g_wm831x_on);
-               request_threaded_irq(wm831x_chg->wm831x->irq_base + WM831X_IRQ_ON, 
+               request_threaded_irq(wm831x_chg->wm831x->irq_base + WM831X_IRQ_ON,
                                                NULL, wm831x_charge_irq,IRQF_TRIGGER_RISING, "wm831x_charge",
                                           wm831x_chg);
 
                ret = rk29_charger_display(wm831x_chg);
-               
 
-               free_irq(wm831x_chg->wm831x->irq_base + WM831X_IRQ_ON,wm831x_chg);      
+
+               free_irq(wm831x_chg->wm831x->irq_base + WM831X_IRQ_ON,wm831x_chg);
                request_threaded_irq(wm831x_chg->wm831x->irq_base + WM831X_IRQ_ON,
                        NULL, wm831x_on_irq,IRQF_TRIGGER_RISING, "wm831x_on",  g_wm831x_on);
        }