diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-11-09 10:26:27 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-10 13:55:03 +0100 |
| commit | 52d0744d751d8f13511df15e776460bfb95bcf5c (patch) | |
| tree | f001d8c9501aaac7db772e1e5fdd4796d0d9ebbf /drivers/staging/sm750fb/sm750_cursor.h | |
| parent | 8b9fa5511148a49f12d1229fa80cef957b2566ac (diff) | |
| download | op-kernel-dev-52d0744d751d8f13511df15e776460bfb95bcf5c.zip op-kernel-dev-52d0744d751d8f13511df15e776460bfb95bcf5c.tar.gz | |
staging: sm750fb: prefix global identifiers
Renaming some symbols inside this driver caused a conflict with
an existing function, which in turn results in a link error:
drivers/staging/sm750fb/sm750fb.o: In function `enable_dma':
ddk750_hwi2c.c:(.text.enable_dma+0x0): multiple definition of `enable_dma'
This adds a sm750_ prefix to each global symbol in the sm750fb
driver that does not already have one. I manually looked for the
symbols and then converted the driver using
for i in calc_pll_value format_pll_reg set_power_mode set_current_gate \
enable_2d_engine enable_dma enable_gpio enable_i2c hw_set2dformat \
hw_de_init hw_fillrect hw_copyarea hw_imageblit hw_cursor_enable \
hw_cursor_disable hw_cursor_setSize hw_cursor_setPos \
hw_cursor_setColor hw_cursor_setData hw_cursor_setData2 ;
do
sed -i "s:\<$i\>:sm750_$i:" drivers/staging/sm750fb/*.[ch]
done
Fixes: 03140dabf584 ("staging: sm750fb: Replace functions CamelCase naming with underscores.")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/sm750fb/sm750_cursor.h')
| -rw-r--r-- | drivers/staging/sm750fb/sm750_cursor.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/sm750fb/sm750_cursor.h b/drivers/staging/sm750fb/sm750_cursor.h index 6c4fc9b..c7b86ae 100644 --- a/drivers/staging/sm750fb/sm750_cursor.h +++ b/drivers/staging/sm750fb/sm750_cursor.h @@ -2,16 +2,16 @@ #define LYNX_CURSOR_H__ /* hw_cursor_xxx works for voyager,718 and 750 */ -void hw_cursor_enable(struct lynx_cursor *cursor); -void hw_cursor_disable(struct lynx_cursor *cursor); -void hw_cursor_setSize(struct lynx_cursor *cursor, +void sm750_hw_cursor_enable(struct lynx_cursor *cursor); +void sm750_hw_cursor_disable(struct lynx_cursor *cursor); +void sm750_hw_cursor_setSize(struct lynx_cursor *cursor, int w, int h); -void hw_cursor_setPos(struct lynx_cursor *cursor, +void sm750_hw_cursor_setPos(struct lynx_cursor *cursor, int x, int y); -void hw_cursor_setColor(struct lynx_cursor *cursor, +void sm750_hw_cursor_setColor(struct lynx_cursor *cursor, u32 fg, u32 bg); -void hw_cursor_setData(struct lynx_cursor *cursor, +void sm750_hw_cursor_setData(struct lynx_cursor *cursor, u16 rop, const u8 *data, const u8 *mask); -void hw_cursor_setData2(struct lynx_cursor *cursor, +void sm750_hw_cursor_setData2(struct lynx_cursor *cursor, u16 rop, const u8 *data, const u8 *mask); #endif |
