sprd/sipc: remove build warnings

Remove build warnings including wrong printing format and wrong cast.

Change-Id: If3ba9d58eab7bfa6a269934aedf1ba700692aafd
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/drivers/sipc/sblock.c b/drivers/sipc/sblock.c
index 7f73180..6a7028d 100644 (file)
--- a/drivers/sipc/sblock.c
+++ b/drivers/sipc/sblock.c
@@ -810,12 +810,12 @@ static int sblock_debug_show(struct seq_file *m, void *private)
                        ringhd = (volatile struct sblock_ring_header *)(&sblock->ring->header->ring);
                        poolhd = (volatile struct sblock_ring_header *)(&sblock->ring->header->pool);
 
-                       seq_printf(m, "sblock dst 0x%0x, channel: 0x%0x, state: %d, smem_virt: 0x%lx, smem_addr: 0x%0x, smem_size: 0x%0x, txblksz: %d, rxblksz: %d \n",
+                       seq_printf(m, "sblock dst 0x%0x, channel: 0x%0x, state: %d, smem_virt: %p, smem_addr: 0x%0x, smem_size: 0x%0x, txblksz: %d, rxblksz: %d \n",
                                sblock->dst, sblock->channel, sblock->state,
-                               (size_t)sblock->smem_virt, sblock->smem_addr,
+                               sblock->smem_virt, sblock->smem_addr,
                                sblock->smem_size, sblock->txblksz, sblock->rxblksz );
-                       seq_printf(m, "sblock ring: txblk_virt :0x%lx, rxblk_virt :0x%lx \n",
-                               (size_t)ring->txblk_virt, (size_t)ring->rxblk_virt);
+                       seq_printf(m, "sblock ring: txblk_virt :%p, rxblk_virt :%p \n",
+                               ring->txblk_virt, ring->rxblk_virt);
                        seq_printf(m, "sblock ring header: rxblk_addr :0x%0x, rxblk_rdptr :0x%0x, rxblk_wrptr :0x%0x, rxblk_size :%d, rxblk_count :%d, rxblk_blks: 0x%0x \n",
                                ringhd->rxblk_addr, ringhd->rxblk_rdptr,
                                ringhd->rxblk_wrptr, ringhd->rxblk_size,

diff --git a/drivers/sipc/sbuf.c b/drivers/sipc/sbuf.c
index aade281..2548cdd 100644 (file)
--- a/drivers/sipc/sbuf.c
+++ b/drivers/sipc/sbuf.c
@@ -601,8 +601,8 @@ static int sbuf_debug_show(struct seq_file *m, void *private)
                        if (!sbuf) {
                                continue;
                        }
-                       seq_printf(m, "sbuf dst 0x%0x, channel: 0x%0x, state: %d, smem_virt: 0x%lx, smem_addr: 0x%0x, smem_size: 0x%0x, ringnr: %d \n",
-                                  sbuf->dst, sbuf->channel, sbuf->state, (size_t)sbuf->smem_virt, sbuf->smem_addr, sbuf->smem_size, sbuf->ringnr);
+                       seq_printf(m, "sbuf dst 0x%0x, channel: 0x%0x, state: %d, smem_virt: %p, smem_addr: 0x%0x, smem_size: 0x%0x, ringnr: %d \n",
+                                  sbuf->dst, sbuf->channel, sbuf->state, sbuf->smem_virt, sbuf->smem_addr, sbuf->smem_size, sbuf->ringnr);
 
                        for (n=0;  n < sbuf->ringnr;  n++) {
                                rings = &(sbuf->rings[n]);

diff --git a/drivers/sipc/sipc.c b/drivers/sipc/sipc.c
index 60e2342..1fc29e8 100644 (file)
--- a/drivers/sipc/sipc.c
+++ b/drivers/sipc/sipc.c
@@ -189,11 +189,11 @@ static int sipc_create(struct sipc_device *sipc)
 
        for (i = 0; i < num; i++) {
                base = (size_t)ioremap_nocache((uint32_t)info[i].ring_base, info[i].ring_size);
-               if(base == NULL){
-                       pr_info("sipc:[%d] ioremap return NULL\n");
+               if(!base){
+                       pr_info("sipc:[%d] ioremap return NULL\n", i);
                        return ENOMEM;
                }
-               pr_info("sipc:[%d] after ioremap vbase=0x%lx, pbase=0x%x, size=0x%x\n",
+               pr_info("sipc:[%d] after ioremap vbase=0x%zx, pbase=0x%x, size=0x%x\n",
                        i, base, info[i].ring_base, info[i].ring_size);
                inst[i].txbuf_size = SMSG_TXBUF_SIZE / sizeof(struct smsg);
                inst[i].txbuf_addr = base + SMSG_TXBUF_ADDR;
@@ -276,7 +276,7 @@ static int sipc_parse_dt(struct sipc_init_data **init, struct device *dev)
                }
                info[i].cp2ap_int_ctrl = SPRD_DEV_P2V(int_ctrl_phy[1]);
 
-               pr_info("sipc:[%d] ap2cp_int_ctrl=0x%lx, ap2cp_ctrl_phy=0x%x, cp2ap_int_ctrl=0x%lx, cp2ap_ctrl_phy=0x%x\n",
+               pr_info("sipc:[%d] ap2cp_int_ctrl=0x%x, ap2cp_ctrl_phy=0x%x, cp2ap_int_ctrl=0x%x, cp2ap_ctrl_phy=0x%x\n",
                        i, info[i].ap2cp_int_ctrl, int_ctrl_phy[0], info[i].cp2ap_int_ctrl, int_ctrl_phy[1]);
 
                ret = of_property_read_u32(nchd, "sprd,trig", &info[i].ap2cp_bit_trig);

diff --git a/drivers/sipc/smem.c b/drivers/sipc/smem.c
index 550f441..4a0e271 100644 (file)
--- a/drivers/sipc/smem.c
+++ b/drivers/sipc/smem.c
@@ -138,7 +138,7 @@ static int smem_debug_show(struct seq_file *m, void *private)
 
        seq_printf(m, "smem pool infomation:\n");
        seq_printf(m, "phys_addr=0x%x, total=0x%x, used=0x%x, free=0x%x\n",
-               spool->addr, spool->size, spool->used, fsize);
+               spool->addr, spool->size, atomic_read(&spool->used), fsize);
        seq_printf(m, "smem record list:\n");
 
        spin_lock_irqsave(&spool->lock, flags);

diff --git a/drivers/sipc/smsg.c b/drivers/sipc/smsg.c
index 437189d..c78f5d0 100644 (file)
--- a/drivers/sipc/smsg.c
+++ b/drivers/sipc/smsg.c
@@ -51,13 +51,16 @@ irqreturn_t smsg_irq_handler(int irq, void *dev_id)
                ipc->rxirq_clear();
        }
 
-       while (readl(ipc->rxbuf_wrptr) != readl(ipc->rxbuf_rdptr)) {
-               rxpos = (readl(ipc->rxbuf_rdptr) & (ipc->rxbuf_size - 1)) *
+       while (readl((void __iomem __force *)ipc->rxbuf_wrptr) !=
+                       readl((void __iomem __force *)ipc->rxbuf_rdptr)) {
+               rxpos = (readl((void __iomem __force *)ipc->rxbuf_rdptr) &
+                               (ipc->rxbuf_size - 1)) *
                        sizeof (struct smsg) + ipc->rxbuf_addr;
                msg = (struct smsg *)rxpos;
 
                pr_debug("irq get smsg: wrptr=%u, rdptr=%u, rxpos=0x%lx\n",
-                       readl(ipc->rxbuf_wrptr), readl(ipc->rxbuf_rdptr), rxpos);
+                       readl((void __iomem __force *)ipc->rxbuf_wrptr),
+                       readl((void __iomem __force *)ipc->rxbuf_rdptr), rxpos);
                pr_debug("irq read smsg: channel=%d, type=%d, flag=0x%04x, value=0x%08x\n",
                        msg->channel, msg->type, msg->flag, msg->value);
                if(msg->type == SMSG_TYPE_DIE) {
@@ -65,7 +68,8 @@ irqreturn_t smsg_irq_handler(int irq, void *dev_id)
                                panic("cpcrash");
                        else {
                                /* update smsg rdptr */
-                               writel(readl(ipc->rxbuf_rdptr) + 1, ipc->rxbuf_rdptr);
+                               writel(readl((void __iomem __force *)ipc->rxbuf_rdptr) + 1,
+                                       (void __iomem __force *)ipc->rxbuf_rdptr);
 
                                continue;
                        }
@@ -76,7 +80,8 @@ irqreturn_t smsg_irq_handler(int irq, void *dev_id)
                                msg->channel, msg->type, msg->flag, msg->value);
 
                        /* update smsg rdptr */
-                       writel(readl(ipc->rxbuf_rdptr) + 1, ipc->rxbuf_rdptr);
+                       writel(readl((void __iomem __force *)ipc->rxbuf_rdptr) + 1,
+                               (void __iomem __force *)ipc->rxbuf_rdptr);
 
                        continue;
                }
@@ -95,7 +100,8 @@ irqreturn_t smsg_irq_handler(int irq, void *dev_id)
                                        msg->channel, msg->type, msg->flag, msg->value);
                        }
                        /* update smsg rdptr */
-                       writel(readl(ipc->rxbuf_rdptr) + 1, ipc->rxbuf_rdptr);
+                       writel(readl((void __iomem __force *)ipc->rxbuf_rdptr) + 1,
+                               (void __iomem __force *)ipc->rxbuf_rdptr);
 
                        continue;
                }
@@ -115,7 +121,8 @@ irqreturn_t smsg_irq_handler(int irq, void *dev_id)
                }
 
                /* update smsg rdptr */
