Commit 92042d29 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'omap-for-v4.13/omap1-signed' of...

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: default avatarOlof Johansson <olof@lixom.net>
parents b9e44ddb 764e4ef0
...@@ -240,7 +240,6 @@ static void omap1_show_dma_caps(void) ...@@ -240,7 +240,6 @@ static void omap1_show_dma_caps(void)
w |= 1 << 3; w |= 1 << 3;
dma_write(w, GSCR, 0); dma_write(w, GSCR, 0);
} }
return;
} }
static unsigned configure_dma_errata(void) static unsigned configure_dma_errata(void)
...@@ -339,10 +338,8 @@ static int __init omap1_system_dma_init(void) ...@@ -339,10 +338,8 @@ static int __init omap1_system_dma_init(void)
goto exit_iounmap; goto exit_iounmap;
} }
d = kzalloc(sizeof(struct omap_dma_dev_attr), GFP_KERNEL); d = kzalloc(sizeof(*d), GFP_KERNEL);
if (!d) { if (!d) {
dev_err(&pdev->dev, "%s: Unable to allocate 'd' for %s\n",
__func__, pdev->name);
ret = -ENOMEM; ret = -ENOMEM;
goto exit_iounmap; goto exit_iounmap;
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Contains first level initialization routines which internally * Contains first level initialization routines which internally
* generates timer device information and registers with linux * 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. * input clock source.
* *
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
...@@ -134,8 +134,6 @@ static int __init omap1_dm_timer_init(void) ...@@ -134,8 +134,6 @@ static int __init omap1_dm_timer_init(void)
pdata = kzalloc(sizeof(*pdata), GFP_KERNEL); pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
if (!pdata) { if (!pdata) {
dev_err(&pdev->dev, "%s: Failed to allocate pdata.\n",
__func__);
ret = -ENOMEM; ret = -ENOMEM;
goto err_free_pdata; goto err_free_pdata;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment