Merge tag 'omap-for-v4.13/omap1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

A series of omap1 changes for issues found by Coccinelle.

* tag 'omap-for-v4.13/omap1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP1: Fix a typo in a comment line
  ARM: OMAP1: Delete an error message for a failed memory allocation in omap1_dm_timer_init()
  ARM: OMAP1: DMA: Delete an unnecessary return statement in omap1_show_dma_caps()
  ARM: OMAP1: DMA: Delete an error message for a failed memory allocation in omap1_system_dma_init()
  ARM: OMAP1: DMA: Improve a size determination in omap1_system_dma_init()

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 2 insertions, 7 deletions

diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c
index c821c1d5610e..52d7eda1adec 100644
--- a/arch/arm/mach-omap1/dma.c
+++ b/arch/arm/mach-omap1/dma.c
@@ -240,7 +240,6 @@ static void omap1_show_dma_caps(void)
                 w |= 1 << 3;
                 dma_write(w, GSCR, 0);
         }
-        return;
 }
 
 static unsigned configure_dma_errata(void)
@@ -339,10 +338,8 @@ static int __init omap1_system_dma_init(void)
                 goto exit_iounmap;
         }
 
-        d = kzalloc(sizeof(struct omap_dma_dev_attr), GFP_KERNEL);
+        d = kzalloc(sizeof(*d), GFP_KERNEL);
         if (!d) {
-                dev_err(&pdev->dev, "%s: Unable to allocate 'd' for %s\n",
-                        __func__, pdev->name);
                 ret = -ENOMEM;
                 goto exit_iounmap;
         }
diff --git a/arch/arm/mach-omap1/timer.c b/arch/arm/mach-omap1/timer.c
index 06c5ba7574a5..8fb1ec6fa999 100644
--- a/arch/arm/mach-omap1/timer.c
+++ b/arch/arm/mach-omap1/timer.c
@@ -3,7 +3,7 @@
  *
  * Contains first level initialization routines which internally
  * generates timer device information and registers with linux
- * device model. It also has low level function to chnage the timer
+ * device model. It also has a low level function to change the timer
  * input clock source.
  *
  * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
@@ -134,8 +134,6 @@ static int __init omap1_dm_timer_init(void)
 
                 pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
                 if (!pdata) {
-                        dev_err(&pdev->dev, "%s: Failed to allocate pdata.\n",
-                                __func__);
                         ret = -ENOMEM;
                         goto err_free_pdata;
                 }