Skip to contentSkip to conversation

s1d13xxxfb: drop unused code

PATCH Applied Andres Salomon 2 participants 2 messages Dec 18, 2010 – Dec 20, 2010

Subsystems (2)
Framebuffer layer Epson S1D13XXX framebuffer driver
lore
Share & tools
lore

Andres Salomon

author
#0 lore raw

PATCH 1/1 s1d13xxxfb: drop unused code

Silence warnings such as -

drivers/video/s1d13xxxfb.c:421: warning: ‘bltbit_wait_bitset’ defined but not used

Just drop the unused code.

Signed-off-by Andres Salomon <[email protected]>
---
 drivers/video/s1d13xxxfb.c |   50 --------------------------------------------
 include/video/s1d13xxxfb.h |    6 -----
 2 files changed, 0 insertions(+), 56 deletions(-)
drivers/video/s1d13xxxfb.c +0 -50
index a6247fc..28b1c6c 100644
@@ -410,28 +410,6 @@ s1d13xxxfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
  ************************************************************/
 
 /**
- *	bltbit_wait_bitset - waits for change in register value
- *	@info : framebuffer structure
- *	@bit  : value expected in register
- *	@timeout : ...
- *
- *	waits until value changes INTO bit
- */
-static u8
-bltbit_wait_bitset(struct fb_info *info, u8 bit, int timeout)
-{
-	while (!(s1d13xxxfb_readreg(info->par, S1DREG_BBLT_CTL0) & bit)) {
-		udelay(10);
-		if (!--timeout) {
-			dbg_blit("wait_bitset timeout\n");
-			break;
-		}
-	}
-
-	return timeout;
-}
-
-/**
  *	bltbit_wait_bitclear - waits for change in register value
  *	@info : frambuffer structure
  *	@bit  : value currently in register

@@ -454,34 +432,6 @@ bltbit_wait_bitclear(struct fb_info *info, u8 bit, int timeout)
 	return timeout;
 }
 
-/**
- *	bltbit_fifo_status - checks the current status of the fifo
- *	@info : framebuffer structure
- *
- *	returns number of free words in buffer
- */
-static u8
-bltbit_fifo_status(struct fb_info *info)
-{
-	u8 status;
-
-	status = s1d13xxxfb_readreg(info->par, S1DREG_BBLT_CTL0);
-
-	/* its empty so room for 16 words */
-	if (status & BBLT_FIFO_EMPTY)
-		return 16;
-
-	/* its full so we dont want to add */
-	if (status & BBLT_FIFO_FULL)
-		return 0;
-
-	/* its atleast half full but we can add one atleast */
-	if (status & BBLT_FIFO_NOT_FULL)
-		return 1;
-
-	return 0;
-}
-
 /*
  *	s1d13xxxfb_bitblt_copyarea - accelerated copyarea function
  *	@info : framebuffer structure
include/video/s1d13xxxfb.h +0 -6
index f0736cf..55f5344 100644
@@ -136,12 +136,6 @@
 #define S1DREG_DELAYOFF			0xFFFE
 #define S1DREG_DELAYON			0xFFFF
 
-#define BBLT_FIFO_EMPTY			0x00
-#define BBLT_FIFO_NOT_EMPTY		0x40
-#define BBLT_FIFO_NOT_FULL		0x30
-#define BBLT_FIFO_HALF_FULL		0x20
-#define BBLT_FIFO_FULL			0x10
-
 #define BBLT_SOLID_FILL			0x0c
Signature · 1 line
1.7.2.3
Applied
#1 lore raw
Quoted 8 lines · Andres Salomon

Silence warnings such as -

drivers/video/s1d13xxxfb.c:421: warning: ???bltbit_wait_bitset??? defined but not used

Just drop the unused code.

Signed-off-by Andres Salomon <[email protected]>

Applied, thanks.