summaryrefslogtreecommitdiffstats
path: root/drivers/dma/sh/shdmac.c
diff options
context:
space:
mode:
authorPeter Griffin2016-06-07 19:38:41 +0200
committerVinod Koul2016-06-21 18:05:00 +0200
commitaef94fea97eb77f86159375825a370b45d9f2fec (patch)
tree275639d62e6c0920e859e3d22786cb92a4098e04 /drivers/dma/sh/shdmac.c
parentdmaengine: tegra20-apb-dma: Only calculate residue if txstate exists. (diff)
downloadkernel-qcow2-linux-aef94fea97eb77f86159375825a370b45d9f2fec.tar.gz
kernel-qcow2-linux-aef94fea97eb77f86159375825a370b45d9f2fec.tar.xz
kernel-qcow2-linux-aef94fea97eb77f86159375825a370b45d9f2fec.zip
dmaengine: Remove site specific OOM error messages on kzalloc
If kzalloc() fails it will issue it's own error message including a dump_stack(). So remove the site specific error messages. Signed-off-by: Peter Griffin <peter.griffin@linaro.org> Acked-by: Jon Hunter <jonathanh@nvidia.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/sh/shdmac.c')
-rw-r--r--drivers/dma/sh/shdmac.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
index 80d86402490e..c94ffab0d25c 100644
--- a/drivers/dma/sh/shdmac.c
+++ b/drivers/dma/sh/shdmac.c
@@ -532,11 +532,8 @@ static int sh_dmae_chan_probe(struct sh_dmae_device *shdev, int id,
sh_chan = devm_kzalloc(sdev->dma_dev.dev, sizeof(struct sh_dmae_chan),
GFP_KERNEL);
- if (!sh_chan) {
- dev_err(sdev->dma_dev.dev,
- "No free memory for allocating dma channels!\n");
+ if (!sh_chan)
return -ENOMEM;
- }
schan = &sh_chan->shdma_chan;
schan->max_xfer_len = SH_DMA_TCR_MAX + 1;
@@ -732,10 +729,8 @@ static int sh_dmae_probe(struct platform_device *pdev)
shdev = devm_kzalloc(&pdev->dev, sizeof(struct sh_dmae_device),
GFP_KERNEL);
- if (!shdev) {
- dev_err(&pdev->dev, "Not enough memory\n");
+ if (!shdev)
return -ENOMEM;
- }
dma_dev = &shdev->shdma_dev.dma_dev;