lkml.org 
[lkml]   [2013]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2] usb: musb: use the new %pa format specifier for dma_addr_t
Date
This patch makes use of the new format specifier %pa that was introduced
by the following commit.

7d7992108d02aa92ad4c77e5d9ce14088c942e75
("lib/vsprintf.c: add %pa format specifier for phys_addr_t types")

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.

Signed-off-by: Emil Goode <emilgoode@gmail.com>
---
v2: Remove 0x from string as it will print as 0x0x
This applies on top of commit 43d5ad743c6f
("usb: musb: host: fix build warning")
I also added braces to the else statement for consistency.
(Didn't want to send a separate patch for that)

drivers/usb/musb/musb_host.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index a9695f5..ee7730a 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -1756,12 +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%llx len %d/%d\n",
+ dev_dbg(musb->controller, "RX%d count %d, buffer %pa len %d/%d\n",
epnum, rx_count,
- (unsigned long long) urb->transfer_dma
- + urb->actual_length,
- qh->offset,
+ &buf, qh->offset,
urb->transfer_buffer_length);

c = musb->dma_controller;
@@ -1785,14 +1784,13 @@ void musb_host_rx(struct musb *musb, u8 epnum)
rx_count, d->length);

length = d->length;
- } else
+ } else {
length = rx_count;
+ }
d->status = d_status;
buf = urb->transfer_dma + d->offset;
} else {
length = rx_count;
- buf = urb->transfer_dma +
- urb->actual_length;
}

dma->desired_mode = 0;
--
1.7.10.4


\
 
 \ /
  Last update: 2013-06-01 22:01    [W:3.126 / U:0.196 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site