1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
index 6e0232e65a3..273940d3938 100644
--- a/drivers/spi/spi_mpc83xx.c
+++ b/drivers/spi/spi_mpc83xx.c
@@ -17,6 +17,7 @@
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/err.h>
+#include <linux/io.h>
 #include <linux/completion.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
@@ -34,7 +35,6 @@
 
 #include <sysdev/fsl_soc.h>
 #include <asm/irq.h>
-#include <asm/io.h>
 
 /* SPI Controller registers */
 struct mpc83xx_spi_reg {
@@ -118,12 +118,12 @@ struct spi_mpc83xx_cs {
         u32 hw_mode;            /* Holds HW mode register settings */
 };
 
-static inline void mpc83xx_spi_write_reg(__be32 __iomem * reg, u32 val)
+static inline void mpc83xx_spi_write_reg(__be32 __iomem *reg, u32 val)
 {
         out_be32(reg, val);
 }
 
-static inline u32 mpc83xx_spi_read_reg(__be32 __iomem * reg)
+static inline u32 mpc83xx_spi_read_reg(__be32 __iomem *reg)
 {
         return in_be32(reg);
 }
@@ -132,7 +132,7 @@ static inline u32 mpc83xx_spi_read_reg(__be32 __iomem * reg)
 static                                                                    \
 void mpc83xx_spi_rx_buf_##type(u32 data, struct mpc83xx_spi *mpc83xx_spi) \
 {                                                                         \
-        type * rx = mpc83xx_spi->rx;                                      \
+        type *rx = mpc83xx_spi->rx;                                       \
         *rx++ = (type)(data >> mpc83xx_spi->rx_shift);                    \
         mpc83xx_spi->rx = rx;                                             \
 }
@@ -142,7 +142,7 @@ static								\
 u32 mpc83xx_spi_tx_buf_##type(struct mpc83xx_spi *mpc83xx_spi)  \
 {                                                               \
         u32 data;                                               \
-        const type * tx = mpc83xx_spi->tx;                      \
+        const type *tx = mpc83xx_spi->tx;                       \
         if (!tx)                                                \
                 return 0;                                       \
         data = *tx++ << mpc83xx_spi->tx_shift;                  \
@@ -500,7 +500,7 @@ static irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data)
                 while (((event =
                          mpc83xx_spi_read_reg(&mpc83xx_spi->base->event)) &
                                                 SPIE_NF) == 0)
-                         cpu_relax();
+                        cpu_relax();
 
         mpc83xx_spi->count -= 1;
         if (mpc83xx_spi->count) {