-               writel(readl(ipc->rxbuf_rdptr) + 1, ipc->rxbuf_rdptr);
+               writel(readl((void __iomem __force *)ipc->rxbuf_rdptr) + 1,
+                               (void __iomem __force *)ipc->rxbuf_rdptr);
 
                wake_up_interruptible_all(&(ch->rxwait));
 
@@ -323,24 +330,27 @@ int smsg_send(uint8_t dst, struct smsg *msg, int timeout)
                        msg->channel, msg->type, msg->flag, msg->value);
 
        spin_lock_irqsave(&(ipc->txpinlock), flags);
-       if ((int)(readl(ipc->txbuf_wrptr) -
-               readl(ipc->txbuf_rdptr)) >= ipc->txbuf_size) {
+       if ((int)(readl((void __iomem __force *)ipc->txbuf_wrptr) -
+               readl((void __iomem __force *)ipc->txbuf_rdptr)) >=
+               ipc->txbuf_size) {
                printk(KERN_WARNING "smsg txbuf is full!\n");
                rval = -EBUSY;
                goto send_failed;
        }
 
        /* calc txpos and write smsg */
-       txpos = (readl(ipc->txbuf_wrptr) & (ipc->txbuf_size - 1)) *
+       txpos = (readl((void __iomem __force *)ipc->txbuf_wrptr)
+                       & (ipc->txbuf_size - 1)) *
                sizeof(struct smsg) + ipc->txbuf_addr;
        memcpy((void *)txpos, msg, sizeof(struct smsg));
 
        pr_debug("write smsg: wrptr=%u, rdptr=%u, txpos=0x%lx\n",
-                       readl(ipc->txbuf_wrptr),
-                       readl(ipc->txbuf_rdptr), txpos);
+                       readl((void __iomem __force *)ipc->txbuf_wrptr),
+                       readl((void __iomem __force *)ipc->txbuf_rdptr), txpos);
 
        /* update wrptr */
