From: Arnd Bergmann <arnd@arndb.de>
To: Felipe Balbi <balbi@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org,
Arnd Bergmann <arnd@arndb.de>, Felipe Balbi <balbi@ti.com>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Robert Jarzmik <robert.jarzmik@free.fr>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Daniel Mack <daniel@zonque.org>, Imre Kaloz <kaloz@openwrt.org>,
Krzysztof Halasa <khalasa@piap.pl>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH 7/7] usb: musb/ux500: remove duplicate check for dma_is_compatible
Date: Thu, 28 Jan 2016 17:23:15 +0100 [thread overview]
Message-ID: <1453998206-3490016-3-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1453998206-3490016-1-git-send-email-arnd@arndb.de>
When dma_addr_t is 64-bit, we get a warning about an invalid cast
in the call to ux500_dma_is_compatible() from ux500_dma_channel_program():
drivers/usb/musb/ux500_dma.c: In function 'ux500_dma_channel_program':
drivers/usb/musb/ux500_dma.c:210:51: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
if (!ux500_dma_is_compatible(channel, packet_sz, (void *)dma_addr, len))
The problem is that ux500_dma_is_compatible() is called from the
main musb driver on the virtual address, but here we pass in a
DMA address, so the types are fundamentally different but it works
because the function only checks the alignment of the buffer and
that is the same.
We could work around this by adding another cast, but I have checked
that the buffer we get passed here is already checked before it
gets mapped, so the second check seems completely unnecessary
and removing it must be the cleanest solution.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/usb/musb/ux500_dma.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
index d0b6a1cd7f62..c92a295049ad 100644
--- a/drivers/usb/musb/ux500_dma.c
+++ b/drivers/usb/musb/ux500_dma.c
@@ -207,9 +207,6 @@ static int ux500_dma_channel_program(struct dma_channel *channel,
BUG_ON(channel->status == MUSB_DMA_STATUS_UNKNOWN ||
channel->status == MUSB_DMA_STATUS_BUSY);
- if (!ux500_dma_is_compatible(channel, packet_sz, (void *)dma_addr, len))
- return false;
-
channel->status = MUSB_DMA_STATUS_BUSY;
channel->actual_len = 0;
ret = ux500_configure_channel(channel, packet_sz, mode, dma_addr, len);
--
2.7.0
next prev parent reply other threads:[~2016-01-28 16:24 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-28 16:15 [PATCH 0/7] USB changes for rare warnings Arnd Bergmann
2016-01-28 16:17 ` [PATCH 1/7] usb: gadget: pxa25x_udc: move register definitions from arch Arnd Bergmann
2016-01-28 16:17 ` [PATCH 2/7] usb: gadget: pxa25x_udc cleanup Arnd Bergmann
2016-01-29 10:13 ` Robert Jarzmik
2016-01-28 16:17 ` [PATCH 3/7] usb: gadget: pxa25x_udc: use readl/writel for mmio Arnd Bergmann
2016-01-29 10:17 ` Robert Jarzmik
2016-01-29 16:18 ` Krzysztof Hałasa
2016-01-29 17:06 ` Arnd Bergmann
2016-02-15 7:33 ` Krzysztof Hałasa
2016-02-15 9:33 ` Arnd Bergmann
2016-02-15 13:51 ` Krzysztof Hałasa
2016-02-15 16:12 ` Arnd Bergmann
2016-02-16 9:26 ` Krzysztof Hałasa
2016-02-16 11:26 ` Arnd Bergmann
2016-02-16 13:24 ` Krzysztof Hałasa
2016-02-16 13:55 ` Arnd Bergmann
2016-02-17 8:36 ` Krzysztof Hałasa
2016-02-17 10:36 ` Arnd Bergmann
2016-02-17 16:14 ` Krzysztof Hałasa
2016-02-20 20:54 ` Robert Jarzmik
2016-01-29 18:03 ` Sergei Shtylyov
2016-01-29 21:02 ` Arnd Bergmann
2016-01-29 9:32 ` [PATCH 1/7] usb: gadget: pxa25x_udc: move register definitions from arch Robert Jarzmik
2016-01-29 10:07 ` Arnd Bergmann
2016-01-29 15:26 ` Robert Jarzmik
2016-01-29 15:55 ` Krzysztof Hałasa
2016-02-17 15:08 ` Felipe Balbi
2016-02-17 16:00 ` Arnd Bergmann
2016-01-28 16:20 ` [PATCH 4/7] usb: fsl: drop USB_FSL_MPH_DR_OF Kconfig symbol Arnd Bergmann
2016-01-28 16:23 ` [PATCH 5/7] usb: isp1301-omap: mark power_up as __maybe_unused Arnd Bergmann
2016-01-28 16:23 ` [PATCH 6/7] usb: musb: use %pad format string from dma_addr_t Arnd Bergmann
2016-01-28 17:50 ` Tony Lindgren
2016-01-28 16:23 ` Arnd Bergmann [this message]
2016-02-03 18:12 ` [PATCH 0/7] USB changes for rare warnings Felipe Balbi
2016-02-03 19:15 ` Robert Jarzmik
2016-02-03 20:49 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453998206-3490016-3-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=balbi@kernel.org \
--cc=balbi@ti.com \
--cc=daniel@zonque.org \
--cc=gregkh@linuxfoundation.org \
--cc=haojian.zhuang@gmail.com \
--cc=kaloz@openwrt.org \
--cc=khalasa@piap.pl \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=robert.jarzmik@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®