Merge branch 'ep93xx' into devel

[firefly-linux-kernel-4.4.55.git] / drivers / video / mx3fb.c

diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index 21b3692092f2e8925cac85c15117f2bb565e4335..b7af5256e887e0522e704a2165311220a5904666 100644 (file)
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -706,7 +706,7 @@ static void mx3fb_dma_done(void *arg)
        dev_dbg(mx3fb->dev, "irq %d callback\n", ichannel->eof_irq);
 
        /* We only need one interrupt, it will be re-enabled as needed */
-       disable_irq(ichannel->eof_irq);
+       disable_irq_nosync(ichannel->eof_irq);
 
        complete(&mx3_fbi->flip_cmpl);
 }
@@ -1152,11 +1152,11 @@ static struct fb_ops mx3fb_ops = {
  */
 static int mx3fb_suspend(struct platform_device *pdev, pm_message_t state)
 {
-       struct mx3fb_data *drv_data = platform_get_drvdata(pdev);
-       struct mx3fb_info *mx3_fbi = drv_data->fbi->par;
+       struct mx3fb_data *mx3fb = platform_get_drvdata(pdev);
+       struct mx3fb_info *mx3_fbi = mx3fb->fbi->par;
 
        acquire_console_sem();
-       fb_set_suspend(drv_data->fbi, 1);
+       fb_set_suspend(mx3fb->fbi, 1);
        release_console_sem();
 
        if (mx3_fbi->blank == FB_BLANK_UNBLANK) {
@@ -1172,16 +1172,16 @@ static int mx3fb_suspend(struct platform_device *pdev, pm_message_t state)
  */
 static int mx3fb_resume(struct platform_device *pdev)
 {
-       struct mx3fb_data *drv_data = platform_get_drvdata(pdev);
-       struct mx3fb_info *mx3_fbi = drv_data->fbi->par;
+       struct mx3fb_data *mx3fb = platform_get_drvdata(pdev);
+       struct mx3fb_info *mx3_fbi = mx3fb->fbi->par;
 
        if (mx3_fbi->blank == FB_BLANK_UNBLANK) {
                sdc_enable_channel(mx3_fbi);
-               sdc_set_brightness(mx3fb, drv_data->backlight_level);
+               sdc_set_brightness(mx3fb, mx3fb->backlight_level);
        }
 
        acquire_console_sem();
-       fb_set_suspend(drv_data->fbi, 0);
+       fb_set_suspend(mx3fb->fbi, 0);
        release_console_sem();
 
        return 0;
@@ -1366,7 +1366,7 @@ static int init_fb_chan(struct mx3fb_data *mx3fb, struct idmac_channel *ichan)
 
        mx3fb_blank(FB_BLANK_UNBLANK, fbi);
 
-       dev_info(dev, "mx3fb: fb registered, using mode %s\n", fb_mode);
+       dev_info(dev, "registered, using mode %s\n", fb_mode);
 
        ret = register_framebuffer(fbi);
        if (ret < 0)