mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
pxafb: lcsr1 is unused without CONFIG_FB_PXA_OVERLAY
Fixes the warning: drivers/video/pxafb.c: In function 'pxafb_handle_irq': drivers/video/pxafb.c:1442: warning: unused variable 'lcsr1' [[email protected]: save an ifdef] Signed-off-by: Denis V. Lunev <[email protected]> Cc: Eric Miao <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
44aa417910
commit
ff14ed5db6
1 changed files with 9 additions and 7 deletions
|
|
@ -1439,7 +1439,7 @@ static void pxafb_disable_controller(struct pxafb_info *fbi)
|
|||
static irqreturn_t pxafb_handle_irq(int irq, void *dev_id)
|
||||
{
|
||||
struct pxafb_info *fbi = dev_id;
|
||||
unsigned int lccr0, lcsr, lcsr1;
|
||||
unsigned int lccr0, lcsr;
|
||||
|
||||
lcsr = lcd_readl(fbi, LCSR);
|
||||
if (lcsr & LCSR_LDD) {
|
||||
|
|
@ -1455,14 +1455,16 @@ static irqreturn_t pxafb_handle_irq(int irq, void *dev_id)
|
|||
lcd_writel(fbi, LCSR, lcsr);
|
||||
|
||||
#ifdef CONFIG_FB_PXA_OVERLAY
|
||||
lcsr1 = lcd_readl(fbi, LCSR1);
|
||||
if (lcsr1 & LCSR1_BS(1))
|
||||
complete(&fbi->overlay[0].branch_done);
|
||||
{
|
||||
unsigned int lcsr1 = lcd_readl(fbi, LCSR1);
|
||||
if (lcsr1 & LCSR1_BS(1))
|
||||
complete(&fbi->overlay[0].branch_done);
|
||||
|
||||
if (lcsr1 & LCSR1_BS(2))
|
||||
complete(&fbi->overlay[1].branch_done);
|
||||
if (lcsr1 & LCSR1_BS(2))
|
||||
complete(&fbi->overlay[1].branch_done);
|
||||
|
||||
lcd_writel(fbi, LCSR1, lcsr1);
|
||||
lcd_writel(fbi, LCSR1, lcsr1);
|
||||
}
|
||||
#endif
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue