[PATCH] usb: musb: Fix format specifier warning

[PATCH] usb: musb: Fix format specifier warning

[Emil Goode]

This patch fixes a format specifier warning. dma_addr_t can be either
u32 or u64 so we should cast to the largest type and change the format
specifier to %llx.
The addition of urb->transfer_dma and urb->actual_length is also done a
few lines below. I have moved this code up and pass the variable buf to
dev_dbg.

Sparse output:
drivers/usb/musb/musb_host.c:1761:4: warning:
	format ‘%x’ expects argument of type ‘unsigned int’,
	but argument 6 has type ‘dma_addr_t’ [-Wformat]

Signed-off-by: Emil Goode <emilgoode@gmail.com>
---
 drivers/usb/musb/musb_host.c |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 094cf80..d647ccb 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -1756,11 +1756,11 @@ void musb_host_rx(struct musb *musb, u8 epnum)
 			dma_addr_t		buf;
 
 			rx_count = musb_readw(epio, MUSB_RXCOUNT);
+			buf = urb->transfer_dma + urb->actual_length;
 
-			dev_dbg(musb->controller, "RX%d count %d, buffer 0x%x len %d/%d\n",
+			dev_dbg(musb->controller, "RX%d count %d, buffer 0x%llx len %d/%d\n",
 					epnum, rx_count,
-					urb->transfer_dma
-						+ urb->actual_length,
+					(unsigned long long)buf,
 					qh->offset,
 					urb->transfer_buffer_length);
 
@@ -1789,11 +1789,8 @@ void musb_host_rx(struct musb *musb, u8 epnum)
 					length = rx_count;
 				d->status = d_status;
 				buf = urb->transfer_dma + d->offset;
-			} else {
+			} else
 				length = rx_count;
-				buf = urb->transfer_dma +
-						urb->actual_length;
-			}
 
 			dma->desired_mode = 0;
 #ifdef USE_MODE1
-- 
1.7.10.4

Re: [PATCH] usb: musb: Fix format specifier warning

[Sergei Shtylyov]

Hello.

On 06/01/2013 12:22 AM, Emil Goode wrote:

> This patch fixes a format specifier warning. dma_addr_t can be either
> u32 or u64 so we should cast to the largest type and change the format
> specifier to %llx.
> The addition of urb->transfer_dma and urb->actual_length is also done a
> few lines below. I have moved this code up and pass the variable buf to
> dev_dbg.
>
> Sparse output:
> drivers/usb/musb/musb_host.c:1761:4: warning:
> 	format ‘%x’ expects argument of type ‘unsigned int’,
> 	but argument 6 has type ‘dma_addr_t’ [-Wformat]
>
> Signed-off-by: Emil Goode <emilgoode@gmail.com>
> ---
>   drivers/usb/musb/musb_host.c |   11 ++++-------
>   1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
> index 094cf80..d647ccb 100644
> --- a/drivers/usb/musb/musb_host.c
> +++ b/drivers/usb/musb/musb_host.c
[...]
> @@ -1789,11 +1789,8 @@ void musb_host_rx(struct musb *musb, u8 epnum)
>   					length = rx_count;
>   				d->status = d_status;
>   				buf = urb->transfer_dma + d->offset;
> -			} else {
> +			} else

    You should keep {} on the *else* branch since *if* branch has {},
according to Documentation/CodingStyle.

>   				length = rx_count;
> -				buf = urb->transfer_dma +
> -						urb->actual_length;
> -			}

WBR, Sergei

Re: [PATCH] usb: musb: Fix format specifier warning

[Andy Shevchenko]

On Fri, May 31, 2013 at 11:22 PM, Emil Goode <emilgoode@gmail.com> wrote:
> This patch fixes a format specifier warning. dma_addr_t can be either
> u32 or u64 so we should cast to the largest type and change the format
> specifier to %llx.

dma_addr_t is derived from phys_addr_t, thus you may use %pa specifier
which is available from v3.8(?).

Something like this:
dma_addr_t src_addr;
dev_dbg(dev, "DMA addr: %pa\n", src_addr);

--
With Best Regards,
Andy Shevchenko

Re: [PATCH] usb: musb: Fix format specifier warning

[Randy Dunlap]

On 05/31/13 15:34, Andy Shevchenko wrote:
> On Fri, May 31, 2013 at 11:22 PM, Emil Goode <emilgoode@gmail.com> wrote:
>> This patch fixes a format specifier warning. dma_addr_t can be either
>> u32 or u64 so we should cast to the largest type and change the format
>> specifier to %llx.
> 
> dma_addr_t is derived from phys_addr_t, thus you may use %pa specifier
> which is available from v3.8(?).
> 
> Something like this:
> dma_addr_t src_addr;
> dev_dbg(dev, "DMA addr: %pa\n", src_addr);

Isn't that:

  deb_dbg(dev, "DMA addr: %pa\n", &src_addr);


-- 
~Randy

Re: [PATCH] usb: musb: Fix format specifier warning

[Andy Shevchenko]

On Sat, Jun 1, 2013 at 1:39 AM, Randy Dunlap <rdunlap@infradead.org> wrote:
> On 05/31/13 15:34, Andy Shevchenko wrote:
>> On Fri, May 31, 2013 at 11:22 PM, Emil Goode <emilgoode@gmail.com> wrote:
>>> This patch fixes a format specifier warning. dma_addr_t can be either
>>> u32 or u64 so we should cast to the largest type and change the format
>>> specifier to %llx.
>>
>> dma_addr_t is derived from phys_addr_t, thus you may use %pa specifier
>> which is available from v3.8(?).
>>
>> Something like this:
>> dma_addr_t src_addr;
>> dev_dbg(dev, "DMA addr: %pa\n", src_addr);
>
> Isn't that:
>
>   deb_dbg(dev, "DMA addr: %pa\n", &src_addr);

It's.
You are right.

--
With Best Regards,
Andy Shevchenko

Re: [PATCH] usb: musb: Fix format specifier warning

[Emil Goode]

Hello,

Thank's for your pointers.
I will send a patch that applies on top of Felipe's patch.

Best regards,

Emil Goode

On Sat, Jun 01, 2013 at 04:15:03PM +0300, Andy Shevchenko wrote:
> On Sat, Jun 1, 2013 at 1:39 AM, Randy Dunlap <rdunlap@infradead.org> wrote:
> > On 05/31/13 15:34, Andy Shevchenko wrote:
> >> On Fri, May 31, 2013 at 11:22 PM, Emil Goode <emilgoode@gmail.com> wrote:
> >>> This patch fixes a format specifier warning. dma_addr_t can be either
> >>> u32 or u64 so we should cast to the largest type and change the format
> >>> specifier to %llx.
> >>
> >> dma_addr_t is derived from phys_addr_t, thus you may use %pa specifier
> >> which is available from v3.8(?).
> >>
> >> Something like this:
> >> dma_addr_t src_addr;
> >> dev_dbg(dev, "DMA addr: %pa\n", src_addr);
> >
> > Isn't that:
> >
> >   deb_dbg(dev, "DMA addr: %pa\n", &src_addr);
> 
> It's.
> You are right.
> 
> --
> With Best Regards,
> Andy Shevchenko

Re: [PATCH] usb: musb: Fix format specifier warning

[Andy Shevchenko]

On Sat, Jun 1, 2013 at 8:11 PM, Emil Goode <emilgoode@gmail.com> wrote:
> Thank's for your pointers.
> I will send a patch that applies on top of Felipe's patch.

I guess there is not much sense to do that since Felipe applied your
patch already. Just keep in mind the hint for future changes.

--
With Best Regards,
Andy Shevchenko