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

Commit 521bc83b authored Dec 17, 2010 by Andres Salomon Committed by Paul Mundt Dec 21, 2010

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 <dilinger@queued.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

parent 4959212c

drivers/video/s1d13xxxfb.c

+0 −50

Original line number	Original line	Diff line number	Diff line
	@@ -409,28 +409,6 @@ s1d13xxxfb_pan_display(struct fb_var_screeninfo var, struct fb_info info)
	functions to handle bitblt acceleration		functions to handle bitblt acceleration
	************************************************************/		************************************************************/

	/**
	* 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		* bltbit_wait_bitclear - waits for change in register value
	* @info : frambuffer structure		* @info : frambuffer structure
	@@ -454,34 +432,6 @@ bltbit_wait_bitclear(struct fb_info *info, u8 bit, int timeout)
	return 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		* s1d13xxxfb_bitblt_copyarea - accelerated copyarea function
	* @info : framebuffer structure		* @info : framebuffer structure

include/video/s1d13xxxfb.h

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -136,12 +136,6 @@
	#define S1DREG_DELAYOFF 0xFFFE		#define S1DREG_DELAYOFF 0xFFFE
	#define S1DREG_DELAYON 0xFFFF		#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		#define BBLT_SOLID_FILL 0x0c