-       writel(readl(ipc->txbuf_wrptr) + 1, ipc->txbuf_wrptr);
+       writel(readl((void __iomem __force *)ipc->txbuf_wrptr) + 1,
+                       (void __iomem __force *)ipc->txbuf_wrptr);
        ipc->txirq_trigger();
 
 send_failed:
@@ -463,10 +473,10 @@ static int smsg_debug_show(struct seq_file *m, void *private)
                seq_printf(m, "sipc: %s: \n", smsg_sipc->name);
                seq_printf(m, "dst: 0x%0x, irq: 0x%0x\n",
                           smsg_sipc->dst, smsg_sipc->irq);
-               seq_printf(m, "txbufAddr: 0x%0x, txbufsize: 0x%0x, txbufrdptr: [0x%0x]=%lu, txbufwrptr: [0x%0x]=%lu\n",
-                          smsg_sipc->txbuf_addr, smsg_sipc->txbuf_size, smsg_sipc->txbuf_rdptr, readl(smsg_sipc->txbuf_rdptr), smsg_sipc->txbuf_wrptr, readl(smsg_sipc->txbuf_wrptr));
-               seq_printf(m, "rxbufAddr: 0x%0x, rxbufsize: 0x%0x, rxbufrdptr: [0x%0x]=%lu, rxbufwrptr: [0x%0x]=%lu\n",
-                          smsg_sipc->rxbuf_addr, smsg_sipc->rxbuf_size, smsg_sipc->rxbuf_rdptr, readl(smsg_sipc->rxbuf_rdptr), smsg_sipc->rxbuf_wrptr, readl(smsg_sipc->rxbuf_wrptr));
+               seq_printf(m, "txbufAddr: 0x%0lx, txbufsize: 0x%0x, txbufrdptr: [0x%0lx]=%u, txbufwrptr: [0x%0lx]=%u\n",
+                          smsg_sipc->txbuf_addr, smsg_sipc->txbuf_size, smsg_sipc->txbuf_rdptr, readl((void __iomem __force *)smsg_sipc->txbuf_rdptr), smsg_sipc->txbuf_wrptr, readl((void __iomem __force *)smsg_sipc->txbuf_wrptr));
+               seq_printf(m, "rxbufAddr: 0x%0lx, rxbufsize: 0x%0x, rxbufrdptr: [0x%0lx]=%u, rxbufwrptr: [0x%0lx]=%u\n",
+                          smsg_sipc->rxbuf_addr, smsg_sipc->rxbuf_size, smsg_sipc->rxbuf_rdptr, readl((void __iomem __force *)smsg_sipc->rxbuf_rdptr), smsg_sipc->rxbuf_wrptr, readl((void __iomem __force *)smsg_sipc->rxbuf_wrptr));
 
                for (j=0;  j<SMSG_CH_NR; j++) {
                        seq_printf(m, "channel[%d] states: %d\n", j, smsg_sipc->states[j]);

diff --git a/drivers/sipc/stty.c b/drivers/sipc/stty.c
index 5d5564e..afb7d8a 100644 (file)
--- a/drivers/sipc/stty.c
+++ b/drivers/sipc/stty.c
@@ -252,7 +252,7 @@ static void stty_driver_exit(struct stty_device *device)
 static int stty_parse_dt(struct stty_init_data **init, struct device *dev)
 {
 #ifdef CONFIG_OF
-       struct of_device_node *np = dev->of_node;
+       struct device_node *np = dev->of_node;
        struct stty_init_data *pdata = NULL;
        int ret;
        uint32_t data;
@@ -353,7 +353,7 @@ static int  stty_probe(struct platform_device *pdev)
                return rval;
        }
 
-       printk( "stty_probe init device addr: 0x%0x\n", (void *)stty);
+       printk( "stty_probe init device addr: %p\n", (void *)stty);
        platform_set_drvdata(pdev, stty);
 
        return 0;