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/ddk750_hwi2c.c | |
| parent | Staging: xgifb: vgatypes: Replace decimal permissions with 4 digit octal (diff) | |
| download | linux-dev-52d0744d751d8f13511df15e776460bfb95bcf5c.tar.xz linux-dev-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_hwi2c.c')
| -rw-r--r-- | drivers/staging/sm750fb/ddk750_hwi2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/sm750fb/ddk750_hwi2c.c b/drivers/staging/sm750fb/ddk750_hwi2c.c index 10439e061ae8..05d4a73aa1d4 100644 --- a/drivers/staging/sm750fb/ddk750_hwi2c.c +++ b/drivers/staging/sm750fb/ddk750_hwi2c.c @@ -24,7 +24,7 @@ unsigned char bus_speed_mode * Enable Hardware I2C power. * TODO: Check if we need to enable GPIO power? */ - enable_i2c(1); + sm750_enable_i2c(1); /* Enable the I2C Controller and set the bus speed mode */ value = PEEK32(I2C_CTRL) & ~(I2C_CTRL_MODE | I2C_CTRL_EN); @@ -45,7 +45,7 @@ void sm750_hw_i2c_close(void) POKE32(I2C_CTRL, value); /* Disable I2C Power */ - enable_i2c(0); + sm750_enable_i2c(0); /* Set GPIO 30 & 31 back as GPIO pins */ value = PEEK32(GPIO_MUX); |