Merge tag 'omap-cleanup-b-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into cleanup-makefile-sparse

smatch and string-wrapping cleanups for the OMAP subarch code.

These changes fix some of the more meaningful warnings that smatch
returns for the OMAP subarch code, and unwraps strings that are
wrapped at the 80-column boundary, to conform with the current
practice.

Basic build, boot, and PM logs are available here:

http://www.pwsan.com/omap/testlogs/warnings_a_cleanup_3.7/20120912025927/

4 files changed, 52 insertions, 65 deletions

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 6dcad5873d57..c76ed8bff838 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -968,8 +968,7 @@ void omap_stop_dma(int lch)
                         l = p->dma_read(CCR, lch);
                 }
                 if (i >= 100)
-                        printk(KERN_ERR "DMA drain did not complete on "
-                                        "lch %d\n", lch);
+                        pr_err("DMA drain did not complete on lch %d\n", lch);
                 /* Restore OCP_SYSCONFIG */
                 p->dma_write(sys_cf, OCP_SYSCONFIG, lch);
         } else {
@@ -1153,8 +1152,7 @@ void omap_dma_link_lch(int lch_head, int lch_queue)
 
         if ((dma_chan[lch_head].dev_id == -1) ||
             (dma_chan[lch_queue].dev_id == -1)) {
-                printk(KERN_ERR "omap_dma: trying to link "
-                       "non requested channels\n");
+                pr_err("omap_dma: trying to link non requested channels\n");
                 dump_stack();
         }
 
@@ -1180,15 +1178,13 @@ void omap_dma_unlink_lch(int lch_head, int lch_queue)
 
         if (dma_chan[lch_head].next_lch != lch_queue ||
             dma_chan[lch_head].next_lch == -1) {
-                printk(KERN_ERR "omap_dma: trying to unlink "
-                       "non linked channels\n");
+                pr_err("omap_dma: trying to unlink non linked channels\n");
                 dump_stack();
         }
 
         if ((dma_chan[lch_head].flags & OMAP_DMA_ACTIVE) ||
             (dma_chan[lch_queue].flags & OMAP_DMA_ACTIVE)) {
-                printk(KERN_ERR "omap_dma: You need to stop the DMA channels "
-                       "before unlinking\n");
+                pr_err("omap_dma: You need to stop the DMA channels before unlinking\n");
                 dump_stack();
         }
 
@@ -1830,16 +1826,15 @@ static int omap1_dma_handle_ch(int ch)
         if ((csr & 0x3f) == 0)
                 return 0;
         if (unlikely(dma_chan[ch].dev_id == -1)) {
-                printk(KERN_WARNING "Spurious interrupt from DMA channel "
-                       "%d (CSR %04x)\n", ch, csr);
+                pr_warn("Spurious interrupt from DMA channel %d (CSR %04x)\n",
+                        ch, csr);
                 return 0;
         }
         if (unlikely(csr & OMAP1_DMA_TOUT_IRQ))
-                printk(KERN_WARNING "DMA timeout with device %d\n",
-                       dma_chan[ch].dev_id);
+                pr_warn("DMA timeout with device %d\n", dma_chan[ch].dev_id);
         if (unlikely(csr & OMAP_DMA_DROP_IRQ))
-                printk(KERN_WARNING "DMA synchronization event drop occurred "
-                       "with device %d\n", dma_chan[ch].dev_id);
+                pr_warn("DMA synchronization event drop occurred with device %d\n",
+                        dma_chan[ch].dev_id);
         if (likely(csr & OMAP_DMA_BLOCK_IRQ))
                 dma_chan[ch].flags &= ~OMAP_DMA_ACTIVE;
         if (likely(dma_chan[ch].callback != NULL))
@@ -1879,21 +1874,19 @@ static int omap2_dma_handle_ch(int ch)
 
         if (!status) {
                 if (printk_ratelimit())
-                        printk(KERN_WARNING "Spurious DMA IRQ for lch %d\n",
-                                ch);
+                        pr_warn("Spurious DMA IRQ for lch %d\n", ch);
                 p->dma_write(1 << ch, IRQSTATUS_L0, ch);
                 return 0;
         }
         if (unlikely(dma_chan[ch].dev_id == -1)) {
                 if (printk_ratelimit())
-                        printk(KERN_WARNING "IRQ %04x for non-allocated DMA"
-                                        "channel %d\n", status, ch);
+                        pr_warn("IRQ %04x for non-allocated DMA channel %d\n",
+                                status, ch);
                 return 0;
         }
         if (unlikely(status & OMAP_DMA_DROP_IRQ))
-                printk(KERN_INFO
-                       "DMA synchronization event drop occurred with device "
-                       "%d\n", dma_chan[ch].dev_id);
+                pr_info("DMA synchronization event drop occurred with device %d\n",
+                        dma_chan[ch].dev_id);
         if (unlikely(status & OMAP2_DMA_TRANS_ERR_IRQ)) {
                 printk(KERN_INFO "DMA transaction error with device %d\n",
                        dma_chan[ch].dev_id);
@@ -2013,8 +2006,9 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev)
 
         p = pdev->dev.platform_data;
         if (!p) {
-                dev_err(&pdev->dev, "%s: System DMA initialized without"
-                        "platform data\n", __func__);
+                dev_err(&pdev->dev,
+                        "%s: System DMA initialized without platform data\n",
+                        __func__);
                 return -EINVAL;
         }
 
@@ -2089,8 +2083,8 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev)
                 }
                 ret = setup_irq(dma_irq, &omap24xx_dma_irq);
                 if (ret) {
-                        dev_err(&pdev->dev, "set_up failed for IRQ %d"
-                                "for DMA (error %d)\n", dma_irq, ret);
+                        dev_err(&pdev->dev, "set_up failed for IRQ %d for DMA (error %d)\n",
+                                dma_irq, ret);
                         goto exit_dma_lch_fail;
                 }
         }
