4 files changed, 18 insertions, 18 deletions

diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c
index 9e82d7e725a5..b3b73ae57d6d 100644
--- a/arch/powerpc/sysdev/qe_lib/qe.c
+++ b/arch/powerpc/sysdev/qe_lib/qe.c
@@ -64,7 +64,7 @@ static phys_addr_t qebase = -1;
 phys_addr_t get_qe_base(void)
 {
         struct device_node *qe;
-        unsigned int size;
+        int size;
         const u32 *prop;
 
         if (qebase != -1)
@@ -158,7 +158,7 @@ static unsigned int brg_clk = 0;
 unsigned int qe_get_brg_clk(void)
 {
         struct device_node *qe;
-        unsigned int size;
+        int size;
         const u32 *prop;
 
         if (brg_clk)
@@ -305,7 +305,7 @@ EXPORT_SYMBOL(qe_put_snum);
 
 static int qe_sdma_init(void)
 {
-        struct sdma *sdma = &qe_immr->sdma;
+        struct sdma __iomem *sdma = &qe_immr->sdma;
         unsigned long sdma_buf_offset;
 
         if (!sdma)
diff --git a/arch/powerpc/sysdev/qe_lib/ucc.c b/arch/powerpc/sysdev/qe_lib/ucc.c
index d3c7f5af9bc8..1d78071aad7d 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc.c
@@ -88,7 +88,7 @@ int ucc_set_type(unsigned int ucc_num, enum ucc_speed_type speed)
         return 0;
 }
 
-static void get_cmxucr_reg(unsigned int ucc_num, __be32 **cmxucr,
+static void get_cmxucr_reg(unsigned int ucc_num, __be32 __iomem **cmxucr,
         unsigned int *reg_num, unsigned int *shift)
 {
         unsigned int cmx = ((ucc_num & 1) << 1) + (ucc_num > 3);
@@ -100,7 +100,7 @@ static void get_cmxucr_reg(unsigned int ucc_num, __be32 **cmxucr,
 
 int ucc_mux_set_grant_tsa_bkpt(unsigned int ucc_num, int set, u32 mask)
 {
-        __be32 *cmxucr;
+        __be32 __iomem *cmxucr;
         unsigned int reg_num;
         unsigned int shift;
 
@@ -121,7 +121,7 @@ int ucc_mux_set_grant_tsa_bkpt(unsigned int ucc_num, int set, u32 mask)
 int ucc_set_qe_mux_rxtx(unsigned int ucc_num, enum qe_clock clock,
         enum comm_dir mode)
 {
-        __be32 *cmxucr;
+        __be32 __iomem *cmxucr;
         unsigned int reg_num;
         unsigned int shift;
         u32 clock_bits = 0;
diff --git a/arch/powerpc/sysdev/qe_lib/ucc_fast.c b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
index bcf88e6ce962..1aecb075a72e 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc_fast.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
@@ -46,7 +46,7 @@ void ucc_fast_dump_regs(struct ucc_fast_private * uccf)
         printk(KERN_INFO "uccm  : addr=0x%p, val=0x%08x\n",
                   &uccf->uf_regs->uccm, in_be32(&uccf->uf_regs->uccm));
         printk(KERN_INFO "uccs  : addr=0x%p, val=0x%02x\n",
-                  &uccf->uf_regs->uccs, uccf->uf_regs->uccs);
+                  &uccf->uf_regs->uccs, in_8(&uccf->uf_regs->uccs));
         printk(KERN_INFO "urfb  : addr=0x%p, val=0x%08x\n",
                   &uccf->uf_regs->urfb, in_be32(&uccf->uf_regs->urfb));
         printk(KERN_INFO "urfs  : addr=0x%p, val=0x%04x\n",
@@ -68,7 +68,7 @@ void ucc_fast_dump_regs(struct ucc_fast_private * uccf)
         printk(KERN_INFO "urtry : addr=0x%p, val=0x%08x\n",
                   &uccf->uf_regs->urtry, in_be32(&uccf->uf_regs->urtry));
         printk(KERN_INFO "guemr : addr=0x%p, val=0x%02x\n",
-                  &uccf->uf_regs->guemr, uccf->uf_regs->guemr);
+                  &uccf->uf_regs->guemr, in_8(&uccf->uf_regs->guemr));
 }
 EXPORT_SYMBOL(ucc_fast_dump_regs);
 
@@ -96,7 +96,7 @@ EXPORT_SYMBOL(ucc_fast_transmit_on_demand);
 
 void ucc_fast_enable(struct ucc_fast_private * uccf, enum comm_dir mode)
 {
-        struct ucc_fast *uf_regs;
+        struct ucc_fast __iomem *uf_regs;
         u32 gumr;
 
         uf_regs = uccf->uf_regs;
@@ -117,7 +117,7 @@ EXPORT_SYMBOL(ucc_fast_enable);
 
 void ucc_fast_disable(struct ucc_fast_private * uccf, enum comm_dir mode)
 {
-        struct ucc_fast *uf_regs;
+        struct ucc_fast __iomem *uf_regs;
         u32 gumr;
 
         uf_regs = uccf->uf_regs;
@@ -139,7 +139,7 @@ EXPORT_SYMBOL(ucc_fast_disable);
 int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** uccf_ret)
 {
         struct ucc_fast_private *uccf;
-        struct ucc_fast *uf_regs;
+        struct ucc_fast __iomem *uf_regs;
         u32 gumr;
         int ret;
 
@@ -216,10 +216,10 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
         uccf->stopped_tx = 0;
         uccf->stopped_rx = 0;
         uf_regs = uccf->uf_regs;
-        uccf->p_ucce = (u32 *) & (uf_regs->ucce);
-        uccf->p_uccm = (u32 *) & (uf_regs->uccm);
+        uccf->p_ucce = &uf_regs->ucce;
+        uccf->p_uccm = &uf_regs->uccm;
 #ifdef CONFIG_UGETH_TX_ON_DEMAND
-        uccf->p_utodr = (u16 *) & (uf_regs->utodr);
+        uccf->p_utodr = &uf_regs->utodr;
 #endif
 #ifdef STATISTICS
         uccf->tx_frames = 0;
diff --git a/include/asm-powerpc/ucc_fast.h b/include/asm-powerpc/ucc_fast.h
index f529f70b1d82..fce16abe7ee1 100644
--- a/include/asm-powerpc/ucc_fast.h
+++ b/include/asm-powerpc/ucc_fast.h
@@ -156,11 +156,11 @@ struct ucc_fast_info {
 
 struct ucc_fast_private {
         struct ucc_fast_info *uf_info;
-        struct ucc_fast *uf_regs;       /* a pointer to memory map of UCC regs. */
-        u32 *p_ucce;            /* a pointer to the event register in memory. */
-        u32 *p_uccm;            /* a pointer to the mask register in memory. */
+        struct ucc_fast __iomem *uf_regs; /* a pointer to the UCC regs. */
+        u32 __iomem *p_ucce;    /* a pointer to the event register in memory. */
+        u32 __iomem *p_uccm;    /* a pointer to the mask register in memory. */
 #ifdef CONFIG_UGETH_TX_ON_DEMAND
-        u16 *p_utodr;           /* pointer to the transmit on demand register */
+        u16 __iomem *p_utodr;   /* pointer to the transmit on demand register */
 #endif
         int enabled_tx;         /* Whether channel is enabled for Tx (ENT) */
         int enabled_rx;         /* Whether channel is enabled for Rx (ENR) */