diff options
author | Lee Jones <lee.jones@linaro.org> | 2013-05-03 10:32:04 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-05-23 15:12:51 -0400 |
commit | 8a59fed39577d7313921a59dba8cc1711ae90da5 (patch) | |
tree | a20709493eb82822537aae8da99e6152c66e984c | |
parent | db72da92103e3023e6a4fdfe65183b21bfe5d883 (diff) |
dmaengine: ste_dma40: Remove 'always true' checking
Before allocating memory for logical channels, the current driver
checks to see if there are any. Well as the dma40_memcpy_channels[]
array is always populated, the check is always true. Best to
remove the check.
Cc: Dan Williams <djbw@fb.com>
Cc: Per Forlin <per.forlin@stericsson.com>
Cc: Rabin Vincent <rabin@rab.in>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | drivers/dma/ste_dma40.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index f25c9ccf28e8..7ccb8e2d59be 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c | |||
@@ -3286,17 +3286,11 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev) | |||
3286 | if (!base->lookup_phy_chans) | 3286 | if (!base->lookup_phy_chans) |
3287 | goto failure; | 3287 | goto failure; |
3288 | 3288 | ||
3289 | if (num_log_chans + ARRAY_SIZE(dma40_memcpy_channels)) { | 3289 | base->lookup_log_chans = kzalloc(num_log_chans * |
3290 | /* | 3290 | sizeof(struct d40_chan *), |
3291 | * The max number of logical channels are event lines for all | 3291 | GFP_KERNEL); |
3292 | * src devices and dst devices | 3292 | if (!base->lookup_log_chans) |
3293 | */ | 3293 | goto failure; |
3294 | base->lookup_log_chans = kzalloc(num_log_chans * | ||
3295 | sizeof(struct d40_chan *), | ||
3296 | GFP_KERNEL); | ||
3297 | if (!base->lookup_log_chans) | ||
3298 | goto failure; | ||
3299 | } | ||
3300 | 3294 | ||
3301 | base->reg_val_backup_chan = kmalloc(base->num_phy_chans * | 3295 | base->reg_val_backup_chan = kmalloc(base->num_phy_chans * |
3302 | sizeof(d40_backup_regs_chan), | 3296 | sizeof(d40_backup_regs_chan), |