usb: musb/ux500: remove duplicate check for dma_is_compatible
authorArnd Bergmann <arnd@arndb.de>
Thu, 28 Jan 2016 16:23:15 +0000 (17:23 +0100)
committerFelipe Balbi <balbi@kernel.org>
Fri, 4 Mar 2016 13:14:30 +0000 (15:14 +0200)
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>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
drivers/usb/musb/ux500_dma.c

index d0b6a1cd7f622a8cb3848a5a76126fedc6daa938..c92a295049adc20804777c7ee07df6f6c19ac8ea 100644 (file)
@@ -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);
This page took 0.026936 seconds and 5 git commands to generate.