@@ -2098,8 +2092,7 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev)
         /* reserve dma channels 0 and 1 in high security devices */
         if (cpu_is_omap34xx() &&
                 (omap_type() != OMAP2_DEVICE_TYPE_GP)) {
-                printk(KERN_INFO "Reserving DMA channels 0 and 1 for "
-                                "HS ROM code\n");
+                pr_info("Reserving DMA channels 0 and 1 for HS ROM code\n");
                 dma_chan[0].dev_id = 0;
                 dma_chan[1].dev_id = 1;
         }
@@ -2107,8 +2100,8 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev)
         return 0;
 
 exit_dma_irq_fail:
-        dev_err(&pdev->dev, "unable to request IRQ %d"
-                        "for DMA (error %d)\n", dma_irq, ret);
+        dev_err(&pdev->dev, "unable to request IRQ %d for DMA (error %d)\n",
+                dma_irq, ret);
         for (irq_rel = 0; irq_rel < ch; irq_rel++) {
                 dma_irq = platform_get_irq(pdev, irq_rel);
                 free_irq(dma_irq, (void *)(irq_rel + 1));
diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c
index cff8712122bb..fd0d3aad00ef 100644
--- a/arch/arm/plat-omap/mux.c
+++ b/arch/arm/plat-omap/mux.c
@@ -76,7 +76,7 @@ int __init_or_module omap_cfg_reg(const unsigned long index)
                 return -ENODEV;
         }
 
-        reg = (struct pin_config *)&mux_cfg->pins[index];
+        reg = &mux_cfg->pins[index];
 
         if (!mux_cfg->cfg_reg)
                 return -ENODEV;
diff --git a/arch/arm/plat-omap/omap-pm-noop.c b/arch/arm/plat-omap/omap-pm-noop.c
index 5a97b4d98d41..9f6413324df9 100644
--- a/arch/arm/plat-omap/omap-pm-noop.c
+++ b/arch/arm/plat-omap/omap-pm-noop.c
@@ -41,11 +41,11 @@ int omap_pm_set_max_mpu_wakeup_lat(struct device *dev, long t)
         };
 
         if (t == -1)
-                pr_debug("OMAP PM: remove max MPU wakeup latency constraint: "
-                         "dev %s\n", dev_name(dev));
+                pr_debug("OMAP PM: remove max MPU wakeup latency constraint: dev %s\n",
+                         dev_name(dev));
         else
