Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff14ed5d authored by Denis V. Lunev's avatar Denis V. Lunev Committed by Linus Torvalds
Browse files

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'

[akpm@linux-foundation.org: save an ifdef]
Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Cc: Eric Miao <eric.miao@marvell.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 44aa4179

drivers/video/pxafb.c

+9 −7
Original line number Diff line number Diff line
@@ -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,7 +1455,8 @@ 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);

	{

		unsigned int lcsr1 = lcd_readl(fbi, LCSR1);

		if (lcsr1 & LCSR1_BS(1))

			complete(&fbi->overlay[0].branch_done);
@@ -1463,6 +1464,7 @@ static irqreturn_t pxafb_handle_irq(int irq, void *dev_id) 
			complete(&fbi->overlay[1].branch_done);



		lcd_writel(fbi, LCSR1, lcsr1);

	}

#endif

	return IRQ_HANDLED;

}