|
@@ -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;
|