korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-14 22:44:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

video: atmel_lcdfb: introduce atmel_lcdfb_power_control

Browse Source 
to simplify the check on the presence of the callback

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2013-04-11 17:54:04 +08:00 committed by Tomi Valkeinen
parent 8af2c2869f
commit 42110e91de
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/video/atmel_lcdfb.c
View File

@ -288,6 +288,13 @@ static void init_contrast(struct atmel_lcdfb_info *sinfo)
init_backlight(sinfo); init_backlight(sinfo);
} }
static inline void atmel_lcdfb_power_control(struct atmel_lcdfb_info *sinfo, int on)
{
struct atmel_lcdfb_pdata *pdata = &sinfo->pdata;
if (pdata->atmel_lcdfb_power_control)
pdata->atmel_lcdfb_power_control(on);
}
static struct fb_fix_screeninfo atmel_lcdfb_fix __initdata = { static struct fb_fix_screeninfo atmel_lcdfb_fix __initdata = {
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
@ -1122,8 +1129,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
fb_add_videomode(&fbmode, &info->modelist); fb_add_videomode(&fbmode, &info->modelist);
/* Power up the LCDC screen */ /* Power up the LCDC screen */
if (pdata->atmel_lcdfb_power_control) atmel_lcdfb_power_control(sinfo, 1);
pdata->atmel_lcdfb_power_control(1);
dev_info(dev, "fb%d: Atmel LCDC at 0x%08lx (mapped at %p), irq %d\n", dev_info(dev, "fb%d: Atmel LCDC at 0x%08lx (mapped at %p), irq %d\n",
info->node, info->fix.mmio_start, sinfo->mmio, sinfo->irq_base); info->node, info->fix.mmio_start, sinfo->mmio, sinfo->irq_base);
@ -1175,8 +1181,7 @@ static int __exit atmel_lcdfb_remove(struct platform_device *pdev)
cancel_work_sync(&sinfo->task); cancel_work_sync(&sinfo->task);
exit_backlight(sinfo); exit_backlight(sinfo);
if (pdata->atmel_lcdfb_power_control) atmel_lcdfb_power_control(sinfo, 0);
pdata->atmel_lcdfb_power_control(0);
unregister_framebuffer(info); unregister_framebuffer(info);
atmel_lcdfb_stop_clock(sinfo); atmel_lcdfb_stop_clock(sinfo);
clk_put(sinfo->lcdc_clk); clk_put(sinfo->lcdc_clk);
@ -1203,7 +1208,6 @@ static int atmel_lcdfb_suspend(struct platform_device *pdev, pm_message_t mesg)
{ {
struct fb_info *info = platform_get_drvdata(pdev); struct fb_info *info = platform_get_drvdata(pdev);
struct atmel_lcdfb_info *sinfo = info->par; struct atmel_lcdfb_info *sinfo = info->par;
struct atmel_lcdfb_pdata *pdata = &sinfo->pdata;
/* /*
* We don't want to handle interrupts while the clock is * We don't want to handle interrupts while the clock is
@ -1213,9 +1217,7 @@ static int atmel_lcdfb_suspend(struct platform_device *pdev, pm_message_t mesg)
sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_CTR); sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_CTR);
lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0); lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0);
if (pdata->atmel_lcdfb_power_control) atmel_lcdfb_power_control(sinfo, 0);
pdata->atmel_lcdfb_power_control(0);
atmel_lcdfb_stop(sinfo); atmel_lcdfb_stop(sinfo);
atmel_lcdfb_stop_clock(sinfo); atmel_lcdfb_stop_clock(sinfo);
@ -1226,12 +1228,10 @@ static int atmel_lcdfb_resume(struct platform_device *pdev)
{ {
struct fb_info *info = platform_get_drvdata(pdev); struct fb_info *info = platform_get_drvdata(pdev);
struct atmel_lcdfb_info *sinfo = info->par; struct atmel_lcdfb_info *sinfo = info->par;
struct atmel_lcdfb_pdata *pdata = &sinfo->pdata;
atmel_lcdfb_start_clock(sinfo); atmel_lcdfb_start_clock(sinfo);
atmel_lcdfb_start(sinfo); atmel_lcdfb_start(sinfo);
if (pdata->atmel_lcdfb_power_control) atmel_lcdfb_power_control(sinfo, 1);
pdata->atmel_lcdfb_power_control(1);
lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, sinfo->saved_lcdcon); lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, sinfo->saved_lcdcon);
/* Enable FIFO & DMA errors */ /* Enable FIFO & DMA errors */