Skip to content

Commit

Permalink
pxafb: lcsr1 is unused without CONFIG_FB_PXA_OVERLAY
Browse files Browse the repository at this point in the history
Fixes the warning:

  drivers/video/pxafb.c: In function 'pxafb_handle_irq':
  drivers/video/pxafb.c:1442: warning: unused variable 'lcsr1'

[akpm@linux-foundation.org: save an ifdef]
Signed-off-by: Denis V. Lunev <den@openvz.org>
Cc: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Denis V. Lunev authored and torvalds committed Apr 21, 2009
1 parent 44aa417 commit ff14ed5
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions drivers/video/pxafb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;
}
Expand Down

0 comments on commit ff14ed5

Please sign in to comment.