spi_mpc83xx: fix sparse warnings
The patch fixes following sparse warnings: CHECK spi_mpc83xx.c spi_mpc83xx.c:145:1: warning: symbol 'mpc83xx_spi_rx_buf_u8' was not declared. Should it be static? spi_mpc83xx.c:146:1: warning: symbol 'mpc83xx_spi_rx_buf_u16' was not declared. Should it be static? spi_mpc83xx.c:147:1: warning: symbol 'mpc83xx_spi_rx_buf_u32' was not declared. Should it be static? spi_mpc83xx.c:148:1: warning: symbol 'mpc83xx_spi_tx_buf_u8' was not declared. Should it be static? spi_mpc83xx.c:149:1: warning: symbol 'mpc83xx_spi_tx_buf_u16' was not declared. Should it be static? spi_mpc83xx.c:150:1: warning: symbol 'mpc83xx_spi_tx_buf_u32' was not declared. Should it be static? spi_mpc83xx.c:175:32: warning: incorrect type in initializer (different address spaces) spi_mpc83xx.c:175:32: expected void *tmp_ptr spi_mpc83xx.c:175:32: got unsigned int [noderef] <asn:2>*<noident> spi_mpc83xx.c:183:26: warning: incorrect type in argument 1 (different address spaces) spi_mpc83xx.c:183:26: expected unsigned int [noderef] [usertype] <asn:2>*reg spi_mpc83xx.c:183:26: got void *tmp_ptr spi_mpc83xx.c:184:26: warning: incorrect type in argument 1 (different address spaces) spi_mpc83xx.c:184:26: expected unsigned int [noderef] [usertype] <asn:2>*reg spi_mpc83xx.c:184:26: got void *tmp_ptr spi_mpc83xx.c:287:31: warning: incorrect type in initializer (different address spaces) spi_mpc83xx.c:287:31: expected void *tmp_ptr spi_mpc83xx.c:287:31: got unsigned int [noderef] <asn:2>*<noident> spi_mpc83xx.c:295:25: warning: incorrect type in argument 1 (different address spaces) spi_mpc83xx.c:295:25: expected unsigned int [noderef] [usertype] <asn:2>*reg spi_mpc83xx.c:295:25: got void *tmp_ptr spi_mpc83xx.c:296:25: warning: incorrect type in argument 1 (different address spaces) spi_mpc83xx.c:296:25: expected unsigned int [noderef] [usertype] <asn:2>*reg spi_mpc83xx.c:296:25: got void *tmp_ptr spi_mpc83xx.c:486:13: warning: symbol 'mpc83xx_spi_irq' was not declared. Should it be static? Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Cc: David Brownell <david-b@pacbell.net> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Kumar Gala <galak@gate.crashing.org> Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
c3b1b1cbf0
commit
34c8a20c6e
|
@ -123,6 +123,7 @@ static inline u32 mpc83xx_spi_read_reg(__be32 __iomem * reg)
|
|||
}
|
||||
|
||||
#define MPC83XX_SPI_RX_BUF(type) \
|
||||
static \
|
||||
void mpc83xx_spi_rx_buf_##type(u32 data, struct mpc83xx_spi *mpc83xx_spi) \
|
||||
{ \
|
||||
type * rx = mpc83xx_spi->rx; \
|
||||
|
@ -131,6 +132,7 @@ void mpc83xx_spi_rx_buf_##type(u32 data, struct mpc83xx_spi *mpc83xx_spi) \
|
|||
}
|
||||
|
||||
#define MPC83XX_SPI_TX_BUF(type) \
|
||||
static \
|
||||
u32 mpc83xx_spi_tx_buf_##type(struct mpc83xx_spi *mpc83xx_spi) \
|
||||
{ \
|
||||
u32 data; \
|
||||
|
@ -172,7 +174,7 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value)
|
|||
|
||||
if (cs->hw_mode != regval) {
|
||||
unsigned long flags;
|
||||
void *tmp_ptr = &mpc83xx_spi->base->mode;
|
||||
__be32 __iomem *mode = &mpc83xx_spi->base->mode;
|
||||
|
||||
regval = cs->hw_mode;
|
||||
/* Turn off IRQs locally to minimize time that
|
||||
|
@ -180,8 +182,8 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value)
|
|||
*/
|
||||
local_irq_save(flags);
|
||||
/* Turn off SPI unit prior changing mode */
|
||||
mpc83xx_spi_write_reg(tmp_ptr, regval & ~SPMODE_ENABLE);
|
||||
mpc83xx_spi_write_reg(tmp_ptr, regval);
|
||||
mpc83xx_spi_write_reg(mode, regval & ~SPMODE_ENABLE);
|
||||
mpc83xx_spi_write_reg(mode, regval);
|
||||
local_irq_restore(flags);
|
||||
}
|
||||
if (mpc83xx_spi->activate_cs)
|
||||
|
@ -284,7 +286,7 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
|
|||
regval = mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode);
|
||||
if (cs->hw_mode != regval) {
|
||||
unsigned long flags;
|
||||
void *tmp_ptr = &mpc83xx_spi->base->mode;
|
||||
__be32 __iomem *mode = &mpc83xx_spi->base->mode;
|
||||
|
||||
regval = cs->hw_mode;
|
||||
/* Turn off IRQs locally to minimize time
|
||||
|
@ -292,8 +294,8 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
|
|||
*/
|
||||
local_irq_save(flags);
|
||||
/* Turn off SPI unit prior changing mode */
|
||||
mpc83xx_spi_write_reg(tmp_ptr, regval & ~SPMODE_ENABLE);
|
||||
mpc83xx_spi_write_reg(tmp_ptr, regval);
|
||||
mpc83xx_spi_write_reg(mode, regval & ~SPMODE_ENABLE);
|
||||
mpc83xx_spi_write_reg(mode, regval);
|
||||
local_irq_restore(flags);
|
||||
}
|
||||
return 0;
|
||||
|
@ -483,7 +485,7 @@ static int mpc83xx_spi_setup(struct spi_device *spi)
|
|||
return 0;
|
||||
}
|
||||
|
||||
irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data)
|
||||
static irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data)
|
||||
{
|
||||
struct mpc83xx_spi *mpc83xx_spi = context_data;
|
||||
u32 event;
|
||||
|
|
Loading…
Reference in New Issue