* [PATCH v2] dmaengine: zynqmp_dma: Fix static checker warning
@ 2016-07-14 13:30 Kedareswara rao Appana
2016-07-14 13:40 ` Dan Carpenter
2016-07-24 5:51 ` Vinod Koul
0 siblings, 2 replies; 3+ messages in thread
From: Kedareswara rao Appana @ 2016-07-14 13:30 UTC (permalink / raw)
To: linux-arm-kernel
This patch fixes the below static checker warning
drivers/dma/xilinx/zynqmp_dma.c:973 zynqmp_dma_chan_probe()
warn: was && intended here instead of ||?
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
---
Changes for v2:
---> Return EINVAL instead of err as suggested by Dan.
drivers/dma/xilinx/zynqmp_dma.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/xilinx/zynqmp_dma.c b/drivers/dma/xilinx/zynqmp_dma.c
index f777a5b..b18d51f 100644
--- a/drivers/dma/xilinx/zynqmp_dma.c
+++ b/drivers/dma/xilinx/zynqmp_dma.c
@@ -970,12 +970,17 @@ static int zynqmp_dma_chan_probe(struct zynqmp_dma_device *zdev,
chan->dst_burst_len = ZYNQMP_DMA_AWLEN_RST_VAL;
chan->src_burst_len = ZYNQMP_DMA_ARLEN_RST_VAL;
err = of_property_read_u32(node, "xlnx,bus-width", &chan->bus_width);
- if ((err < 0) && ((chan->bus_width != ZYNQMP_DMA_BUS_WIDTH_64) ||
- (chan->bus_width != ZYNQMP_DMA_BUS_WIDTH_128))) {
- dev_err(zdev->dev, "invalid bus-width value");
+ if (err < 0) {
+ dev_err(&pdev->dev, "missing xlnx,bus-width property\n");
return err;
}
+ if (chan->bus_width != ZYNQMP_DMA_BUS_WIDTH_64 &&
+ chan->bus_width != ZYNQMP_DMA_BUS_WIDTH_128) {
+ dev_err(zdev->dev, "invalid bus-width value");
+ return -EINVAL;
+ }
+
chan->is_dmacoherent = of_property_read_bool(node, "dma-coherent");
zdev->chan = chan;
tasklet_init(&chan->tasklet, zynqmp_dma_do_tasklet, (ulong)chan);
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2] dmaengine: zynqmp_dma: Fix static checker warning
2016-07-14 13:30 [PATCH v2] dmaengine: zynqmp_dma: Fix static checker warning Kedareswara rao Appana
@ 2016-07-14 13:40 ` Dan Carpenter
2016-07-24 5:51 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Dan Carpenter @ 2016-07-14 13:40 UTC (permalink / raw)
To: linux-arm-kernel
Looks good. Thanks!
regards,
dan carpenter
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2] dmaengine: zynqmp_dma: Fix static checker warning
2016-07-14 13:30 [PATCH v2] dmaengine: zynqmp_dma: Fix static checker warning Kedareswara rao Appana
2016-07-14 13:40 ` Dan Carpenter
@ 2016-07-24 5:51 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2016-07-24 5:51 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 14, 2016 at 07:00:55PM +0530, Kedareswara rao Appana wrote:
> This patch fixes the below static checker warning
> drivers/dma/xilinx/zynqmp_dma.c:973 zynqmp_dma_chan_probe()
> warn: was && intended here instead of ||?
Applied, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-07-24 5:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-14 13:30 [PATCH v2] dmaengine: zynqmp_dma: Fix static checker warning Kedareswara rao Appana
2016-07-14 13:40 ` Dan Carpenter
2016-07-24 5:51 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).