-                pr_debug("OMAP PM: add max MPU wakeup latency constraint: "
-                         "dev %s, t = %ld usec\n", dev_name(dev), t);
+                pr_debug("OMAP PM: add max MPU wakeup latency constraint: dev %s, t = %ld usec\n",
+                         dev_name(dev), t);
 
         /*
          * For current Linux, this needs to map the MPU to a
@@ -70,11 +70,10 @@ int omap_pm_set_min_bus_tput(struct device *dev, u8 agent_id, unsigned long r)
         };
 
         if (r == 0)
-                pr_debug("OMAP PM: remove min bus tput constraint: "
-                         "dev %s for agent_id %d\n", dev_name(dev), agent_id);
+                pr_debug("OMAP PM: remove min bus tput constraint: dev %s for agent_id %d\n",
+                         dev_name(dev), agent_id);
         else
-                pr_debug("OMAP PM: add min bus tput constraint: "
-                         "dev %s for agent_id %d: rate %ld KiB\n",
+                pr_debug("OMAP PM: add min bus tput constraint: dev %s for agent_id %d: rate %ld KiB\n",
                          dev_name(dev), agent_id, r);
 
         /*
@@ -97,11 +96,11 @@ int omap_pm_set_max_dev_wakeup_lat(struct device *req_dev, struct device *dev,
         };
 
         if (t == -1)
-                pr_debug("OMAP PM: remove max device latency constraint: "
-                         "dev %s\n", dev_name(dev));
+                pr_debug("OMAP PM: remove max device latency constraint: dev %s\n",
+                         dev_name(dev));
         else
-                pr_debug("OMAP PM: add max device latency constraint: "
-                         "dev %s, t = %ld usec\n", dev_name(dev), t);
+                pr_debug("OMAP PM: add max device latency constraint: dev %s, t = %ld usec\n",
+                         dev_name(dev), t);
 
         /*
          * For current Linux, this needs to map the device to a
@@ -127,11 +126,11 @@ int omap_pm_set_max_sdma_lat(struct device *dev, long t)
         };
 
         if (t == -1)
-                pr_debug("OMAP PM: remove max DMA latency constraint: "
-                         "dev %s\n", dev_name(dev));
+                pr_debug("OMAP PM: remove max DMA latency constraint: dev %s\n",
+                         dev_name(dev));
         else
-                pr_debug("OMAP PM: add max DMA latency constraint: "
-                         "dev %s, t = %ld usec\n", dev_name(dev), t);
+                pr_debug("OMAP PM: add max DMA latency constraint: dev %s, t = %ld usec\n",
+                         dev_name(dev), t);
 
         /*
          * For current Linux PM QOS params, this code should scan the
@@ -156,11 +155,11 @@ int omap_pm_set_min_clk_rate(struct device *dev, struct clk *c, long r)
         }
 
         if (r == 0)
-                pr_debug("OMAP PM: remove min clk rate constraint: "
-                         "dev %s\n", dev_name(dev));
+                pr_debug("OMAP PM: remove min clk rate constraint: dev %s\n",
+                         dev_name(dev));
         else
-                pr_debug("OMAP PM: add min clk rate constraint: "
-                         "dev %s, rate = %ld Hz\n", dev_name(dev), r);
+                pr_debug("OMAP PM: add min clk rate constraint: dev %s, rate = %ld Hz\n",
+                         dev_name(dev), r);
 
         /*
          * Code in a real implementation should keep track of these
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
index c490240bb82c..b59edb065c70 100644
--- a/arch/arm/plat-omap/omap_device.c
+++ b/arch/arm/plat-omap/omap_device.c
@@ -1,4 +1,3 @@
-
 /*
  * omap_device implementation
  *
@@ -153,21 +152,19 @@ static int _omap_device_activate(struct omap_device *od, u8 ignore_lat)
                 act_lat = timespec_to_ns(&c);
 
                 dev_dbg(&od->pdev->dev,
-                        "omap_device: pm_lat %d: activate: elapsed time "
-                        "%llu nsec\n", od->pm_lat_level, act_lat);
+                        "omap_device: pm_lat %d: activate: elapsed time %llu nsec\n",
+                        od->pm_lat_level, act_lat);
 
                 if (act_lat > odpl->activate_lat) {
                         odpl->activate_lat_worst = act_lat;
                         if (odpl->flags & OMAP_DEVICE_LATENCY_AUTO_ADJUST) {
                                 odpl->activate_lat = act_lat;
                                 dev_dbg(&od->pdev->dev,
-                                        "new worst case activate latency "
-                                        "%d: %llu\n",
+                                        "new worst case activate latency %d: %llu\n",
                                         od->pm_lat_level, act_lat);
                         } else
                                 dev_warn(&od->pdev->dev,
-                                         "activate latency %d "
-                                         "higher than exptected. (%llu > %d)\n",
+                                         "activate latency %d higher than expected. (%llu > %d)\n",
                                          od->pm_lat_level, act_lat,
                                          odpl->activate_lat);
                 }
@@ -220,21 +217,19 @@ static int _omap_device_deactivate(struct omap_device *od, u8 ignore_lat)
                 deact_lat = timespec_to_ns(&c);
 
                 dev_dbg(&od->pdev->dev,
-                        "omap_device: pm_lat %d: deactivate: elapsed time "
-                        "%llu nsec\n", od->pm_lat_level, deact_lat);
+                        "omap_device: pm_lat %d: deactivate: elapsed time %llu nsec\n",
+                        od->pm_lat_level, deact_lat);
 
                 if (deact_lat > odpl->deactivate_lat) {
                         odpl->deactivate_lat_worst = deact_lat;
                         if (odpl->flags & OMAP_DEVICE_LATENCY_AUTO_ADJUST) {
                                 odpl->deactivate_lat = deact_lat;
                                 dev_dbg(&od->pdev->dev,
-                                        "new worst case deactivate latency "
-                                        "%d: %llu\n",
+                                        "new worst case deactivate latency %d: %llu\n",
                                         od->pm_lat_level, deact_lat);
                         } else
                                 dev_warn(&od->pdev->dev,
-                                         "deactivate latency %d "
-                                         "higher than exptected. (%llu > %d)\n",
+                                         "deactivate latency %d higher than expected. (%llu > %d)\n",
                                          od->pm_lat_level, deact_lat,
                                          odpl->deactivate_lat);
                 }
@@ -449,8 +444,8 @@ static int omap_device_count_resources(struct omap_device *od)
         for (i = 0; i < od->hwmods_cnt; i++)
                 c += omap_hwmod_count_resources(od->hwmods[i]);
 
-        pr_debug("omap_device: %s: counted %d total resources across %d "
-                 "hwmods\n", od->pdev->name, c, od->hwmods_cnt);
+        pr_debug("omap_device: %s: counted %d total resources across %d hwmods\n",
+                 od->pdev->name, c, od->hwmods_cnt);
 
         return c;
 }