summaryrefslogtreecommitdiffstats
path: root/drivers/staging/sm750fb/ddk750_power.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-11-09 10:26:27 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-10 13:55:03 +0100
commit52d0744d751d8f13511df15e776460bfb95bcf5c (patch)
treef001d8c9501aaac7db772e1e5fdd4796d0d9ebbf /drivers/staging/sm750fb/ddk750_power.h
parent8b9fa5511148a49f12d1229fa80cef957b2566ac (diff)
downloadlinux-stable-52d0744d751d8f13511df15e776460bfb95bcf5c.tar.gz
linux-stable-52d0744d751d8f13511df15e776460bfb95bcf5c.tar.bz2
linux-stable-52d0744d751d8f13511df15e776460bfb95bcf5c.zip
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/ddk750_power.h')
-rw-r--r--drivers/staging/sm750fb/ddk750_power.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/sm750fb/ddk750_power.h b/drivers/staging/sm750fb/ddk750_power.h
index ea56026d41b2..eb088b0d805f 100644
--- a/drivers/staging/sm750fb/ddk750_power.h
+++ b/drivers/staging/sm750fb/ddk750_power.h
@@ -15,28 +15,28 @@ DPMS_t;
}
void ddk750_set_dpms(DPMS_t);
-void set_power_mode(unsigned int powerMode);
-void set_current_gate(unsigned int gate);
+void sm750_set_power_mode(unsigned int powerMode);
+void sm750_set_current_gate(unsigned int gate);
/*
* This function enable/disable the 2D engine.
*/
-void enable_2d_engine(unsigned int enable);
+void sm750_enable_2d_engine(unsigned int enable);
/*
* This function enable/disable the DMA Engine
*/
-void enable_dma(unsigned int enable);
+void sm750_enable_dma(unsigned int enable);
/*
* This function enable/disable the GPIO Engine
*/
-void enable_gpio(unsigned int enable);
+void sm750_enable_gpio(unsigned int enable);
/*
* This function enable/disable the I2C Engine
*/
-void enable_i2c(unsigned int enable);
+void sm750_enable_i2c(unsigned int enable);
#endif