diff --git a/drivers/staging/sm750fb/ddk750_power.c b/drivers/staging/sm750fb/ddk750_power.c index 12834f78eef7..eaba3bc2e01a 100644 --- a/drivers/staging/sm750fb/ddk750_power.c +++ b/drivers/staging/sm750fb/ddk750_power.c @@ -126,20 +126,3 @@ void sm750_enable_gpio(unsigned int enable) sm750_set_current_gate(gate); } - -/* - * This function enable/disable the I2C Engine - */ -void sm750_enable_i2c(unsigned int enable) -{ - u32 gate; - - /* Enable I2C Gate */ - gate = peek32(CURRENT_GATE); - if (enable) - gate |= CURRENT_GATE_I2C; - else - gate &= ~CURRENT_GATE_I2C; - - sm750_set_current_gate(gate); -} diff --git a/drivers/staging/sm750fb/ddk750_power.h b/drivers/staging/sm750fb/ddk750_power.h index 5cbb11986bb8..1c4f054d7276 100644 --- a/drivers/staging/sm750fb/ddk750_power.h +++ b/drivers/staging/sm750fb/ddk750_power.h @@ -33,9 +33,4 @@ void sm750_enable_dma(unsigned int enable); */ void sm750_enable_gpio(unsigned int enable); -/* - * This function enable/disable the I2C Engine - */ -void sm750_enable_i2c(unsigned int enable); - #endif diff --git a/drivers/staging/sm750fb/sm750_cursor.c b/drivers/staging/sm750fb/sm750_cursor.c index 7ede144905c9..f0338e6e76b1 100644 --- a/drivers/staging/sm750fb/sm750_cursor.c +++ b/drivers/staging/sm750fb/sm750_cursor.c @@ -130,46 +130,3 @@ void sm750_hw_cursor_set_data(struct lynx_cursor *cursor, u16 rop, } } } - -void sm750_hw_cursor_set_data2(struct lynx_cursor *cursor, u16 rop, - const u8 *pcol, const u8 *pmsk) -{ - int i, j, count, pitch, offset; - u8 color, mask; - u16 data; - void __iomem *pbuffer, *pstart; - - /* in byte*/ - pitch = cursor->w >> 3; - - /* in byte */ - count = pitch * cursor->h; - - /* in byte */ - offset = cursor->max_w * 2 / 8; - - data = 0; - pstart = cursor->vstart; - pbuffer = pstart; - - for (i = 0; i < count; i++) { - color = *pcol++; - mask = *pmsk++; - data = 0; - - for (j = 0; j < 8; j++) { - if (mask & (1 << j)) - data |= ((color & (1 << j)) ? 1 : 2) << (j * 2); - } - iowrite16(data, pbuffer); - - /* assume pitch is 1,2,4,8,...*/ - if (!(i & (pitch - 1))) { - /* need a return */ - pstart += offset; - pbuffer = pstart; - } else { - pbuffer += sizeof(u16); - } - } -} diff --git a/drivers/staging/sm750fb/sm750_cursor.h b/drivers/staging/sm750fb/sm750_cursor.h index 88fa02f6377a..51ba0da0270c 100644 --- a/drivers/staging/sm750fb/sm750_cursor.h +++ b/drivers/staging/sm750fb/sm750_cursor.h @@ -10,6 +10,4 @@ void sm750_hw_cursor_set_pos(struct lynx_cursor *cursor, int x, int y); void sm750_hw_cursor_set_color(struct lynx_cursor *cursor, u32 fg, u32 bg); void sm750_hw_cursor_set_data(struct lynx_cursor *cursor, u16 rop, const u8 *data, const u8 *mask); -void sm750_hw_cursor_set_data2(struct lynx_cursor *cursor, u16 rop, - const u8 *data, const u8 *mask); #endif