diff options
| author | Manu Gautam <mgautam@codeaurora.org> | 2017-02-24 15:22:40 +0530 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2018-11-27 16:09:55 +0100 |
| commit | 513cef2c53c2b3846f6c571823412f514b6f66c7 (patch) | |
| tree | 91c79e2c53b67916729fbfea3150bf7d9571bbdc /drivers/usb/host | |
| parent | b32e2d51665e3b6af648dec474db214b6312d967 (diff) | |
usb: replace %p with %pK
Format specifier %p can leak kernel addresses while not valuing the
kptr_restrict system settings. When kptr_restrict is set to (1), kernel
pointers printed using the %pK format specifier will be replaced with 0's.
Debugging Note : &pK prints only Zeros as address. If you need actual
address information, write 0 to kptr_restrict.
echo 0 > /proc/sys/kernel/kptr_restrict
CRs-fixed: 1052849
Change-Id: I0e98145730380ea983fa8f46a28d15dd6c2c31df
Signed-off-by: Manu Gautam <mgautam@codeaurora.org>
Signed-off-by: Yasir Malik <ymalik@codeaurora.org>
Signed-off-by: Kevin F. Haggerty <haggertk@lineageos.org>
Diffstat (limited to 'drivers/usb/host')
34 files changed, 281 insertions, 281 deletions
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c index 5429d2645..dc1c35b5a 100644 --- a/drivers/usb/host/ehci-dbg.c +++ b/drivers/usb/host/ehci-dbg.c @@ -106,7 +106,7 @@ static inline void dbg_hcc_params (struct ehci_hcd *ehci, char *label) {} static void __maybe_unused dbg_qtd (const char *label, struct ehci_hcd *ehci, struct ehci_qtd *qtd) { - ehci_dbg(ehci, "%s td %p n%08x %08x t%08x p0=%08x\n", label, qtd, + ehci_dbg(ehci, "%s td %pK n%08x %08x t%08x p0=%08x\n", label, qtd, hc32_to_cpup(ehci, &qtd->hw_next), hc32_to_cpup(ehci, &qtd->hw_alt_next), hc32_to_cpup(ehci, &qtd->hw_token), @@ -124,7 +124,7 @@ dbg_qh (const char *label, struct ehci_hcd *ehci, struct ehci_qh *qh) { struct ehci_qh_hw *hw = qh->hw; - ehci_dbg (ehci, "%s qh %p n%08x info %x %x qtd %x\n", label, + ehci_dbg (ehci, "%s qh %pK n%08x info %x %x qtd %x\n", label, qh, hw->hw_next, hw->hw_info1, hw->hw_info2, hw->hw_current); dbg_qtd("overlay", ehci, (struct ehci_qtd *) &hw->hw_qtd_next); } @@ -132,7 +132,7 @@ dbg_qh (const char *label, struct ehci_hcd *ehci, struct ehci_qh *qh) static void __maybe_unused dbg_itd (const char *label, struct ehci_hcd *ehci, struct ehci_itd *itd) { - ehci_dbg (ehci, "%s [%d] itd %p, next %08x, urb %p\n", + ehci_dbg (ehci, "%s [%d] itd %pK, next %08x, urb %pK\n", label, itd->frame, itd, hc32_to_cpu(ehci, itd->hw_next), itd->urb); ehci_dbg (ehci, @@ -163,7 +163,7 @@ dbg_itd (const char *label, struct ehci_hcd *ehci, struct ehci_itd *itd) static void __maybe_unused dbg_sitd (const char *label, struct ehci_hcd *ehci, struct ehci_sitd *sitd) { - ehci_dbg (ehci, "%s [%d] sitd %p, next %08x, urb %p\n", + ehci_dbg (ehci, "%s [%d] sitd %pK, next %08x, urb %pK\n", label, sitd->frame, sitd, hc32_to_cpu(ehci, sitd->hw_next), sitd->urb); ehci_dbg (ehci, @@ -429,7 +429,7 @@ static void qh_lines ( scratch = hc32_to_cpup(ehci, &hw->hw_info1); hw_curr = (mark == '*') ? hc32_to_cpup(ehci, &hw->hw_current) : 0; temp = scnprintf (next, size, - "qh/%p dev%d %cs ep%d %08x %08x (%08x%c %s nak%d)", + "qh/%pK dev%d %cs ep%d %08x %08x (%08x%c %s nak%d)", qh, scratch & 0x007f, speed_char (scratch), (scratch >> 8) & 0x000f, @@ -457,7 +457,7 @@ static void qh_lines ( mark = '/'; } temp = snprintf (next, size, - "\n\t%p%c%s len=%d %08x urb %p", + "\n\t%pK%c%s len=%d %08x urb %pK", td, mark, ({ char *tmp; switch ((scratch>>8)&0x03) { case 0: tmp = "out"; break; @@ -571,7 +571,7 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf) switch (hc32_to_cpu(ehci, tag)) { case Q_TYPE_QH: hw = p.qh->hw; - temp = scnprintf (next, size, " qh%d-%04x/%p", + temp = scnprintf (next, size, " qh%d-%04x/%pK", p.qh->period, hc32_to_cpup(ehci, &hw->hw_info2) @@ -632,20 +632,20 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf) break; case Q_TYPE_FSTN: temp = scnprintf (next, size, - " fstn-%8x/%p", p.fstn->hw_prev, + " fstn-%8x/%pK", p.fstn->hw_prev, p.fstn); tag = Q_NEXT_TYPE(ehci, p.fstn->hw_next); p = p.fstn->fstn_next; break; case Q_TYPE_ITD: temp = scnprintf (next, size, - " itd/%p", p.itd); + " itd/%pK", p.itd); tag = Q_NEXT_TYPE(ehci, p.itd->hw_next); p = p.itd->itd_next; break; case Q_TYPE_SITD: temp = scnprintf (next, size, - " sitd%d-%04x/%p", + " sitd%d-%04x/%pK", p.sitd->stream->interval, hc32_to_cpup(ehci, &p.sitd->hw_uframe) & 0x0000ffff, @@ -817,7 +817,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf) } if (!list_empty(&ehci->async_unlink)) { - temp = scnprintf(next, size, "async unlink qh %p\n", + temp = scnprintf(next, size, "async unlink qh %pK\n", list_first_entry(&ehci->async_unlink, struct ehci_qh, unlink_node)); size -= temp; diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index bfcf38383..b68f36628 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -144,7 +144,7 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver, struct ehci_hcd *ehci = hcd_to_ehci(hcd); hcd->phy = usb_get_phy(USB_PHY_TYPE_USB2); - dev_dbg(&pdev->dev, "hcd=0x%p ehci=0x%p, phy=0x%p\n", + dev_dbg(&pdev->dev, "hcd=0x%pK ehci=0x%pK, phy=0x%pK\n", hcd, ehci, hcd->phy); if (!IS_ERR_OR_NULL(hcd->phy)) { diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 5a1600631..6f82f0e43 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1003,7 +1003,7 @@ idle_timeout: /* caller was supposed to have unlinked any requests; * that's not our job. just leak this memory. */ - ehci_err (ehci, "qh %p (#%02x) state %d%s\n", + ehci_err (ehci, "qh %pK (#%02x) state %d%s\n", qh, ep->desc.bEndpointAddress, qh->qh_state, list_empty (&qh->qtd_list) ? "" : "(has tds)"); break; diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c index 402062973..52e711375 100644 --- a/drivers/usb/host/ehci-mv.c +++ b/drivers/usb/host/ehci-mv.c @@ -263,7 +263,7 @@ static int mv_ehci_probe(struct platform_device *pdev) pdata->private_init(ehci_mv->op_regs, ehci_mv->phy_regs); dev_info(&pdev->dev, - "successful find EHCI device with regs 0x%p irq %d" + "successful find EHCI device with regs 0x%pK irq %d" " working in %s mode\n", hcd->regs, hcd->irq, ehci_mv->mode == MV_USB_MODE_OTG ? "OTG" : "Host"); diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c index fd983771b..ffb3c15f9 100644 --- a/drivers/usb/host/ehci-ps3.c +++ b/drivers/usb/host/ehci-ps3.c @@ -216,7 +216,7 @@ static int ps3_ehci_remove(struct ps3_system_bus_device *dev) BUG_ON(!hcd); - dev_dbg(&dev->core, "%s:%d: regs %p\n", __func__, __LINE__, hcd->regs); + dev_dbg(&dev->core, "%s:%d: regs %pK\n", __func__, __LINE__, hcd->regs); dev_dbg(&dev->core, "%s:%d: irq %u\n", __func__, __LINE__, hcd->irq); tmp = hcd->irq; diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c index d34b399b7..c062f3858 100644 --- a/drivers/usb/host/ehci-q.c +++ b/drivers/usb/host/ehci-q.c @@ -273,7 +273,7 @@ __acquires(ehci->lock) #ifdef EHCI_URB_TRACE ehci_dbg (ehci, - "%s %s urb %p ep%d%s status %d len %d/%d\n", + "%s %s urb %pK ep%d%s status %d len %d/%d\n", __func__, urb->dev->devpath, urb, usb_pipeendpoint (urb->pipe), usb_pipein (urb->pipe) ? "in" : "out", @@ -362,7 +362,7 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh) /* Report Data Buffer Error: non-fatal but useful */ if (token & QTD_STS_DBE) ehci_dbg(ehci, - "detected DataBufferErr for urb %p ep%d%s len %d, qtd %p [qh %p]\n", + "detected DataBufferErr for urb %pK ep%d%s len %d, qtd %pK [qh %pK]\n", urb, usb_endpoint_num(&urb->ep->desc), usb_endpoint_dir_in(&urb->ep->desc) ? "in" : "out", @@ -919,7 +919,7 @@ qh_make ( } break; default: - ehci_dbg(ehci, "bogus dev %p speed %d\n", urb->dev, + ehci_dbg(ehci, "bogus dev %pK speed %d\n", urb->dev, urb->dev->speed); done: qh_destroy(ehci, qh); @@ -1107,7 +1107,7 @@ submit_async ( struct ehci_qtd *qtd; qtd = list_entry(qtd_list->next, struct ehci_qtd, qtd_list); ehci_dbg(ehci, - "%s %s urb %p ep%d%s len %d, qtd %p [qh %p]\n", + "%s %s urb %pK ep%d%s len %d, qtd %pK [qh %pK]\n", __func__, urb->dev->devpath, urb, epnum & 0x0f, (epnum & USB_DIR_IN) ? "in" : "out", urb->transfer_buffer_length, diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c index 8e3c878f3..48fc88126 100644 --- a/drivers/usb/host/ehci-sched.c +++ b/drivers/usb/host/ehci-sched.c @@ -492,7 +492,7 @@ static void qh_link_periodic(struct ehci_hcd *ehci, struct ehci_qh *qh) unsigned period = qh->period; dev_dbg (&qh->dev->dev, - "link qh%d-%04x/%p start %d [%d/%d us]\n", + "link qh%d-%04x/%pK start %d [%d/%d us]\n", period, hc32_to_cpup(ehci, &qh->hw->hw_info2) & (QH_CMASK | QH_SMASK), qh, qh->start, qh->usecs, qh->c_usecs); @@ -586,7 +586,7 @@ static void qh_unlink_periodic(struct ehci_hcd *ehci, struct ehci_qh *qh) : (qh->usecs * 8); dev_dbg (&qh->dev->dev, - "unlink qh%d-%04x/%p start %d [%d/%d us]\n", + "unlink qh%d-%04x/%pK start %d [%d/%d us]\n", qh->period, hc32_to_cpup(ehci, &qh->hw->hw_info2) & (QH_CMASK | QH_SMASK), qh, qh->start, qh->usecs, qh->c_usecs); @@ -658,7 +658,7 @@ static void end_unlink_intr(struct ehci_hcd *ehci, struct ehci_qh *qh) * FIXME kill the now-dysfunctional queued urbs */ else { - ehci_err(ehci, "can't reschedule qh %p, err %d\n", + ehci_err(ehci, "can't reschedule qh %pK, err %d\n", qh, rc); } } @@ -838,7 +838,7 @@ static int qh_schedule(struct ehci_hcd *ehci, struct ehci_qh *qh) : cpu_to_hc32(ehci, QH_SMASK); hw->hw_info2 |= c_mask; } else - ehci_dbg (ehci, "reused qh %p schedule\n", qh); + ehci_dbg (ehci, "reused qh %pK schedule\n", qh); done: return status; @@ -1382,7 +1382,7 @@ iso_stream_schedule ( /* Is the schedule already full? */ if (unlikely(start < period)) { - ehci_dbg(ehci, "iso sched full %p (%u-%u < %u mod %u)\n", + ehci_dbg(ehci, "iso sched full %pK (%u-%u < %u mod %u)\n", urb, stream->next_uframe, base, period, mod); status = -ENOSPC; @@ -1402,7 +1402,7 @@ iso_stream_schedule ( * no matter what. */ else if (start + span - period < now2) { - ehci_dbg(ehci, "iso underrun %p (%u+%u < %u)\n", + ehci_dbg(ehci, "iso underrun %pK (%u+%u < %u)\n", urb, start + base, span - period, now2 + base); } @@ -1448,7 +1448,7 @@ iso_stream_schedule ( /* no room in the schedule */ if (!done) { - ehci_dbg(ehci, "iso sched full %p", urb); + ehci_dbg(ehci, "iso sched full %pK", urb); status = -ENOSPC; goto fail; } @@ -1456,7 +1456,7 @@ iso_stream_schedule ( /* Tried to schedule too far into the future? */ if (unlikely(start - base + span - period >= mod)) { - ehci_dbg(ehci, "request %p would overflow (%u+%u >= %u)\n", + ehci_dbg(ehci, "request %pK would overflow (%u+%u >= %u)\n", urb, start - base, span - period, mod); status = -EFBIG; goto fail; @@ -1765,7 +1765,7 @@ static int itd_submit (struct ehci_hcd *ehci, struct urb *urb, #ifdef EHCI_URB_TRACE ehci_dbg (ehci, - "%s %s urb %p ep%d%s len %d, %d pkts %d uframes [%p]\n", + "%s %s urb %pK ep%d%s len %d, %d pkts %d uframes [%pK]\n", __func__, urb->dev->devpath, urb, usb_pipeendpoint (urb->pipe), usb_pipein (urb->pipe) ? "in" : "out", @@ -2153,7 +2153,7 @@ static int sitd_submit (struct ehci_hcd *ehci, struct urb *urb, #ifdef EHCI_URB_TRACE ehci_dbg (ehci, - "submit %p dev%s ep%d%s-iso len %d\n", + "submit %pK dev%s ep%d%s-iso len %d\n", urb, urb->dev->devpath, usb_pipeendpoint (urb->pipe), usb_pipein (urb->pipe) ? "in" : "out", @@ -2300,7 +2300,7 @@ restart: q = *q_p; break; default: - ehci_dbg(ehci, "corrupt type %d frame %d shadow %p\n", + ehci_dbg(ehci, "corrupt type %d frame %d shadow %pK\n", type, frame, q.ptr); // BUG (); /* FALL THROUGH */ diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c index 0b4654259..69426b3df 100644 --- a/drivers/usb/host/fhci-hcd.c +++ b/drivers/usb/host/fhci-hcd.c @@ -731,7 +731,7 @@ static int of_fhci_probe(struct platform_device *ofdev) goto err_clocks; } - dev_info(dev, "at 0x%p, irq %d\n", hcd->regs, usb_irq); + dev_info(dev, "at 0x%pK, irq %d\n", hcd->regs, usb_irq); fhci_config_transceiver(fhci, FHCI_PORT_POWER_OFF); diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c index 104730dab..b854bfa35 100644 --- a/drivers/usb/host/hwa-hc.c +++ b/drivers/usb/host/hwa-hc.c @@ -193,7 +193,7 @@ static int hwahc_op_get_frame_number(struct usb_hcd *usb_hcd) struct wusbhc *wusbhc = usb_hcd_to_wusbhc(usb_hcd); struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc); - dev_err(wusbhc->dev, "%s (%p [%p]) UNIMPLEMENTED\n", __func__, + dev_err(wusbhc->dev, "%s (%pK [%pK]) UNIMPLEMENTED\n", __func__, usb_hcd, hwahc); return -ENOSYS; } diff --git a/drivers/usb/host/imx21-dbg.c b/drivers/usb/host/imx21-dbg.c index ec98ecee3..81eb939de 100644 --- a/drivers/usb/host/imx21-dbg.c +++ b/drivers/usb/host/imx21-dbg.c @@ -170,7 +170,7 @@ static inline void debug_isoc_completed(struct imx21 *imx21, static char *format_ep(struct usb_host_endpoint *ep, char *buf, int bufsize) { if (ep) - snprintf(buf, bufsize, "ep_%02x (type:%02X kaddr:%p)", + snprintf(buf, bufsize, "ep_%02x (type:%02X kaddr:%pK)", ep->desc.bEndpointAddress, usb_endpoint_type(&ep->desc), ep); @@ -304,7 +304,7 @@ static int debug_etd_show(struct seq_file *s, void *v) "busy sw: %d\n" "busy hw: %d\n" "urb state: %d\n" - "current urb: %p\n", + "current urb: %pK\n", i, format_ep(etd->ep, buf, sizeof(buf)), diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c index f0ebe8e7c..007cb922a 100644 --- a/drivers/usb/host/imx21-hcd.c +++ b/drivers/usb/host/imx21-hcd.c @@ -461,7 +461,7 @@ static void free_epdmem(struct imx21 *imx21, struct usb_host_endpoint *ep) list_for_each_entry_safe(area, tmp, &imx21->dmem_list, list) { if (area->ep == ep) { dev_err(imx21->dev, - "Active DMEM %d for disabled ep=%p\n", + "Active DMEM %d for disabled ep=%pK\n", area->offset, ep); list_del(&area->list); kfree(area); @@ -522,7 +522,7 @@ __acquires(imx21->lock) struct urb_priv *urb_priv = urb->hcpriv; debug_urb_completed(imx21, urb, status); - dev_vdbg(imx21->dev, "urb %p done %d\n", urb, status); + dev_vdbg(imx21->dev, "urb %pK done %d\n", urb, status); kfree(urb_priv->isoc_td); kfree(urb->hcpriv); @@ -547,7 +547,7 @@ static void nonisoc_urb_completed_for_etd( struct urb *urb = list_first_entry( &ep->urb_list, struct urb, urb_list); - dev_vdbg(imx21->dev, "next URB %p\n", urb); + dev_vdbg(imx21->dev, "next URB %pK\n", urb); schedule_nonisoc_etd(imx21, urb); } } @@ -659,7 +659,7 @@ static void isoc_etd_done(struct usb_hcd *hcd, int etd_num) urb_priv->isoc_status = -EXDEV; dev_dbg(imx21->dev, "bad iso cc=0x%X frame=%d sched frame=%d " - "cnt=%d len=%d urb=%p etd=%d index=%d\n", + "cnt=%d len=%d urb=%pK etd=%d index=%d\n", cc, imx21_hc_get_frame(hcd), td->frame, bytes_xfrd, td->len, urb, etd_num, isoc_index); } @@ -885,7 +885,7 @@ static void dequeue_isoc_urb(struct imx21 *imx21, list_for_each_entry_safe(td, tmp, &ep_priv->td_list, list) { if (td->urb == urb) { - dev_vdbg(imx21->dev, "removing td %p\n", td); + dev_vdbg(imx21->dev, "removing td %pK\n", td); list_del(&td->list); } } @@ -1160,8 +1160,8 @@ static int imx21_hc_urb_enqueue(struct usb_hcd *hcd, unsigned long flags; dev_vdbg(imx21->dev, - "enqueue urb=%p ep=%p len=%d " - "buffer=%p dma=%08X setupBuf=%p setupDma=%08X\n", + "enqueue urb=%pK ep=%pK len=%d " + "buffer=%pK dma=%08X setupBuf=%pK setupDma=%08X\n", urb, ep, urb->transfer_buffer_length, urb->transfer_buffer, urb->transfer_dma, @@ -1210,7 +1210,7 @@ static int imx21_hc_urb_enqueue(struct usb_hcd *hcd, if (ep_priv->etd[0] < 0) { if (ep_priv->waiting_etd) { dev_dbg(imx21->dev, - "no ETD available already queued %p\n", + "no ETD available already queued %pK\n", ep_priv); debug_urb_queued_for_etd(imx21, urb); goto out; @@ -1218,7 +1218,7 @@ static int imx21_hc_urb_enqueue(struct usb_hcd *hcd, ep_priv->etd[0] = alloc_etd(imx21); if (ep_priv->etd[0] < 0) { dev_dbg(imx21->dev, - "no ETD available queueing %p\n", ep_priv); + "no ETD available queueing %pK\n", ep_priv); debug_urb_queued_for_etd(imx21, urb); list_add_tail(&ep_priv->queue, &imx21->queue_for_etd); ep_priv->waiting_etd = 1; @@ -1254,7 +1254,7 @@ static int imx21_hc_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, struct urb_priv *urb_priv = urb->hcpriv; int ret = -EINVAL; - dev_vdbg(imx21->dev, "dequeue urb=%p iso=%d status=%d\n", + dev_vdbg(imx21->dev, "dequeue urb=%pK iso=%d status=%d\n", urb, usb_pipeisoc(urb->pipe), status); spin_lock_irqsave(&imx21->lock, flags); @@ -1372,7 +1372,7 @@ static void process_etds(struct usb_hcd *hcd, struct imx21 *imx21, int sof) if (etd->ep == NULL || etd->urb == NULL) { dev_dbg(imx21->dev, "Interrupt for unexpected etd %d" - " ep=%p urb=%p\n", + " ep=%pK urb=%pK\n", etd_num, etd->ep, etd->urb); disactivate_etd(imx21, etd_num); continue; @@ -1425,7 +1425,7 @@ static void imx21_hc_endpoint_disable(struct usb_hcd *hcd, spin_lock_irqsave(&imx21->lock, flags); ep_priv = ep->hcpriv; - dev_vdbg(imx21->dev, "disable ep=%p, ep->hcpriv=%p\n", ep, ep_priv); + dev_vdbg(imx21->dev, "disable ep=%pK, ep->hcpriv=%pK\n", ep, ep_priv); if (!list_empty(&ep->urb_list)) dev_dbg(imx21->dev, "ep's URB list is not empty\n"); @@ -1445,7 +1445,7 @@ static void imx21_hc_endpoint_disable(struct usb_hcd *hcd, for (i = 0; i < USB_NUM_ETD; i++) { if (imx21->etd[i].alloc && imx21->etd[i].ep == ep) { dev_err(imx21->dev, - "Active etd %d for disabled ep=%p!\n", i, ep); + "Active etd %d for disabled ep=%pK!\n", i, ep); free_etd(imx21, i); } } diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index baf280793..859473a66 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c @@ -320,7 +320,7 @@ __releases(isp116x->lock) __acquires(isp116x->lock) } /* periodic deschedule */ - DBG("deschedule qh%d/%p branch %d\n", ep->period, ep, ep->branch); + DBG("deschedule qh%d/%pK branch %d\n", ep->period, ep, ep->branch); for (i = ep->branch; i < PERIODIC_SIZE; i += ep->period) { struct isp116x_ep *temp; struct isp116x_ep **prev = &isp116x->periodic[i]; @@ -791,7 +791,7 @@ static int isp116x_urb_enqueue(struct usb_hcd *hcd, /* sort each schedule branch by period (slow before fast) to share the faster parts of the tree without needing dummy/placeholder nodes */ - DBG("schedule qh%d/%p branch %d\n", ep->period, ep, ep->branch); + DBG("schedule qh%d/%pK branch %d\n", ep->period, ep, ep->branch); for (i = ep->branch; i < PERIODIC_SIZE; i += ep->period) { struct isp116x_ep **prev = &isp116x->periodic[i]; struct isp116x_ep *here = *prev; @@ -857,7 +857,7 @@ static int isp116x_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, for (ep_act = isp116x->atl_active; ep_act; ep_act = ep_act->active) if (ep_act == ep) { - VDBG("dequeue, urb %p active; wait for irq\n", + VDBG("dequeue, urb %pK active; wait for irq\n", urb); urb = NULL; break; @@ -883,7 +883,7 @@ static void isp116x_endpoint_disable(struct usb_hcd *hcd, for (i = 0; i < 100 && !list_empty(&hep->urb_list); i++) msleep(3); if (!list_empty(&hep->urb_list)) - WARNING("ep %p not empty?\n", ep); + WARNING("ep %pK not empty?\n", ep); kfree(ep); hep->hcpriv = NULL; diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c index b04e8ece4..5f93b7e23 100644 --- a/drivers/usb/host/isp1362-hcd.c +++ b/drivers/usb/host/isp1362-hcd.c @@ -229,7 +229,7 @@ static inline void release_ptd_buffers(struct isp1362_ep_queue *epq, struct isp1 int last = ep->ptd_index + ep->num_ptds; if (last > epq->buf_count) - pr_err("%s: ep %p req %d len %d %s PTD[%d] $%04x num_ptds %d buf_count %d buf_avail %d buf_map %08lx skip_map %08lx\n", + pr_err("%s: ep %pK req %d len %d %s PTD[%d] $%04x num_ptds %d buf_count %d buf_avail %d buf_map %08lx skip_map %08lx\n", __func__, ep, ep->num_req, ep->length, epq->name, ep->ptd_index, ep->ptd_offset, ep->num_ptds, epq->buf_count, epq->buf_avail, epq->buf_map, epq->skip_map); @@ -269,7 +269,7 @@ static void prepare_ptd(struct isp1362_hcd *isp1362_hcd, struct urb *urb, u16 len; size_t buf_len = urb->transfer_buffer_length - urb->actual_length; - DBG(3, "%s: %s ep %p\n", __func__, epq->name, ep); + DBG(3, "%s: %s ep %pK\n", __func__, epq->name, ep); ptd = &ep->ptd; @@ -372,7 +372,7 @@ static void isp1362_read_ptd(struct isp1362_hcd *isp1362_hcd, struct isp1362_ep BUG_ON(ep->ptd_offset < 0); list_del_init(&ep->active); - DBG(1, "%s: ep %p removed from active list %p\n", __func__, ep, &epq->active); + DBG(1, "%s: ep %pK removed from active list %pK\n", __func__, ep, &epq->active); prefetchw(ptd); isp1362_read_buffer(isp1362_hcd, ptd, ep->ptd_offset, PTD_HEADER_SIZE); @@ -381,7 +381,7 @@ static void isp1362_read_ptd(struct isp1362_hcd *isp1362_hcd, struct isp1362_ep if (PTD_GET_DIR(ptd) != PTD_DIR_IN || act_len == 0) return; if (act_len > ep->length) - pr_err("%s: ep %p PTD $%04x act_len %d ep->length %d\n", __func__, ep, + pr_err("%s: ep %pK PTD $%04x act_len %d ep->length %d\n", __func__, ep, ep->ptd_offset, act_len, ep->length); BUG_ON(act_len > ep->length); /* Only transfer the amount of data that has actually been overwritten @@ -405,7 +405,7 @@ static void remove_ptd(struct isp1362_hcd *isp1362_hcd, struct isp1362_ep *ep) int index; struct isp1362_ep_queue *epq; - DBG(1, "%s: ep %p PTD[%d] $%04x\n", __func__, ep, ep->ptd_index, ep->ptd_offset); + DBG(1, "%s: ep %pK PTD[%d] $%04x\n", __func__, ep, ep->ptd_index, ep->ptd_offset); BUG_ON(ep->ptd_offset < 0); epq = get_ptd_queue(isp1362_hcd, ep->ptd_offset); @@ -488,7 +488,7 @@ static void finish_request(struct isp1362_hcd *isp1362_hcd, struct isp1362_ep *e if (ep->interval) { /* periodic deschedule */ - DBG(1, "deschedule qh%d/%p branch %d load %d bandwidth %d -> %d\n", ep->interval, + DBG(1, "deschedule qh%d/%pK branch %d load %d bandwidth %d -> %d\n", ep->interval, ep, ep->branch, ep->load, isp1362_hcd->load[ep->branch], isp1362_hcd->load[ep->branch] - ep->load); @@ -510,13 +510,13 @@ static void postproc_ep(struct isp1362_hcd *isp1362_hcd, struct isp1362_ep *ep) int urbstat = -EINPROGRESS; u8 cc; - DBG(2, "%s: ep %p req %d\n", __func__, ep, ep->num_req); + DBG(2, "%s: ep %pK req %d\n", __func__, ep, ep->num_req); udev = urb->dev; ptd = &ep->ptd; cc = PTD_GET_CC(ptd); if (cc == PTD_NOTACCESSED) { - pr_err("%s: req %d PTD %p Untouched by ISP1362\n", __func__, + pr_err("%s: req %d PTD %pK Untouched by ISP1362\n", __func__, ep->num_req, ptd); cc = PTD_DEVNOTRESP; } @@ -648,7 +648,7 @@ static void postproc_ep(struct isp1362_hcd *isp1362_hcd, struct isp1362_ep *ep) out: if (urbstat != -EINPROGRESS) { - DBG(2, "%s: Finishing ep %p req %d urb %p status %d\n", __func__, + DBG(2, "%s: Finishing ep %pK req %d urb %pK status %d\n", __func__, ep, ep->num_req, urb, urbstat); finish_request(isp1362_hcd, ep, urb, urbstat); } @@ -673,17 +673,17 @@ static void finish_unlinks(struct isp1362_hcd *isp1362_hcd) if (!list_empty(&ep->hep->urb_list)) { struct urb *urb = get_urb(ep); - DBG(1, "%s: Finishing req %d ep %p from remove_list\n", __func__, + DBG(1, "%s: Finishing req %d ep %pK from remove_list\n", __func__, ep->num_req, ep); finish_request(isp1362_hcd, ep, urb, -ESHUTDOWN); } WARN_ON(list_empty(&ep->active)); if (!list_empty(&ep->active)) { list_del_init(&ep->active); - DBG(1, "%s: ep %p removed from active list\n", __func__, ep); + DBG(1, "%s: ep %pK removed from active list\n", __func__, ep); } list_del_init(&ep->remove_list); - DBG(1, "%s: ep %p removed from remove_list\n", __func__, ep); + DBG(1, "%s: ep %pK removed from remove_list\n", __func__, ep); } DBG(1, "%s: Done\n", __func__); } @@ -733,9 +733,9 @@ static int submit_req(struct isp1362_hcd *isp1362_hcd, struct urb *urb, } else BUG_ON(index < 0); list_add_tail(&ep->active, &epq->active); - DBG(1, "%s: ep %p req %d len %d added to active list %p\n", __func__, + DBG(1, "%s: ep %pK req %d len %d added to active list %pK\n", __func__, ep, ep->num_req, ep->length, &epq->active); - DBG(1, "%s: Submitting %s PTD $%04x for ep %p req %d\n", __func__, epq->name, + DBG(1, "%s: Submitting %s PTD $%04x for ep %pK req %d\n", __func__, epq->name, ep->ptd_offset, ep, ep->num_req); isp1362_write_ptd(isp1362_hcd, ep, epq); __clear_bit(ep->ptd_index, &epq->skip_map); @@ -760,11 +760,11 @@ static void start_atl_transfers(struct isp1362_hcd *isp1362_hcd) int ret; if (!list_empty(&ep->active)) { - DBG(2, "%s: Skipping active %s ep %p\n", __func__, epq->name, ep); + DBG(2, "%s: Skipping active %s ep %pK\n", __func__, epq->name, ep); continue; } - DBG(1, "%s: Processing %s ep %p req %d\n", __func__, epq->name, + DBG(1, "%s: Processing %s ep %pK req %d\n", __func__, epq->name, ep, ep->num_req); ret = submit_req(isp1362_hcd, urb, ep, epq); @@ -812,12 +812,12 @@ static void start_intl_transfers(struct isp1362_hcd *isp1362_hcd) int ret; if (!list_empty(&ep->active)) { - DBG(1, "%s: Skipping active %s ep %p\n", __func__, + DBG(1, "%s: Skipping active %s ep %pK\n", __func__, epq->name, ep); continue; } - DBG(1, "%s: Processing %s ep %p req %d\n", __func__, + DBG(1, "%s: Processing %s ep %pK req %d\n", __func__, epq->name, ep, ep->num_req); ret = submit_req(isp1362_hcd, urb, ep, epq); if (ret == -ENOMEM) @@ -882,7 +882,7 @@ static void start_iso_transfers(struct isp1362_hcd *isp1362_hcd) struct urb *urb = get_urb(ep); s16 diff = fno - (u16)urb->start_frame; - DBG(1, "%s: Processing %s ep %p\n", __func__, epq->name, ep); + DBG(1, "%s: Processing %s ep %pK\n", __func__, epq->name, ep); if (diff > urb->number_of_packets) { /* time frame for this URB has elapsed */ @@ -965,13 +965,13 @@ static void finish_transfers(struct isp1362_hcd *isp1362_hcd, unsigned long done BUG_ON(ep->num_ptds == 0); release_ptd_buffers(epq, ep); - DBG(1, "%s: ep %p req %d removed from active list\n", __func__, + DBG(1, "%s: ep %pK req %d removed from active list\n", __func__, ep, ep->num_req); if (!list_empty(&ep->remove_list)) { list_del_init(&ep->remove_list); - DBG(1, "%s: ep %p removed from remove list\n", __func__, ep); + DBG(1, "%s: ep %pK removed from remove list\n", __func__, ep); } - DBG(1, "%s: Postprocessing %s ep %p req %d\n", __func__, epq->name, + DBG(1, "%s: Postprocessing %s ep %pK req %d\n", __func__, epq->name, ep, ep->num_req); postproc_ep(isp1362_hcd, ep); } @@ -1001,7 +1001,7 @@ static void finish_iso_transfers(struct isp1362_hcd *isp1362_hcd, struct isp1362 DBG(1, "%s: Checking PTD $%04x\n", __func__, ep->ptd_offset); isp1362_read_ptd(isp1362_hcd, ep, epq); - DBG(1, "%s: Postprocessing %s ep %p\n", __func__, epq->name, ep); + DBG(1, "%s: Postprocessing %s ep %pK\n", __func__, epq->name, ep); postproc_ep(isp1362_hcd, ep); } WARN_ON(epq->blk_size != 0); @@ -1232,7 +1232,7 @@ static int isp1362_urb_enqueue(struct usb_hcd *hcd, unsigned long flags; int retval = 0; - DBG(3, "%s: urb %p\n", __func__, urb); + DBG(3, "%s: urb %pK\n", __func__, urb); if (type == PIPE_ISOCHRONOUS) { pr_err("Isochronous transfers not supported\n"); @@ -1316,7 +1316,7 @@ static int isp1362_urb_enqueue(struct usb_hcd *hcd, case PIPE_CONTROL: case PIPE_BULK: if (list_empty(&ep->schedule)) { - DBG(1, "%s: Adding ep %p req %d to async schedule\n", + DBG(1, "%s: Adding ep %pK req %d to async schedule\n", __func__, ep, ep->num_req); list_add_tail(&ep->schedule, &isp1362_hcd->async); } @@ -1354,14 +1354,14 @@ static int isp1362_urb_enqueue(struct usb_hcd *hcd, frame += ep->interval; urb->start_frame = frame; - DBG(1, "%s: Adding ep %p to isoc schedule\n", __func__, ep); + DBG(1, "%s: Adding ep %pK to isoc schedule\n", __func__, ep); list_add_tail(&ep->schedule, &isp1362_hcd->isoc); } else { - DBG(1, "%s: Adding ep %p to periodic schedule\n", __func__, ep); + DBG(1, "%s: Adding ep %pK to periodic schedule\n", __func__, ep); list_add_tail(&ep->schedule, &isp1362_hcd->periodic); } } else - DBG(1, "%s: ep %p already scheduled\n", __func__, ep); + DBG(1, "%s: ep %pK already scheduled\n", __func__, ep); DBG(2, "%s: load %d bandwidth %d -> %d\n", __func__, ep->load / ep->interval, isp1362_hcd->load[ep->branch], @@ -1394,7 +1394,7 @@ static int isp1362_urb_enqueue(struct usb_hcd *hcd, fail_not_linked: spin_unlock_irqrestore(&isp1362_hcd->lock, flags); if (retval) - DBG(0, "%s: urb %p failed with %d\n", __func__, urb, retval); + DBG(0, "%s: urb %pK failed with %d\n", __func__, urb, retval); return retval; } @@ -1406,7 +1406,7 @@ static int isp1362_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) struct isp1362_ep *ep; int retval = 0; - DBG(3, "%s: urb %p\n", __func__, urb); + DBG(3, "%s: urb %pK\n", __func__, urb); spin_lock_irqsave(&isp1362_hcd->lock, flags); retval = usb_hcd_check_unlink_urb(hcd, urb, status); @@ -1425,7 +1425,7 @@ static int isp1362_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) /* In front of queue? */ if (ep->hep->urb_list.next == &urb->urb_list) { if (!list_empty(&ep->active)) { - DBG(1, "%s: urb %p ep %p req %d active PTD[%d] $%04x\n", __func__, + DBG(1, "%s: urb %pK ep %pK req %d active PTD[%d] $%04x\n", __func__, urb, ep, ep->num_req, ep->ptd_index, ep->ptd_offset); /* disable processing and queue PTD for removal */ remove_ptd(isp1362_hcd, ep); @@ -1433,13 +1433,13 @@ static int isp1362_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) } } if (urb) { - DBG(1, "%s: Finishing ep %p req %d\n", __func__, ep, + DBG(1, "%s: Finishing ep %pK req %d\n", __func__, ep, ep->num_req); finish_request(isp1362_hcd, ep, urb, status); } else - DBG(1, "%s: urb %p active; wait4irq\n", __func__, urb); + DBG(1, "%s: urb %pK active; wait4irq\n", __func__, urb); } else { - pr_warning("%s: No EP in URB %p\n", __func__, urb); + pr_warning("%s: No EP in URB %pK\n", __func__, urb); retval = -EINVAL; } done: @@ -1456,13 +1456,13 @@ static void isp1362_endpoint_disable(struct usb_hcd *hcd, struct usb_host_endpoi struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd); unsigned long flags; - DBG(1, "%s: ep %p\n", __func__, ep); + DBG(1, "%s: ep %pK\n", __func__, ep); if (!ep) return; spin_lock_irqsave(&isp1362_hcd->lock, flags); if (!list_empty(&hep->urb_list)) { if (!list_empty(&ep->active) && list_empty(&ep->remove_list)) { - DBG(1, "%s: Removing ep %p req %d PTD[%d] $%04x\n", __func__, + DBG(1, "%s: Removing ep %pK req %d PTD[%d] $%04x\n", __func__, ep, ep->num_req, ep->ptd_index, ep->ptd_offset); remove_ptd(isp1362_hcd, ep); pr_info("%s: Waiting for Interrupt to clean up\n", __func__); @@ -1473,7 +1473,7 @@ static void isp1362_endpoint_disable(struct usb_hcd *hcd, struct usb_host_endpoi while (!list_empty(&ep->active)) msleep(1); - DBG(1, "%s: Freeing EP %p\n", __func__, ep); + DBG(1, "%s: Freeing EP %pK\n", __func__, ep); usb_put_dev(ep->udev); kfree(ep); @@ -2108,7 +2108,7 @@ static int proc_isp1362_show(struct seq_file *s, void *unused) list_for_each_entry(ep, &isp1362_hcd->async, schedule) { struct urb *urb; - seq_printf(s, "%p, ep%d%s, maxpacket %d:\n", ep, ep->epnum, + seq_printf(s, "%pK, ep%d%s, maxpacket %d:\n", ep, ep->epnum, ({ char *s; switch (ep->nextpid) { @@ -2130,7 +2130,7 @@ static int proc_isp1362_show(struct seq_file *s, void *unused) }; s;}), ep->maxpacket) ; list_for_each_entry(urb, &ep->hep->urb_list, urb_list) { - seq_printf(s, " urb%p, %d/%d\n", urb, + seq_printf(s, " urb%pK, %d/%d\n", urb, urb->actual_length, urb->transfer_buffer_length); } @@ -2145,7 +2145,7 @@ static int proc_isp1362_show(struct seq_file *s, void *unused) seq_printf(s, "branch:%2d load:%3d PTD[%d] $%04x:\n", ep->branch, isp1362_hcd->load[ep->branch], ep->ptd_index, ep->ptd_offset); - seq_printf(s, " %d/%p (%sdev%d ep%d%s max %d)\n", + seq_printf(s, " %d/%pK (%sdev%d ep%d%s max %d)\n", ep->interval, ep, (ep->udev->speed == USB_SPEED_FULL) ? "" : "ls ", ep->udev->devnum, ep->epnum, @@ -2158,7 +2158,7 @@ static int proc_isp1362_show(struct seq_file *s, void *unused) seq_printf(s, "ISO:\n"); list_for_each_entry(ep, &isp1362_hcd->isoc, schedule) { - seq_printf(s, " %d/%p (%sdev%d ep%d%s max %d)\n", + seq_printf(s, " %d/%pK (%sdev%d ep%d%s max %d)\n", ep->interval, ep, (ep->udev->speed == USB_SPEED_FULL) ? "" : "ls ", ep->udev->devnum, ep->epnum, @@ -2652,11 +2652,11 @@ static int isp1362_remove(struct platform_device *pdev) DBG(0, "%s: Removing HCD\n", __func__); usb_remove_hcd(hcd); - DBG(0, "%s: Unmapping data_reg @ %p\n", __func__, + DBG(0, "%s: Unmapping data_reg @ %pK\n", __func__, isp1362_hcd->data_reg); iounmap(isp1362_hcd->data_reg); - DBG(0, "%s: Unmapping addr_reg @ %p\n", __func__, + DBG(0, "%s: Unmapping addr_reg @ %pK\n", __func__, isp1362_hcd->addr_reg); iounmap(isp1362_hcd->addr_reg); @@ -2782,16 +2782,16 @@ static int isp1362_probe(struct platform_device *pdev) return 0; err6: - DBG(0, "%s: Freeing dev %p\n", __func__, isp1362_hcd); + DBG(0, "%s: Freeing dev %pK\n", __func__, isp1362_hcd); usb_put_hcd(hcd); err5: - DBG(0, "%s: Unmapping data_reg @ %p\n", __func__, data_reg); + DBG(0, "%s: Unmapping data_reg @ %pK\n", __func__, data_reg); iounmap(data_reg); err4: DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)data->start); release_mem_region(data->start, resource_size(data)); err3: - DBG(0, "%s: Unmapping addr_reg @ %p\n", __func__, addr_reg); + DBG(0, "%s: Unmapping addr_reg @ %pK\n", __func__, addr_reg); iounmap(addr_reg); err2: DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)addr->start); diff --git a/drivers/usb/host/isp1362.h b/drivers/usb/host/isp1362.h index 0f97820e6..7c15eb581 100644 --- a/drivers/usb/host/isp1362.h +++ b/drivers/usb/host/isp1362.h @@ -715,7 +715,7 @@ static void isp1362_read_fifo(struct isp1362_hcd *isp1362_hcd, void *buf, u16 le _BUG_ON(!irqs_disabled()); - RDBG("%s: Reading %d byte from fifo to mem @ %p\n", __func__, len, buf); + RDBG("%s: Reading %d byte from fifo to mem @ %pK\n", __func__, len, buf); #if USE_32BIT if (len >= 4) { RDBG("%s: Using readsl for %d dwords\n", __func__, len >> 2); @@ -762,7 +762,7 @@ static void isp1362_write_fifo(struct isp1362_hcd *isp1362_hcd, void *buf, u16 l _BUG_ON(!irqs_disabled()); - RDBG("%s: Writing %d byte to fifo from memory @%p\n", __func__, len, buf); + RDBG("%s: Writing %d byte to fifo from memory @%pK\n", __func__, len, buf); #if USE_32BIT if (len >= 4) { RDBG("%s: Using writesl for %d dwords\n", __func__, len >> 2); @@ -940,7 +940,7 @@ static void isp1362_read_buffer(struct isp1362_hcd *isp1362_hcd, void *buf, u16 isp1362_write_diraddr(isp1362_hcd, offset, len); - DBG(3, "%s: Reading %d byte from buffer @%04x to memory @ %p\n", + DBG(3, "%s: Reading %d byte from buffer @%04x to memory @ %pK\n", __func__, len, offset, buf); isp1362_write_reg16(isp1362_hcd, HCuPINT, HCuPINT_EOT); @@ -960,7 +960,7 @@ static void isp1362_write_buffer(struct isp1362_hcd *isp1362_hcd, void *buf, u16 isp1362_write_diraddr(isp1362_hcd, offset, len); - DBG(3, "%s: Writing %d byte to buffer @%04x from memory @ %p\n", + DBG(3, "%s: Writing %d byte to buffer @%04x from memory @ %pK\n", __func__, len, offset, buf); isp1362_write_reg16(isp1362_hcd, HCuPINT, HCuPINT_EOT); @@ -1006,7 +1006,7 @@ static void __attribute__((unused)) dump_data(char *buf, int len) static void dump_ptd(struct ptd *ptd) { - DBG(0, "EP %p: CC=%x EP=%d DIR=%x CNT=%d LEN=%d MPS=%d TGL=%x ACT=%x FA=%d SPD=%x SF=%x PR=%x LST=%x\n", + DBG(0, "EP %pK: CC=%x EP=%d DIR=%x CNT=%d LEN=%d MPS=%d TGL=%x ACT=%x FA=%d SPD=%x SF=%x PR=%x LST=%x\n", container_of(ptd, struct isp1362_ep, ptd), PTD_GET_CC(ptd), PTD_GET_EP(ptd), PTD_GET_DIR(ptd), PTD_GET_COUNT(ptd), PTD_GET_LEN(ptd), PTD_GET_MPS(ptd), diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 2ee1496db..81319ba54 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -307,7 +307,7 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, u32 *data = (u32 *)buf; dev_dbg(hcd->self.controller, - "ohci_at91_hub_control(%p,0x%04x,0x%04x,0x%04x,%p,%04x)\n", + "ohci_at91_hub_control(%pK,0x%04x,0x%04x,0x%04x,%pK,%04x)\n", hcd, typeReq, wValue, wIndex, buf, wLength); wIndex--; diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c index 31b81f9ea..6afc716cf 100644 --- a/drivers/usb/host/ohci-dbg.c +++ b/drivers/usb/host/ohci-dbg.c @@ -36,7 +36,7 @@ urb_print(struct urb * urb, char * str, int small, int status) #ifndef OHCI_VERBOSE_DEBUG if (status != 0) #endif - printk(KERN_DEBUG "%s %p dev=%d ep=%d%s-%s flags=%x len=%d/%d stat=%d\n", + printk(KERN_DEBUG "%s %pK dev=%d ep=%d%s-%s flags=%x len=%d/%d stat=%d\n", str, urb, usb_pipedevice (pipe), @@ -309,7 +309,7 @@ static void ohci_dump_td (const struct ohci_hcd *ohci, const char *label, { u32 tmp = hc32_to_cpup (ohci, &td->hwINFO); - ohci_dbg (ohci, "%s td %p%s; urb %p index %d; hw next td %08x\n", + ohci_dbg (ohci, "%s td %pK%s; urb %pK index %d; hw next td %08x\n", label, td, (tmp & TD_DONE) ? " (DONE)" : "", td->urb, td->index, @@ -367,7 +367,7 @@ ohci_dump_ed (const struct ohci_hcd *ohci, const char *label, u32 tmp = hc32_to_cpu (ohci, ed->hwINFO); char *type = ""; - ohci_dbg (ohci, "%s, ed %p state 0x%x type %s; next ed %08x\n", + ohci_dbg (ohci, "%s, ed %pK state 0x%x type %s; next ed %08x\n", label, ed, ed->state, edstring (ed->type), hc32_to_cpup (ohci, &ed->hwNextED)); @@ -482,7 +482,7 @@ show_list (struct ohci_hcd *ohci, char *buf, size_t count, struct ed *ed) struct td *td; temp = scnprintf (buf, size, - "ed/%p %cs dev%d ep%d%s max %d %08x%s%s %s", + "ed/%pK %cs dev%d ep%d%s max %d %08x%s%s %s", ed, (info & ED_LOWSPEED) ? 'l' : 'f', info & 0x7f, @@ -504,7 +504,7 @@ show_list (struct ohci_hcd *ohci, char *buf, size_t count, struct ed *ed) cbp = hc32_to_cpup (ohci, &td->hwCBP); be = hc32_to_cpup (ohci, &td->hwBE); temp = scnprintf (buf, size, - "\n\ttd %p %s %d cc=%x urb %p (%08x)", + "\n\ttd %pK %s %d cc=%x urb %pK (%08x)", td, ({ char *pid; switch (info & TD_DP) { @@ -580,7 +580,7 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf) next += temp; do { - temp = scnprintf (next, size, " ed%d/%p", + temp = scnprintf (next, size, " ed%d/%pK", ed->interval, ed); size -= temp; next += temp; diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c index b0b542c14..5e4aeae8f 100644 --- a/drivers/usb/host/ohci-exynos.c +++ b/drivers/usb/host/ohci-exynos.c @@ -57,7 +57,7 @@ static int ohci_exynos_start(struct usb_hcd *hcd) struct ohci_hcd *ohci = hcd_to_ohci(hcd); int ret; - ohci_dbg(ohci, "ohci_exynos_start, ohci:%p", ohci); + ohci_dbg(ohci, "ohci_exynos_start, ohci:%pK", ohci); ret = ohci_run(ohci); if (ret < 0) { diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 865946cde..fe1fcc6ff 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -388,7 +388,7 @@ sanitize: /* caller was supposed to have unlinked any requests; * that's not our job. can't recover; must leak ed. */ - ohci_err (ohci, "leak ed %p (#%02x) state %d%s\n", + ohci_err (ohci, "leak ed %pK (#%02x) state %d%s\n", ed, ep->desc.bEndpointAddress, ed->state, list_empty (&ed->td_list) ? "" : " (has tds)"); td_free (ohci, ed->dummy); @@ -882,7 +882,7 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd) ed->td_list.next, struct td, td_list); ohci_warn(ohci, - "Reclaiming orphan TD %p\n", + "Reclaiming orphan TD %pK\n", td); takeback_td(ohci, td); ohci->ed_to_check = NULL; @@ -984,7 +984,7 @@ static int ohci_restart (struct ohci_hcd *ohci) case ED_UNLINK: break; default: - ohci_dbg(ohci, "bogus ed %p state %d\n", + ohci_dbg(ohci, "bogus ed %pK state %d\n", ed, ed->state); } diff --git a/drivers/usb/host/ohci-mem.c b/drivers/usb/host/ohci-mem.c index 2f20d3dc8..21d8d36c6 100644 --- a/drivers/usb/host/ohci-mem.c +++ b/drivers/usb/host/ohci-mem.c @@ -108,7 +108,7 @@ td_free (struct ohci_hcd *hc, struct td *td) if (*prev) *prev = td->td_hash; else if ((td->hwINFO & cpu_to_hc32(hc, TD_DONE)) != 0) - ohci_dbg (hc, "no hash for td %p\n", td); + ohci_dbg (hc, "no hash for td %pK\n", td); dma_pool_free (hc->td_cache, td, td->td_dma); } diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c index 5d7eb72c5..44ea2c1fe 100644 --- a/drivers/usb/host/ohci-nxp.c +++ b/drivers/usb/host/ohci-nxp.c @@ -318,7 +318,7 @@ static int usb_hcd_nxp_probe(struct platform_device *pdev) ohci = hcd_to_ohci(hcd); ohci_hcd_init(ohci); - dev_info(&pdev->dev, "at 0x%p, irq %d\n", hcd->regs, hcd->irq); + dev_info(&pdev->dev, "at 0x%pK, irq %d\n", hcd->regs, hcd->irq); ret = usb_add_hcd(hcd, irq, 0); if (ret == 0) return ret; diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c index 7d35cd9e2..de7c1cfa5 100644 --- a/drivers/usb/host/ohci-ps3.c +++ b/drivers/usb/host/ohci-ps3.c @@ -200,7 +200,7 @@ static int ps3_ohci_remove(struct ps3_system_bus_device *dev) BUG_ON(!hcd); - dev_dbg(&dev->core, "%s:%d: regs %p\n", __func__, __LINE__, hcd->regs); + dev_dbg(&dev->core, "%s:%d: regs %pK\n", __func__, __LINE__, hcd->regs); dev_dbg(&dev->core, "%s:%d: irq %u\n", __func__, __LINE__, hcd->irq); tmp = hcd->irq; diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index 279b2ef17..da01b9902 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c @@ -477,7 +477,7 @@ ohci_pxa27x_start (struct usb_hcd *hcd) struct ohci_hcd *ohci = hcd_to_ohci (hcd); int ret; - ohci_dbg (ohci, "ohci_pxa27x_start, ohci:%p", ohci); + ohci_dbg (ohci, "ohci_pxa27x_start, ohci:%pK", ohci); /* The value of NDP in roothub_a is incorrect on this hardware */ ohci->num_ports = 3; diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c index 7f93dc26f..4181b6a3c 100644 --- a/drivers/usb/host/ohci-q.c +++ b/drivers/usb/host/ohci-q.c @@ -146,7 +146,7 @@ static void periodic_link (struct ohci_hcd *ohci, struct ed *ed) { unsigned i; - ohci_vdbg (ohci, "link %sed %p branch %d [%dus.], interval %d\n", + ohci_vdbg (ohci, "link %sed %pK branch %d [%dus.], interval %d\n", (ed->hwINFO & cpu_to_hc32 (ohci, ED_ISO)) ? "iso " : "", ed, ed->branch, ed->load, ed->interval); @@ -293,7 +293,7 @@ static void periodic_unlink (struct ohci_hcd *ohci, struct ed *ed) } ohci_to_hcd(ohci)->self.bandwidth_allocated -= ed->load / ed->interval; - ohci_vdbg (ohci, "unlink %sed %p branch %d [%dus.], interval %d\n", + ohci_vdbg (ohci, "unlink %sed %pK branch %d [%dus.], interval %d\n", (ed->hwINFO & cpu_to_hc32 (ohci, ED_ISO)) ? "iso " : "", ed, ed->branch, ed->load, ed->interval); } @@ -763,7 +763,7 @@ static int td_done(struct ohci_hcd *ohci, struct urb *urb, struct td *td) if (cc != TD_CC_NOERROR) ohci_vdbg (ohci, - "urb %p iso td %p (%d) len %d cc %d\n", + "urb %pK iso td %pK (%d) len %d cc %d\n", urb, td, 1 + td->index, dlen, cc); /* BULK, INT, CONTROL ... drivers see aggregate length/status, @@ -795,7 +795,7 @@ static int td_done(struct ohci_hcd *ohci, struct urb *urb, struct td *td) if (cc != TD_CC_NOERROR && cc < 0x0E) ohci_vdbg (ohci, - "urb %p td %p (%d) cc %d, len=%d/%d\n", + "urb %pK td %pK (%d) cc %d, len=%d/%d\n", urb, td, 1 + td->index, cc, urb->actual_length, urb->transfer_buffer_length); @@ -861,7 +861,7 @@ static void ed_halted(struct ohci_hcd *ohci, struct td *td, int cc) /* fallthrough */ default: ohci_dbg (ohci, - "urb %p path %s ep%d%s %08x cc %d --> status %d\n", + "urb %pK path %s ep%d%s %08x cc %d --> status %d\n", urb, urb->dev->devpath, usb_pipeendpoint (urb->pipe), usb_pipein (urb->pipe) ? "in" : "out", diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index e125770b8..5cd1ab077 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c @@ -157,7 +157,7 @@ static int ohci_s3c2410_hub_control( u32 *data = (u32 *)buf; dev_dbg(hcd->self.controller, - "s3c2410_hub_control(%p,0x%04x,0x%04x,0x%04x,%p,%04x)\n", + "s3c2410_hub_control(%pK,0x%04x,0x%04x,0x%04x,%pK,%04x)\n", hcd, typeReq, wValue, wIndex, buf, wLength); /* if we are only an humble host without any special capabilities diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c index b5c4f4d81..3b4e297ac 100644 --- a/drivers/usb/host/oxu210hp-hcd.c +++ b/drivers/usb/host/oxu210hp-hcd.c @@ -950,7 +950,7 @@ __acquires(oxu->lock) } #ifdef OXU_URB_TRACE - oxu_dbg(oxu, "%s %s urb %p ep%d%s status %d len %d/%d\n", + oxu_dbg(oxu, "%s %s urb %pK ep%d%s status %d len %d/%d\n", __func__, urb->dev->devpath, urb, usb_pipeendpoint(urb->pipe), usb_pipein(urb->pipe) ? "in" : "out", @@ -1471,7 +1471,7 @@ static struct ehci_qh *qh_make(struct oxu_hcd *oxu, } break; default: - oxu_dbg(oxu, "bogus dev %p speed %d\n", urb->dev, urb->dev->speed); + oxu_dbg(oxu, "bogus dev %pK speed %d\n", urb->dev, urb->dev->speed); done: qh_put(qh); return NULL; @@ -1624,7 +1624,7 @@ static int submit_async(struct oxu_hcd *oxu, struct urb *urb, epnum = urb->ep->desc.bEndpointAddress; #ifdef OXU_URB_TRACE - oxu_dbg(oxu, "%s %s urb %p ep%d%s len %d, qtd %p [qh %p]\n", + oxu_dbg(oxu, "%s %s urb %pK ep%d%s len %d, qtd %pK [qh %pK]\n", __func__, urb->dev->devpath, urb, epnum & 0x0f, (epnum & USB_DIR_IN) ? "in" : "out", urb->transfer_buffer_length, @@ -1933,7 +1933,7 @@ static int qh_link_periodic(struct oxu_hcd *oxu, struct ehci_qh *qh) unsigned period = qh->period; dev_dbg(&qh->dev->dev, - "link qh%d-%04x/%p start %d [%d/%d us]\n", + "link qh%d-%04x/%pK start %d [%d/%d us]\n", period, le32_to_cpup(&qh->hw_info2) & (QH_CMASK | QH_SMASK), qh, qh->start, qh->usecs, qh->c_usecs); @@ -2019,7 +2019,7 @@ static void qh_unlink_periodic(struct oxu_hcd *oxu, struct ehci_qh *qh) : (qh->usecs * 8); dev_dbg(&qh->dev->dev, - "unlink qh%d-%04x/%p start %d [%d/%d us]\n", + "unlink qh%d-%04x/%pK start %d [%d/%d us]\n", qh->period, le32_to_cpup(&qh->hw_info2) & (QH_CMASK | QH_SMASK), qh, qh->start, qh->usecs, qh->c_usecs); @@ -2179,7 +2179,7 @@ static int qh_schedule(struct oxu_hcd *oxu, struct ehci_qh *qh) : cpu_to_le32(QH_SMASK); qh->hw_info2 |= c_mask; } else - oxu_dbg(oxu, "reused qh %p schedule\n", qh); + oxu_dbg(oxu, "reused qh %pK schedule\n", qh); /* stuff into the periodic schedule */ status = qh_link_periodic(oxu, qh); @@ -2307,7 +2307,7 @@ restart: qh_put(temp.qh); break; default: - oxu_dbg(oxu, "corrupt type %d frame %d shadow %p\n", + oxu_dbg(oxu, "corrupt type %d frame %d shadow %pK\n", type, frame, q.ptr); q.ptr = NULL; } @@ -2975,7 +2975,7 @@ static int oxu_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) qh_completions(oxu, qh); break; default: - oxu_dbg(oxu, "bogus qh %p state %d\n", + oxu_dbg(oxu, "bogus qh %pK state %d\n", qh, qh->qh_state); goto done; } @@ -2993,7 +2993,7 @@ static int oxu_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) * FIXME kill those tds' urbs */ dev_err(hcd->self.controller, - "can't reschedule qh %p, err %d\n", qh, + "can't reschedule qh %pK, err %d\n", qh, status); } return status; @@ -3059,7 +3059,7 @@ nogood: /* caller was supposed to have unlinked any requests; * that's not our job. just leak this memory. */ - oxu_err(oxu, "qh %p (#%02x) state %d%s\n", + oxu_err(oxu, "qh %pK (#%02x) state %d%s\n", qh, ep->desc.bEndpointAddress, qh->qh_state, list_empty(&qh->qtd_list) ? "" : "(has tds)"); break; diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c index b4cad9346..94a3913ec 100644 --- a/drivers/usb/host/sl811-hcd.c +++ b/drivers/usb/host/sl811-hcd.c @@ -160,7 +160,7 @@ static void setup_packet( sl811_write(sl811, bank + SL11H_HOSTCTLREG, control | SL11H_HCTLMASK_OUT); ep->length = 0; - PACKET("SETUP qh%p\n", ep); + PACKET("SETUP qh%pK\n", ep); } /* STATUS finishes control requests, often after IN or OUT data packets */ @@ -190,7 +190,7 @@ static void status_packet( control |= SL11H_HCTLMASK_OUT; sl811_write(sl811, bank + SL11H_HOSTCTLREG, control); ep->length = 0; - PACKET("STATUS%s/%s qh%p\n", ep->nak_count ? "/retry" : "", + PACKET("STATUS%s/%s qh%pK\n", ep->nak_count ? "/retry" : "", do_out ? "out" : "in", ep); } @@ -227,7 +227,7 @@ static void in_packet( sl811_write(sl811, bank + SL11H_HOSTCTLREG, control); ep->length = min_t(u32, len, urb->transfer_buffer_length - urb->actual_length); - PACKET("IN%s/%d qh%p len%d\n", ep->nak_count ? "/retry" : "", + PACKET("IN%s/%d qh%pK len%d\n", ep->nak_count ? "/retry" : "", !!usb_gettoggle(urb->dev, ep->epnum, 0), ep, len); } @@ -270,7 +270,7 @@ static void out_packet( sl811_write(sl811, bank + SL11H_HOSTCTLREG, control | SL11H_HCTLMASK_OUT); ep->length = len; - PACKET("OUT%s/%d qh%p len%d\n", ep->nak_count ? "/retry" : "", + PACKET("OUT%s/%d qh%pK len%d\n", ep->nak_count ? "/retry" : "", !!usb_gettoggle(urb->dev, ep->epnum, 1), ep, len); } @@ -338,7 +338,7 @@ static struct sl811h_ep *start(struct sl811 *sl811, u8 bank) } if (unlikely(list_empty(&ep->hep->urb_list))) { - DBG("empty %p queue?\n", ep); + DBG("empty %pK queue?\n", ep); return NULL; } @@ -391,7 +391,7 @@ static struct sl811h_ep *start(struct sl811 *sl811, u8 bank) status_packet(sl811, ep, urb, bank, control); break; default: - DBG("bad ep%p pid %02x\n", ep, ep->nextpid); + DBG("bad ep%pK pid %02x\n", ep, ep->nextpid); ep = NULL; } return ep; @@ -447,7 +447,7 @@ static void finish_request( } /* periodic deschedule */ - DBG("deschedule qh%d/%p branch %d\n", ep->period, ep, ep->branch); + DBG("deschedule qh%d/%pK branch %d\n", ep->period, ep, ep->branch); for (i = ep->branch; i < PERIODIC_SIZE; i += ep->period) { struct sl811h_ep *temp; struct sl811h_ep **prev = &sl811->periodic[i]; @@ -486,7 +486,7 @@ done(struct sl811 *sl811, struct sl811h_ep *ep, u8 bank) /* we can safely ignore NAKs */ if (status & SL11H_STATMASK_NAK) { - // PACKET("...NAK_%02x qh%p\n", bank, ep); + // PACKET("...NAK_%02x qh%pK\n", bank, ep); if (!ep->period) ep->nak_count++; ep->error_count = 0; @@ -502,7 +502,7 @@ done(struct sl811 *sl811, struct sl811h_ep *ep, u8 bank) ep->nak_count = ep->error_count = 0; switch (ep->nextpid) { case USB_PID_OUT: - // PACKET("...ACK/out_%02x qh%p\n", bank, ep); + // PACKET("...ACK/out_%02x qh%pK\n", bank, ep); urb->actual_length += ep->length; usb_dotoggle(udev, ep->epnum, 1); if (urb->actual_length @@ -520,7 +520,7 @@ done(struct sl811 *sl811, struct sl811h_ep *ep, u8 bank) } break; case USB_PID_IN: - // PACKET("...ACK/in_%02x qh%p\n", bank, ep); + // PACKET("...ACK/in_%02x qh%pK\n", bank, ep); buf = urb->transfer_buffer + urb->actual_length; prefetchw(buf); len = ep->maxpacket - sl811_read(sl811, @@ -544,7 +544,7 @@ done(struct sl811 *sl811, struct sl811h_ep *ep, u8 bank) } break; case USB_PID_SETUP: - // PACKET("...ACK/setup_%02x qh%p\n", bank, ep); + // PACKET("...ACK/setup_%02x qh%pK\n", bank, ep); if (urb->transfer_buffer_length == urb->actual_length) ep->nextpid = USB_PID_ACK; else if (usb_pipeout(urb->pipe)) { @@ -556,14 +556,14 @@ done(struct sl811 *sl811, struct sl811h_ep *ep, u8 bank) } break; case USB_PID_ACK: - // PACKET("...ACK/status_%02x qh%p\n", bank, ep); + // PACKET("...ACK/status_%02x qh%pK\n", bank, ep); urbstat = 0; break; } /* STALL stops all transfers */ } else if (status & SL11H_STATMASK_STALL) { - PACKET("...STALL_%02x qh%p\n", bank, ep); + PACKET("...STALL_%02x qh%pK\n", bank, ep); ep->nak_count = ep->error_count = 0; urbstat = -EPIPE; @@ -576,7 +576,7 @@ done(struct sl811 *sl811, struct sl811h_ep *ep, u8 bank) else urbstat = -EPROTO; ep->error_count = 0; - PACKET("...3STRIKES_%02x %02x qh%p stat %d\n", + PACKET("...3STRIKES_%02x %02x qh%pK stat %d\n", bank, status, ep, urbstat); } @@ -917,7 +917,7 @@ static int sl811h_urb_enqueue( * to share the faster parts of the tree without needing * dummy/placeholder nodes */ - DBG("schedule qh%d/%p branch %d\n", ep->period, ep, ep->branch); + DBG("schedule qh%d/%pK branch %d\n", ep->period, ep, ep->branch); for (i = ep->branch; i < PERIODIC_SIZE; i += ep->period) { struct sl811h_ep **prev = &sl811->periodic[i]; struct sl811h_ep *here = *prev; @@ -1008,7 +1008,7 @@ static int sl811h_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) if (urb) finish_request(sl811, ep, urb, 0); else - VDBG("dequeue, urb %p active %s; wait4irq\n", urb, + VDBG("dequeue, urb %pK active %s; wait4irq\n", urb, (sl811->active_a == ep) ? "A" : "B"); } else retval = -EINVAL; @@ -1029,7 +1029,7 @@ sl811h_endpoint_disable(struct usb_hcd *hcd, struct usb_host_endpoint *hep) if (!list_empty(&hep->urb_list)) msleep(3); if (!list_empty(&hep->urb_list)) - WARNING("ep %p not empty?\n", ep); + WARNING("ep %pK not empty?\n", ep); kfree(ep); hep->hcpriv = NULL; @@ -1425,17 +1425,17 @@ static int proc_sl811h_show(struct seq_file *s, void *unused) sl811_read(sl811, SL11H_SOFTMRREG) << 6); } - seq_printf(s, "A: qh%p ctl %02x sts %02x\n", sl811->active_a, + seq_printf(s, "A: qh%pK ctl %02x sts %02x\n", sl811->active_a, sl811_read(sl811, SL811_EP_A(SL11H_HOSTCTLREG)), sl811_read(sl811, SL811_EP_A(SL11H_PKTSTATREG))); - seq_printf(s, "B: qh%p ctl %02x sts %02x\n", sl811->active_b, + seq_printf(s, "B: qh%pK ctl %02x sts %02x\n", sl811->active_b, sl811_read(sl811, SL811_EP_B(SL11H_HOSTCTLREG)), sl811_read(sl811, SL811_EP_B(SL11H_PKTSTATREG))); seq_printf(s, "\n"); list_for_each_entry (ep, &sl811->async, schedule) { struct urb *urb; - seq_printf(s, "%s%sqh%p, ep%d%s, maxpacket %d" + seq_printf(s, "%s%sqh%pK, ep%d%s, maxpacket %d" " nak %d err %d\n", (ep == sl811->active_a) ? "(A) " : "", (ep == sl811->active_b) ? "(B) " : "", @@ -1450,7 +1450,7 @@ static int proc_sl811h_show(struct seq_file *s, void *unused) ep->maxpacket, ep->nak_count, ep->error_count); list_for_each_entry (urb, &ep->hep->urb_list, urb_list) { - seq_printf(s, " urb%p, %d/%d\n", urb, + seq_printf(s, " urb%pK, %d/%d\n", urb, urb->actual_length, urb->transfer_buffer_length); } @@ -1469,7 +1469,7 @@ static int proc_sl811h_show(struct seq_file *s, void *unused) /* DUMB: prints shared entries multiple times */ do { seq_printf(s, - " %s%sqh%d/%p (%sdev%d ep%d%s max %d) " + " %s%sqh%d/%pK (%sdev%d ep%d%s max %d) " "err %d\n", (ep == sl811->active_a) ? "(A) " : "", (ep == sl811->active_b) ? "(B) " : "", diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c index 5c124bf5d..5e20b842e 100644 --- a/drivers/usb/host/u132-hcd.c +++ b/drivers/usb/host/u132-hcd.c @@ -261,8 +261,8 @@ static void u132_hcd_delete(struct kref *kref) list_del_init(&u132->u132_list); u132_instances -= 1; mutex_unlock(&u132_module_lock); - dev_warn(&u132->platform_dev->dev, "FREEING the hcd=%p and thus the u13" - "2=%p going=%d pdev=%p\n", hcd, u132, u132->going, pdev); + dev_warn(&u132->platform_dev->dev, "FREEING the hcd=%pK and thus the u13" + "2=%pK going=%d pdev=%pK\n", hcd, u132, u132->going, pdev); usb_put_hcd(hcd); } @@ -641,7 +641,7 @@ static void u132_hcd_interrupt_recv(void *data, struct urb *urb, u8 *buf, return; } else if (u132->going > 0) { dev_err(&u132->platform_dev->dev, "device is being removed " - "urb=%p\n", urb); + "urb=%pK\n", urb); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, -ENODEV); return; @@ -701,7 +701,7 @@ static void u132_hcd_interrupt_recv(void *data, struct urb *urb, u8 *buf, endp->toggle_bits = 0x2; usb_settoggle(udev->usb_device, endp->usb_endp, 0, 0); - dev_err(&u132->platform_dev->dev, "urb=%p givin" + dev_err(&u132->platform_dev->dev, "urb=%pK givin" "g back INTERRUPT %s\n", urb, cc_to_text[condition_code]); } @@ -711,7 +711,7 @@ static void u132_hcd_interrupt_recv(void *data, struct urb *urb, u8 *buf, return; } } else { - dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%p " + dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%pK " "unlinked=%d\n", urb, urb->unlinked); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, 0); @@ -740,7 +740,7 @@ static void u132_hcd_bulk_output_sent(void *data, struct urb *urb, u8 *buf, return; } else if (u132->going > 0) { dev_err(&u132->platform_dev->dev, "device is being removed " - "urb=%p\n", urb); + "urb=%pK\n", urb); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, -ENODEV); return; @@ -762,7 +762,7 @@ static void u132_hcd_bulk_output_sent(void *data, struct urb *urb, u8 *buf, return; } } else { - dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%p " + dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%pK " "unlinked=%d\n", urb, urb->unlinked); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, 0); @@ -792,7 +792,7 @@ static void u132_hcd_bulk_input_recv(void *data, struct urb *urb, u8 *buf, return; } else if (u132->going > 0) { dev_err(&u132->platform_dev->dev, "device is being removed " - "urb=%p\n", urb); + "urb=%pK\n", urb); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, -ENODEV); return; @@ -840,7 +840,7 @@ static void u132_hcd_bulk_input_recv(void *data, struct urb *urb, u8 *buf, endp->toggle_bits = toggle_bits; usb_settoggle(udev->usb_device, endp->usb_endp, 0, 1 & toggle_bits); - dev_warn(&u132->platform_dev->dev, "urb=%p(SHORT NOT OK" + dev_warn(&u132->platform_dev->dev, "urb=%pK(SHORT NOT OK" ") giving back BULK IN %s\n", urb, cc_to_text[condition_code]); mutex_unlock(&u132->scheduler_lock); @@ -856,7 +856,7 @@ static void u132_hcd_bulk_input_recv(void *data, struct urb *urb, u8 *buf, } else { endp->toggle_bits = 0x2; usb_settoggle(udev->usb_device, endp->usb_endp, 0, 0); - dev_err(&u132->platform_dev->dev, "urb=%p giving back B" + dev_err(&u132->platform_dev->dev, "urb=%pK giving back B" "ULK IN code=%d %s\n", urb, condition_code, cc_to_text[condition_code]); mutex_unlock(&u132->scheduler_lock); @@ -865,7 +865,7 @@ static void u132_hcd_bulk_input_recv(void *data, struct urb *urb, u8 *buf, return; } } else { - dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%p " + dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%pK " "unlinked=%d\n", urb, urb->unlinked); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, 0); @@ -893,7 +893,7 @@ static void u132_hcd_configure_empty_sent(void *data, struct urb *urb, u8 *buf, return; } else if (u132->going > 0) { dev_err(&u132->platform_dev->dev, "device is being removed " - "urb=%p\n", urb); + "urb=%pK\n", urb); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, -ENODEV); return; @@ -902,7 +902,7 @@ static void u132_hcd_configure_empty_sent(void *data, struct urb *urb, u8 *buf, u132_hcd_giveback_urb(u132, endp, urb, 0); return; } else { - dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%p " + dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%pK " "unlinked=%d\n", urb, urb->unlinked); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, 0); @@ -931,7 +931,7 @@ static void u132_hcd_configure_input_recv(void *data, struct urb *urb, u8 *buf, return; } else if (u132->going > 0) { dev_err(&u132->platform_dev->dev, "device is being removed " - "urb=%p\n", urb); + "urb=%pK\n", urb); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, -ENODEV); return; @@ -960,21 +960,21 @@ static void u132_hcd_configure_input_recv(void *data, struct urb *urb, u8 *buf, } else if (condition_code == TD_CC_STALL) { mutex_unlock(&u132->scheduler_lock); dev_warn(&u132->platform_dev->dev, "giving back SETUP I" - "NPUT STALL urb %p\n", urb); + "NPUT STALL urb %pK\n", urb); u132_hcd_giveback_urb(u132, endp, urb, cc_to_error[condition_code]); return; } else { mutex_unlock(&u132->scheduler_lock); dev_err(&u132->platform_dev->dev, "giving back SETUP IN" - "PUT %s urb %p\n", cc_to_text[condition_code], + "PUT %s urb %pK\n", cc_to_text[condition_code], urb); u132_hcd_giveback_urb(u132, endp, urb, cc_to_error[condition_code]); return; } } else { - dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%p " + dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%pK " "unlinked=%d\n", urb, urb->unlinked); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, 0); @@ -1002,7 +1002,7 @@ static void u132_hcd_configure_empty_recv(void *data, struct urb *urb, u8 *buf, return; } else if (u132->going > 0) { dev_err(&u132->platform_dev->dev, "device is being removed " - "urb=%p\n", urb); + "urb=%pK\n", urb); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, -ENODEV); return; @@ -1011,7 +1011,7 @@ static void u132_hcd_configure_empty_recv(void *data, struct urb *urb, u8 *buf, u132_hcd_giveback_urb(u132, endp, urb, 0); return; } else { - dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%p " + dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%pK " "unlinked=%d\n", urb, urb->unlinked); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, 0); @@ -1040,7 +1040,7 @@ static void u132_hcd_configure_setup_sent(void *data, struct urb *urb, u8 *buf, return; } else if (u132->going > 0) { dev_err(&u132->platform_dev->dev, "device is being removed " - "urb=%p\n", urb); + "urb=%pK\n", urb); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, -ENODEV); return; @@ -1069,7 +1069,7 @@ static void u132_hcd_configure_setup_sent(void *data, struct urb *urb, u8 *buf, return; } } else { - dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%p " + dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%pK " "unlinked=%d\n", urb, urb->unlinked); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, 0); @@ -1099,7 +1099,7 @@ static void u132_hcd_enumeration_empty_recv(void *data, struct urb *urb, return; } else if (u132->going > 0) { dev_err(&u132->platform_dev->dev, "device is being removed " - "urb=%p\n", urb); + "urb=%pK\n", urb); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, -ENODEV); return; @@ -1110,7 +1110,7 @@ static void u132_hcd_enumeration_empty_recv(void *data, struct urb *urb, u132_hcd_giveback_urb(u132, endp, urb, 0); return; } else { - dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%p " + dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%pK " "unlinked=%d\n", urb, urb->unlinked); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, 0); @@ -1138,7 +1138,7 @@ static void u132_hcd_enumeration_address_sent(void *data, struct urb *urb, return; } else if (u132->going > 0) { dev_err(&u132->platform_dev->dev, "device is being removed " - "urb=%p\n", urb); + "urb=%pK\n", urb); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, -ENODEV); return; @@ -1153,7 +1153,7 @@ static void u132_hcd_enumeration_address_sent(void *data, struct urb *urb, u132_hcd_giveback_urb(u132, endp, urb, retval); return; } else { - dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%p " + dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%pK " "unlinked=%d\n", urb, urb->unlinked); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, 0); @@ -1181,7 +1181,7 @@ static void u132_hcd_initial_empty_sent(void *data, struct urb *urb, u8 *buf, return; } else if (u132->going > 0) { dev_err(&u132->platform_dev->dev, "device is being removed " - "urb=%p\n", urb); + "urb=%pK\n", urb); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, -ENODEV); return; @@ -1190,7 +1190,7 @@ static void u132_hcd_initial_empty_sent(void *data, struct urb *urb, u8 *buf, u132_hcd_giveback_urb(u132, endp, urb, 0); return; } else { - dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%p " + dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%pK " "unlinked=%d\n", urb, urb->unlinked); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, 0); @@ -1219,7 +1219,7 @@ static void u132_hcd_initial_input_recv(void *data, struct urb *urb, u8 *buf, return; } else if (u132->going > 0) { dev_err(&u132->platform_dev->dev, "device is being removed " - "urb=%p\n", urb); + "urb=%pK\n", urb); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, -ENODEV); return; @@ -1242,7 +1242,7 @@ static void u132_hcd_initial_input_recv(void *data, struct urb *urb, u8 *buf, u132_hcd_giveback_urb(u132, endp, urb, retval); return; } else { - dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%p " + dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%pK " "unlinked=%d\n", urb, urb->unlinked); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, 0); @@ -1271,7 +1271,7 @@ static void u132_hcd_initial_setup_sent(void *data, struct urb *urb, u8 *buf, return; } else if (u132->going > 0) { dev_err(&u132->platform_dev->dev, "device is being removed " - "urb=%p\n", urb); + "urb=%pK\n", urb); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, -ENODEV); return; @@ -1286,7 +1286,7 @@ static void u132_hcd_initial_setup_sent(void *data, struct urb *urb, u8 *buf, u132_hcd_giveback_urb(u132, endp, urb, retval); return; } else { - dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%p " + dev_err(&u132->platform_dev->dev, "CALLBACK called urb=%pK " "unlinked=%d\n", urb, urb->unlinked); mutex_unlock(&u132->scheduler_lock); u132_hcd_giveback_urb(u132, endp, urb, 0); @@ -1781,10 +1781,10 @@ static void u132_hcd_stop(struct usb_hcd *hcd) { struct u132 *u132 = hcd_to_u132(hcd); if (u132->going > 1) { - dev_err(&u132->platform_dev->dev, "u132 device %p(hcd=%p) has b" + dev_err(&u132->platform_dev->dev, "u132 device %pK(hcd=%pK) has b" "een removed %d\n", u132, hcd, u132->going); } else if (u132->going > 0) { - dev_err(&u132->platform_dev->dev, "device hcd=%p is being remov" + dev_err(&u132->platform_dev->dev, "device hcd=%pK is being remov" "ed\n", hcd); } else { mutex_lock(&u132->sw_lock); @@ -2259,7 +2259,7 @@ static int u132_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, return -ENODEV; } else if (u132->going > 0) { dev_err(&u132->platform_dev->dev, "device is being removed " - "urb=%p\n", urb); + "urb=%pK\n", urb); return -ESHUTDOWN; } else { u8 usb_addr = usb_pipedevice(urb->pipe); @@ -2412,7 +2412,7 @@ static int dequeue_from_overflow_chain(struct u132 *u132, } else continue; } - dev_err(&u132->platform_dev->dev, "urb=%p not found in endp[%d]=%p ring" + dev_err(&u132->platform_dev->dev, "urb=%pK not found in endp[%d]=%pK ring" "[%d] %c%c usb_endp=%d usb_addr=%d size=%d next=%04X last=%04X" "\n", urb, endp->endp_number, endp, endp->ring->number, endp->input ? 'I' : ' ', endp->output ? 'O' : ' ', @@ -2434,8 +2434,8 @@ static int u132_endp_urb_dequeue(struct u132 *u132, struct u132_endp *endp, return rc; } if (endp->queue_size == 0) { - dev_err(&u132->platform_dev->dev, "urb=%p not found in endp[%d]" - "=%p ring[%d] %c%c usb_endp=%d usb_addr=%d\n", urb, + dev_err(&u132->platform_dev->dev, "urb=%pK not found in endp[%d]" + "=%pK ring[%d] %c%c usb_endp=%d usb_addr=%d\n", urb, endp->endp_number, endp, endp->ring->number, endp->input ? 'I' : ' ', endp->output ? 'O' : ' ', endp->usb_endp, endp->usb_addr); @@ -2495,8 +2495,8 @@ static int u132_endp_urb_dequeue(struct u132 *u132, struct u132_endp *endp, usb_hcd_giveback_urb(hcd, urb, status); return 0; } else if (list_empty(&endp->urb_more)) { - dev_err(&u132->platform_dev->dev, "urb=%p not found in " - "endp[%d]=%p ring[%d] %c%c usb_endp=%d usb_addr" + dev_err(&u132->platform_dev->dev, "urb=%pK not found in " + "endp[%d]=%pK ring[%d] %c%c usb_endp=%d usb_addr" "=%d size=%d next=%04X last=%04X\n", urb, endp->endp_number, endp, endp->ring->number, endp->input ? 'I' : ' ', @@ -2546,7 +2546,7 @@ static void u132_endpoint_disable(struct usb_hcd *hcd, { struct u132 *u132 = hcd_to_u132(hcd); if (u132->going > 2) { - dev_err(&u132->platform_dev->dev, "u132 device %p(hcd=%p hep=%p" + dev_err(&u132->platform_dev->dev, "u132 device %pK(hcd=%pK hep=%pK" ") has been removed %d\n", u132, hcd, hep, u132->going); } else { @@ -2787,11 +2787,11 @@ static int u132_hub_status_data(struct usb_hcd *hcd, char *buf) { struct u132 *u132 = hcd_to_u132(hcd); if (u132->going > 1) { - dev_err(&u132->platform_dev->dev, "device hcd=%p has been remov" + dev_err(&u132->platform_dev->dev, "device hcd=%pK has been remov" "ed %d\n", hcd, u132->going); return -ENODEV; } else if (u132->going > 0) { - dev_err(&u132->platform_dev->dev, "device hcd=%p is being remov" + dev_err(&u132->platform_dev->dev, "device hcd=%pK is being remov" "ed\n", hcd); return -ESHUTDOWN; } else { diff --git a/drivers/usb/host/uhci-debug.c b/drivers/usb/host/uhci-debug.c index 455737546..81bf92b0d 100644 --- a/drivers/usb/host/uhci-debug.c +++ b/drivers/usb/host/uhci-debug.c @@ -47,7 +47,7 @@ static int uhci_show_td(struct uhci_hcd *uhci, struct uhci_td *td, char *buf, u32 status, token; status = td_status(uhci, td); - out += sprintf(out, "%*s[%p] link (%08x) ", space, "", td, + out += sprintf(out, "%*s[%pK] link (%08x) ", space, "", td, hc32_to_cpu(uhci, td->link)); out += sprintf(out, "e%d %s%s%s%s%s%s%s%s%s%sLength=%x ", ((status >> 27) & 3), @@ -105,9 +105,9 @@ static int uhci_show_urbp(struct uhci_hcd *uhci, struct urb_priv *urbp, char *ptype; - out += sprintf(out, "urb_priv [%p] ", urbp); - out += sprintf(out, "urb [%p] ", urbp->urb); - out += sprintf(out, "qh [%p] ", urbp->qh); + out += sprintf(out, "urb_priv [%pK] ", urbp); + out += sprintf(out, "urb [%pK] ", urbp->urb); + out += sprintf(out, "qh [%pK] ", urbp->qh); out += sprintf(out, "Dev=%d ", usb_pipedevice(urbp->urb->pipe)); out += sprintf(out, "EP=%x(%s) ", usb_pipeendpoint(urbp->urb->pipe), (usb_pipein(urbp->urb->pipe) ? "IN" : "OUT")); @@ -177,13 +177,13 @@ static int uhci_show_qh(struct uhci_hcd *uhci, default: qtype = "Skel" ; break; } - out += sprintf(out, "%*s[%p] %s QH link (%08x) element (%08x)\n", + out += sprintf(out, "%*s[%pK] %s QH link (%08x) element (%08x)\n", space, "", qh, qtype, hc32_to_cpu(uhci, qh->link), hc32_to_cpu(uhci, element)); if (qh->type == USB_ENDPOINT_XFER_ISOC) out += sprintf(out, - "%*s period %d phase %d load %d us, frame %x desc [%p]\n", + "%*s period %d phase %d load %d us, frame %x desc [%pK]\n", space, "", qh->period, qh->phase, qh->load, qh->iso_frame, qh->iso_packet_desc); else if (qh->type == USB_ENDPOINT_XFER_INT) diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c index da6f56d99..e83ba67c4 100644 --- a/drivers/usb/host/uhci-q.c +++ b/drivers/usb/host/uhci-q.c @@ -124,9 +124,9 @@ static struct uhci_td *uhci_alloc_td(struct uhci_hcd *uhci) static void uhci_free_td(struct uhci_hcd *uhci, struct uhci_td *td) { if (!list_empty(&td->list)) - dev_WARN(uhci_dev(uhci), "td %p still in list!\n", td); + dev_WARN(uhci_dev(uhci), "td %pK still in list!\n", td); if (!list_empty(&td->fl_list)) - dev_WARN(uhci_dev(uhci), "td %p still in fl_list!\n", td); + dev_WARN(uhci_dev(uhci), "td %pK still in fl_list!\n", td); dma_pool_free(uhci->td_pool, td, td->dma_handle); } @@ -294,7 +294,7 @@ static void uhci_free_qh(struct uhci_hcd *uhci, struct uhci_qh *qh) { WARN_ON(qh->state != QH_STATE_IDLE && qh->udev); if (!list_empty(&qh->queue)) - dev_WARN(uhci_dev(uhci), "qh %p list not empty!\n", qh); + dev_WARN(uhci_dev(uhci), "qh %pK list not empty!\n", qh); list_del(&qh->node); if (qh->udev) { @@ -744,7 +744,7 @@ static void uhci_free_urb_priv(struct uhci_hcd *uhci, struct uhci_td *td, *tmp; if (!list_empty(&urbp->node)) - dev_WARN(uhci_dev(uhci), "urb %p still on QH's list!\n", + dev_WARN(uhci_dev(uhci), "urb %pK still on QH's list!\n", urbp->urb); list_for_each_entry_safe(td, tmp, &urbp->td_list, list) { diff --git a/drivers/usb/host/whci/debug.c b/drivers/usb/host/whci/debug.c index ba61dae9e..f541308be 100644 --- a/drivers/usb/host/whci/debug.c +++ b/drivers/usb/host/whci/debug.c @@ -68,7 +68,7 @@ static void qset_print(struct seq_file *s, struct whc_qset *qset) list_for_each_entry(std, &qset->stds, list_node) { if (urb != std->urb) { urb = std->urb; - seq_printf(s, " urb %p transferred: %d bytes\n", urb, + seq_printf(s, " urb %pK transferred: %d bytes\n", urb, urb->actual_length); } if (std->qtd) diff --git a/drivers/usb/host/xhci-dbg.c b/drivers/usb/host/xhci-dbg.c index 5f3a7c74a..06b8f8367 100644 --- a/drivers/usb/host/xhci-dbg.c +++ b/drivers/usb/host/xhci-dbg.c @@ -30,10 +30,10 @@ void xhci_dbg_regs(struct xhci_hcd *xhci) { u32 temp; - xhci_dbg(xhci, "// xHCI capability registers at %p:\n", + xhci_dbg(xhci, "// xHCI capability registers at %pK:\n", xhci->cap_regs); temp = xhci_readl(xhci, &xhci->cap_regs->hc_capbase); - xhci_dbg(xhci, "// @%p = 0x%x (CAPLENGTH AND HCIVERSION)\n", + xhci_dbg(xhci, "// @%pK = 0x%x (CAPLENGTH AND HCIVERSION)\n", &xhci->cap_regs->hc_capbase, temp); xhci_dbg(xhci, "// CAPLENGTH: 0x%x\n", (unsigned int) HC_LENGTH(temp)); @@ -42,24 +42,24 @@ void xhci_dbg_regs(struct xhci_hcd *xhci) (unsigned int) HC_VERSION(temp)); #endif - xhci_dbg(xhci, "// xHCI operational registers at %p:\n", xhci->op_regs); + xhci_dbg(xhci, "// xHCI operational registers at %pK:\n", xhci->op_regs); temp = xhci_readl(xhci, &xhci->cap_regs->run_regs_off); - xhci_dbg(xhci, "// @%p = 0x%x RTSOFF\n", + xhci_dbg(xhci, "// @%pK = 0x%x RTSOFF\n", &xhci->cap_regs->run_regs_off, (unsigned int) temp & RTSOFF_MASK); - xhci_dbg(xhci, "// xHCI runtime registers at %p:\n", xhci->run_regs); + xhci_dbg(xhci, "// xHCI runtime registers at %pK:\n", xhci->run_regs); temp = xhci_readl(xhci, &xhci->cap_regs->db_off); - xhci_dbg(xhci, "// @%p = 0x%x DBOFF\n", &xhci->cap_regs->db_off, temp); - xhci_dbg(xhci, "// Doorbell array at %p:\n", xhci->dba); + xhci_dbg(xhci, "// @%pK = 0x%x DBOFF\n", &xhci->cap_regs->db_off, temp); + xhci_dbg(xhci, "// Doorbell array at %pK:\n", xhci->dba); } static void xhci_print_cap_regs(struct xhci_hcd *xhci) { u32 temp; - xhci_dbg(xhci, "xHCI capability registers at %p:\n", xhci->cap_regs); + xhci_dbg(xhci, "xHCI capability registers at %pK:\n", xhci->cap_regs); temp = xhci_readl(xhci, &xhci->cap_regs->hc_capbase); xhci_dbg(xhci, "CAPLENGTH AND HCIVERSION 0x%x:\n", @@ -140,7 +140,7 @@ static void xhci_print_status(struct xhci_hcd *xhci) static void xhci_print_op_regs(struct xhci_hcd *xhci) { - xhci_dbg(xhci, "xHCI operational registers at %p:\n", xhci->op_regs); + xhci_dbg(xhci, "xHCI operational registers at %pK:\n", xhci->op_regs); xhci_print_command_reg(xhci); xhci_print_status(xhci); } @@ -161,7 +161,7 @@ static void xhci_print_ports(struct xhci_hcd *xhci) addr = &xhci->op_regs->port_status_base; for (i = 0; i < ports; i++) { for (j = 0; j < NUM_PORT_REGS; ++j) { - xhci_dbg(xhci, "%p port %s reg = 0x%x\n", + xhci_dbg(xhci, "%pK port %s reg = 0x%x\n", addr, names[j], (unsigned int) xhci_readl(xhci, addr)); addr++; @@ -181,35 +181,35 @@ void xhci_print_ir_set(struct xhci_hcd *xhci, int set_num) if (temp == XHCI_INIT_VALUE) return; - xhci_dbg(xhci, " %p: ir_set[%i]\n", ir_set, set_num); + xhci_dbg(xhci, " %pK: ir_set[%i]\n", ir_set, set_num); - xhci_dbg(xhci, " %p: ir_set.pending = 0x%x\n", addr, + xhci_dbg(xhci, " %pK: ir_set.pending = 0x%x\n", addr, (unsigned int)temp); addr = &ir_set->irq_control; temp = xhci_readl(xhci, addr); - xhci_dbg(xhci, " %p: ir_set.control = 0x%x\n", addr, + xhci_dbg(xhci, " %pK: ir_set.control = 0x%x\n", addr, (unsigned int)temp); addr = &ir_set->erst_size; temp = xhci_readl(xhci, addr); - xhci_dbg(xhci, " %p: ir_set.erst_size = 0x%x\n", addr, + xhci_dbg(xhci, " %pK: ir_set.erst_size = 0x%x\n", addr, (unsigned int)temp); addr = &ir_set->rsvd; temp = xhci_readl(xhci, addr); if (temp != XHCI_INIT_VALUE) - xhci_dbg(xhci, " WARN: %p: ir_set.rsvd = 0x%x\n", + xhci_dbg(xhci, " WARN: %pK: ir_set.rsvd = 0x%x\n", addr, (unsigned int)temp); addr = &ir_set->erst_base; temp_64 = xhci_read_64(xhci, addr); - xhci_dbg(xhci, " %p: ir_set.erst_base = @%08llx\n", + xhci_dbg(xhci, " %pK: ir_set.erst_base = @%08llx\n", addr, temp_64); addr = &ir_set->erst_dequeue; temp_64 = xhci_read_64(xhci, addr); - xhci_dbg(xhci, " %p: ir_set.erst_dequeue = @%08llx\n", + xhci_dbg(xhci, " %pK: ir_set.erst_dequeue = @%08llx\n", addr, temp_64); } @@ -218,15 +218,15 @@ void xhci_print_run_regs(struct xhci_hcd *xhci) u32 temp; int i; - xhci_dbg(xhci, "xHCI runtime registers at %p:\n", xhci->run_regs); + xhci_dbg(xhci, "xHCI runtime registers at %pK:\n", xhci->run_regs); temp = xhci_readl(xhci, &xhci->run_regs->microframe_index); - xhci_dbg(xhci, " %p: Microframe index = 0x%x\n", + xhci_dbg(xhci, " %pK: Microframe index = 0x%x\n", &xhci->run_regs->microframe_index, (unsigned int) temp); for (i = 0; i < 7; ++i) { temp = xhci_readl(xhci, &xhci->run_regs->rsvd[i]); if (temp != XHCI_INIT_VALUE) - xhci_dbg(xhci, " WARN: %p: Rsvd[%i] = 0x%x\n", + xhci_dbg(xhci, " WARN: %pK: Rsvd[%i] = 0x%x\n", &xhci->run_regs->rsvd[i], i, (unsigned int) temp); } @@ -328,13 +328,13 @@ void xhci_debug_segment(struct xhci_hcd *xhci, struct xhci_segment *seg) void xhci_dbg_ring_ptrs(struct xhci_hcd *xhci, struct xhci_ring *ring) { - xhci_dbg(xhci, "Ring deq = %p (virt), 0x%llx (dma)\n", + xhci_dbg(xhci, "Ring deq = %pK (virt), 0x%llx (dma)\n", ring->dequeue, (unsigned long long)xhci_trb_virt_to_dma(ring->deq_seg, ring->dequeue)); xhci_dbg(xhci, "Ring deq updated %u times\n", ring->deq_updates); - xhci_dbg(xhci, "Ring enq = %p (virt), 0x%llx (dma)\n", + xhci_dbg(xhci, "Ring enq = %pK (virt), 0x%llx (dma)\n", ring->enqueue, (unsigned long long)xhci_trb_virt_to_dma(ring->enq_seg, ring->enqueue)); @@ -424,7 +424,7 @@ static void dbg_rsvd64(struct xhci_hcd *xhci, u64 *ctx, dma_addr_t dma) { int i; for (i = 0; i < 4; ++i) { - xhci_dbg(xhci, "@%p (virt) @%08llx " + xhci_dbg(xhci, "@%pK (virt) @%08llx " "(dma) %#08llx - rsvd64[%d]\n", &ctx[4 + i], (unsigned long long)dma, ctx[4 + i], i); @@ -463,24 +463,24 @@ static void xhci_dbg_slot_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx * int csz = HCC_64BYTE_CONTEXT(xhci->hcc_params); xhci_dbg(xhci, "Slot Context:\n"); - xhci_dbg(xhci, "@%p (virt) @%08llx (dma) %#08x - dev_info\n", + xhci_dbg(xhci, "@%pK (virt) @%08llx (dma) %#08x - dev_info\n", &slot_ctx->dev_info, (unsigned long long)dma, slot_ctx->dev_info); dma += field_size; - xhci_dbg(xhci, "@%p (virt) @%08llx (dma) %#08x - dev_info2\n", + xhci_dbg(xhci, "@%pK (virt) @%08llx (dma) %#08x - dev_info2\n", &slot_ctx->dev_info2, (unsigned long long)dma, slot_ctx->dev_info2); dma += field_size; - xhci_dbg(xhci, "@%p (virt) @%08llx (dma) %#08x - tt_info\n", + xhci_dbg(xhci, "@%pK (virt) @%08llx (dma) %#08x - tt_info\n", &slot_ctx->tt_info, (unsigned long long)dma, slot_ctx->tt_info); dma += field_size; - xhci_dbg(xhci, "@%p (virt) @%08llx (dma) %#08x - dev_state\n", + xhci_dbg(xhci, "@%pK (virt) @%08llx (dma) %#08x - dev_state\n", &slot_ctx->dev_state, (unsigned long long)dma, slot_ctx->dev_state); dma += field_size; for (i = 0; i < 4; ++i) { - xhci_dbg(xhci, "@%p (virt) @%08llx (dma) %#08x - rsvd[%d]\n", + xhci_dbg(xhci, "@%pK (virt) @%08llx (dma) %#08x - rsvd[%d]\n", &slot_ctx->reserved[i], (unsigned long long)dma, slot_ctx->reserved[i], i); dma += field_size; @@ -508,24 +508,24 @@ static void xhci_dbg_ep_ctx(struct xhci_hcd *xhci, ((unsigned long)ep_ctx - (unsigned long)ctx->bytes); xhci_dbg(xhci, "Endpoint %02d Context:\n", i); - xhci_dbg(xhci, "@%p (virt) @%08llx (dma) %#08x - ep_info\n", + xhci_dbg(xhci, "@%pK (virt) @%08llx (dma) %#08x - ep_info\n", &ep_ctx->ep_info, (unsigned long long)dma, ep_ctx->ep_info); dma += field_size; - xhci_dbg(xhci, "@%p (virt) @%08llx (dma) %#08x - ep_info2\n", + xhci_dbg(xhci, "@%pK (virt) @%08llx (dma) %#08x - ep_info2\n", &ep_ctx->ep_info2, (unsigned long long)dma, ep_ctx->ep_info2); dma += field_size; - xhci_dbg(xhci, "@%p (virt) @%08llx (dma) %#08llx - deq\n", + xhci_dbg(xhci, "@%pK (virt) @%08llx (dma) %#08llx - deq\n", &ep_ctx->deq, (unsigned long long)dma, ep_ctx->deq); dma += 2*field_size; - xhci_dbg(xhci, "@%p (virt) @%08llx (dma) %#08x - tx_info\n", + xhci_dbg(xhci, "@%pK (virt) @%08llx (dma) %#08x - tx_info\n", &ep_ctx->tx_info, (unsigned long long)dma, ep_ctx->tx_info); dma += field_size; for (j = 0; j < 3; ++j) { - xhci_dbg(xhci, "@%p (virt) @%08llx (dma) %#08x - rsvd[%d]\n", + xhci_dbg(xhci, "@%pK (virt) @%08llx (dma) %#08x - rsvd[%d]\n", &ep_ctx->reserved[j], (unsigned long long)dma, ep_ctx->reserved[j], j); @@ -550,16 +550,16 @@ void xhci_dbg_ctx(struct xhci_hcd *xhci, if (ctx->type == XHCI_CTX_TYPE_INPUT) { struct xhci_input_control_ctx *ctrl_ctx = xhci_get_input_control_ctx(xhci, ctx); - xhci_dbg(xhci, "@%p (virt) @%08llx (dma) %#08x - drop flags\n", + xhci_dbg(xhci, "@%pK (virt) @%08llx (dma) %#08x - drop flags\n", &ctrl_ctx->drop_flags, (unsigned long long)dma, ctrl_ctx->drop_flags); dma += field_size; - xhci_dbg(xhci, "@%p (virt) @%08llx (dma) %#08x - add flags\n", + xhci_dbg(xhci, "@%pK (virt) @%08llx (dma) %#08x - add flags\n", &ctrl_ctx->add_flags, (unsigned long long)dma, ctrl_ctx->add_flags); dma += field_size; for (i = 0; i < 6; ++i) { - xhci_dbg(xhci, "@%p (virt) @%08llx (dma) %#08x - rsvd2[%d]\n", + xhci_dbg(xhci, "@%pK (virt) @%08llx (dma) %#08x - rsvd2[%d]\n", &ctrl_ctx->rsvd2[i], (unsigned long long)dma, ctrl_ctx->rsvd2[i], i); dma += field_size; diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index a731cec27..df54f78f4 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -532,7 +532,7 @@ static int xhci_test_radix_tree(struct xhci_hcd *xhci, if (cur_ring != mapped_ring) { xhci_warn(xhci, "WARN: DMA address 0x%08llx " "didn't map to stream ID %u; " - "mapped to ring %p\n", + "mapped to ring %pK\n", (unsigned long long) addr, cur_stream, mapped_ring); @@ -552,7 +552,7 @@ static int xhci_test_radix_tree(struct xhci_hcd *xhci, if (mapped_ring == cur_ring) { xhci_warn(xhci, "WARN: Bad DMA address 0x%08llx " "mapped to valid stream ID %u; " - "mapped ring = %p\n", + "mapped ring = %pK\n", (unsigned long long) addr, cur_stream, mapped_ring); @@ -1026,7 +1026,7 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id, /* Point to output device context in dcbaa. */ xhci->dcbaa->dev_context_ptrs[slot_id] = cpu_to_le64(dev->out_ctx->dma); - xhci_dbg(xhci, "Set slot id %d dcbaa entry %p to 0x%llx\n", + xhci_dbg(xhci, "Set slot id %d dcbaa entry %pK to 0x%llx\n", slot_id, &xhci->dcbaa->dev_context_ptrs[slot_id], le64_to_cpu(xhci->dcbaa->dev_context_ptrs[slot_id])); @@ -1181,7 +1181,7 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *ud if (udev->tt->multi) slot_ctx->dev_info |= cpu_to_le32(DEV_MTT); } - xhci_dbg(xhci, "udev->tt = %p\n", udev->tt); + xhci_dbg(xhci, "udev->tt = %pK\n", udev->tt); xhci_dbg(xhci, "udev->ttport = 0x%x\n", udev->ttport); /* Step 4 - ring already allocated */ @@ -1944,15 +1944,15 @@ static int xhci_test_trb_in_td(struct xhci_hcd *xhci, if (seg != result_seg) { xhci_warn(xhci, "WARN: %s TRB math test %d failed!\n", test_name, test_number); - xhci_warn(xhci, "Tested TRB math w/ seg %p and " + xhci_warn(xhci, "Tested TRB math w/ seg %pK and " "input DMA 0x%llx\n", input_seg, (unsigned long long) input_dma); - xhci_warn(xhci, "starting TRB %p (0x%llx DMA), " - "ending TRB %p (0x%llx DMA)\n", + xhci_warn(xhci, "starting TRB %pK (0x%llx DMA), " + "ending TRB %pK (0x%llx DMA)\n", start_trb, start_dma, end_trb, end_dma); - xhci_warn(xhci, "Expected seg %p, got seg %p\n", + xhci_warn(xhci, "Expected seg %pK, got seg %pK\n", result_seg, seg); return -1; } @@ -2112,7 +2112,7 @@ static void xhci_add_in_port(struct xhci_hcd *xhci, unsigned int num_ports, if (major_revision > 0x03) { xhci_warn(xhci, "Ignoring unknown port speed, " - "Ext Cap %p, revision = 0x%x\n", + "Ext Cap %pK, revision = 0x%x\n", addr, major_revision); /* Ignoring port protocol we can't understand. FIXME */ return; @@ -2122,7 +2122,7 @@ static void xhci_add_in_port(struct xhci_hcd *xhci, unsigned int num_ports, temp = xhci_readl(xhci, addr + 2); port_offset = XHCI_EXT_PORT_OFF(temp); port_count = XHCI_EXT_PORT_COUNT(temp); - xhci_dbg(xhci, "Ext Cap %p, port offset = %u, " + xhci_dbg(xhci, "Ext Cap %pK, port offset = %u, " "count = %u, revision = 0x%x\n", addr, port_offset, port_count, major_revision); /* Port count includes the current port offset */ @@ -2150,7 +2150,7 @@ static void xhci_add_in_port(struct xhci_hcd *xhci, unsigned int num_ports, for (i = port_offset; i < (port_offset + port_count); i++) { /* Duplicate entry. Ignore the port if the revisions differ. */ if (xhci->port_array[i] != 0) { - xhci_warn(xhci, "Duplicate port entry, Ext Cap %p," + xhci_warn(xhci, "Duplicate port entry, Ext Cap %pK," " port %u\n", addr, i); xhci_warn(xhci, "Port was marked as USB %u, " "duplicated as USB %u\n", @@ -2282,7 +2282,7 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags) &xhci->op_regs->port_status_base + NUM_PORT_REGS*i; xhci_dbg(xhci, "USB 2.0 port at index %u, " - "addr = %p\n", i, + "addr = %pK\n", i, xhci->usb2_ports[port_index]); port_index++; if (port_index == xhci->num_usb2_ports) @@ -2302,7 +2302,7 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags) &xhci->op_regs->port_status_base + NUM_PORT_REGS*i; xhci_dbg(xhci, "USB 3.0 port at index %u, " - "addr = %p\n", i, + "addr = %pK\n", i, xhci->usb3_ports[port_index]); port_index++; if (port_index == xhci->num_usb3_ports) @@ -2364,7 +2364,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) goto fail; memset(xhci->dcbaa, 0, sizeof *(xhci->dcbaa)); xhci->dcbaa->dma = dma; - xhci_dbg(xhci, "// Device context base array address = 0x%llx (DMA), %p (virt)\n", + xhci_dbg(xhci, "// Device context base array address = 0x%llx (DMA), %pK (virt)\n", (unsigned long long)xhci->dcbaa->dma, xhci->dcbaa); xhci_write_64(xhci, dma, &xhci->op_regs->dcbaa_ptr); @@ -2403,7 +2403,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) xhci->cmd_ring = xhci_ring_alloc(xhci, 1, 1, TYPE_COMMAND, flags); if (!xhci->cmd_ring) goto fail; - xhci_dbg(xhci, "Allocated command ring at %p\n", xhci->cmd_ring); + xhci_dbg(xhci, "Allocated command ring at %pK\n", xhci->cmd_ring); xhci_dbg(xhci, "First segment DMA is 0x%llx\n", (unsigned long long)xhci->cmd_ring->first_seg->dma); @@ -2459,7 +2459,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) memset(xhci->erst.entries, 0, sizeof(struct xhci_erst_entry)*ERST_NUM_SEGS); xhci->erst.num_entries = ERST_NUM_SEGS; xhci->erst.erst_dma_addr = dma; - xhci_dbg(xhci, "Set ERST to 0; private num segs = %i, virt addr = %p, dma addr = 0x%llx\n", + xhci_dbg(xhci, "Set ERST to 0; private num segs = %i, virt addr = %pK, dma addr = 0x%llx\n", xhci->erst.num_entries, xhci->erst.entries, (unsigned long long)xhci->erst.erst_dma_addr); diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 10c0d4734..2f20694d9 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -618,7 +618,7 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, xhci_dbg(xhci, "Cycle state = 0x%x\n", state->new_cycle_state); /* Don't update the ring cycle state for the producer (us). */ - xhci_dbg(xhci, "New dequeue segment = %p (virtual)\n", + xhci_dbg(xhci, "New dequeue segment = %pK (virtual)\n", state->new_deq_seg); addr = xhci_trb_virt_to_dma(state->new_deq_seg, state->new_deq_ptr); xhci_dbg(xhci, "New dequeue pointer = 0x%llx (DMA)\n", @@ -650,8 +650,8 @@ static void td_to_noop(struct xhci_hcd *xhci, struct xhci_ring *ep_ring, cur_trb->generic.field[3] ^= cpu_to_le32(TRB_CYCLE); xhci_dbg(xhci, "Cancel (unchain) link TRB\n"); - xhci_dbg(xhci, "Address = %p (0x%llx dma); " - "in seg %p (0x%llx dma)\n", + xhci_dbg(xhci, "Address = %pK (0x%llx dma); " + "in seg %pK (0x%llx dma)\n", cur_trb, (unsigned long long)xhci_trb_virt_to_dma(cur_seg, cur_trb), cur_seg, @@ -690,8 +690,8 @@ void xhci_queue_new_dequeue_state(struct xhci_hcd *xhci, { struct xhci_virt_ep *ep = &xhci->devs[slot_id]->eps[ep_index]; - xhci_dbg(xhci, "Set TR Deq Ptr cmd, new deq seg = %p (0x%llx dma), " - "new deq ptr = %p (0x%llx dma), new cycle = %u\n", + xhci_dbg(xhci, "Set TR Deq Ptr cmd, new deq seg = %pK (0x%llx dma), " + "new deq ptr = %pK (0x%llx dma), new cycle = %u\n", deq_state->new_deq_seg, (unsigned long long)deq_state->new_deq_seg->dma, deq_state->new_deq_ptr, @@ -829,7 +829,7 @@ static void handle_stopped_endpoint(struct xhci_hcd *xhci, * short, don't muck with the stream ID after * submission. */ - xhci_warn(xhci, "WARN Cancelled URB %p " + xhci_warn(xhci, "WARN Cancelled URB %pK " "has invalid stream ID %u.\n", cur_td->urb, cur_td->urb->stream_id); @@ -1149,7 +1149,7 @@ static void handle_set_deq_completion(struct xhci_hcd *xhci, } else { xhci_warn(xhci, "Mismatch between completed Set TR Deq " "Ptr command & xHCI internal state.\n"); - xhci_warn(xhci, "ep deq seg = %p, deq ptr = %p\n", + xhci_warn(xhci, "ep deq seg = %pK, deq ptr = %pK\n", dev->eps[ep_index].queued_deq_seg, dev->eps[ep_index].queued_deq_ptr); } @@ -1252,7 +1252,7 @@ static void xhci_cmd_to_noop(struct xhci_hcd *xhci, struct xhci_cd *cur_cd) xhci->cmd_ring->dequeue, &cycle_state); if (!cur_seg) { - xhci_warn(xhci, "Command ring mismatch, dequeue = %p %llx (dma)\n", + xhci_warn(xhci, "Command ring mismatch, dequeue = %pK %llx (dma)\n", xhci->cmd_ring->dequeue, (unsigned long long) xhci_trb_virt_to_dma(xhci->cmd_ring->deq_seg, @@ -2663,7 +2663,7 @@ cleanup: URB_SHORT_NOT_OK)) || (status != 0 && !usb_endpoint_xfer_isoc(&urb->ep->desc))) - xhci_dbg(xhci, "Giveback URB %p, len = %d, " + xhci_dbg(xhci, "Giveback URB %pK, len = %d, " "expected = %d, status = %d\n", urb, urb->actual_length, urb->transfer_buffer_length, @@ -4168,7 +4168,7 @@ static int queue_set_tr_deq(struct xhci_hcd *xhci, int slot_id, addr = xhci_trb_virt_to_dma(deq_seg, deq_ptr); if (addr == 0) { xhci_warn(xhci, "WARN Cannot submit Set TR Deq Ptr\n"); - xhci_warn(xhci, "WARN deq seg = %p, deq pt = %p\n", + xhci_warn(xhci, "WARN deq seg = %pK, deq pt = %pK\n", deq_seg, deq_ptr); return 0; } diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 83a62d4ab..90f85d8a3 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -720,7 +720,7 @@ int xhci_run(struct usb_hcd *hcd) xhci_writel(xhci, temp, &xhci->op_regs->command); temp = xhci_readl(xhci, &xhci->ir_set->irq_pending); - xhci_dbg(xhci, "// Enabling event ring interrupter %p by writing 0x%x to irq_pending\n", + xhci_dbg(xhci, "// Enabling event ring interrupter %pK by writing 0x%x to irq_pending\n", xhci->ir_set, (unsigned int) ER_IRQ_ENABLE(temp)); xhci_writel(xhci, ER_IRQ_ENABLE(temp), &xhci->ir_set->irq_pending); @@ -1441,7 +1441,7 @@ int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags) exit: return ret; dying: - xhci_dbg(xhci, "Ep 0x%x: URB %p submitted for " + xhci_dbg(xhci, "Ep 0x%x: URB %pK submitted for " "non-responsive xHCI host.\n", urb->ep->desc.bEndpointAddress, urb); ret = -ESHUTDOWN; @@ -1564,7 +1564,7 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) } if ((xhci->xhc_state & XHCI_STATE_DYING) || (xhci->xhc_state & XHCI_STATE_HALTED)) { - xhci_dbg(xhci, "Ep 0x%x: URB %p to be canceled on " + xhci_dbg(xhci, "Ep 0x%x: URB %pK to be canceled on " "non-responsive xHCI host.\n", urb->ep->desc.bEndpointAddress, urb); /* Let the stop endpoint command watchdog timer (which set this @@ -1586,7 +1586,7 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) urb_priv = urb->hcpriv; i = urb_priv->td_cnt; if (i < urb_priv->length) - xhci_dbg(xhci, "Cancel URB %p, dev %s, ep 0x%x, " + xhci_dbg(xhci, "Cancel URB %pK, dev %s, ep 0x%x, " "starting at offset 0x%llx\n", urb, urb->dev->devpath, urb->ep->desc.bEndpointAddress, @@ -1655,7 +1655,7 @@ int xhci_drop_endpoint(struct usb_hcd *hcd, struct usb_device *udev, if (xhci->xhc_state & XHCI_STATE_DYING) return -ENODEV; - xhci_dbg(xhci, "%s called for udev %p\n", __func__, udev); + xhci_dbg(xhci, "%s called for udev %pK\n", __func__, udev); drop_flag = xhci_get_endpoint_flag(&ep->desc); if (drop_flag == SLOT_FLAG || drop_flag == EP0_FLAG) { xhci_dbg(xhci, "xHCI %s - can't drop slot or ep 0 %#x\n", @@ -1675,7 +1675,7 @@ int xhci_drop_endpoint(struct usb_hcd *hcd, struct usb_device *udev, cpu_to_le32(EP_STATE_DISABLED)) || le32_to_cpu(ctrl_ctx->drop_flags) & xhci_get_endpoint_flag(&ep->desc)) { - xhci_warn(xhci, "xHCI %s called with disabled ep %p\n", + xhci_warn(xhci, "xHCI %s called with disabled ep %pK\n", __func__, ep); return 0; } @@ -1821,7 +1821,7 @@ int xhci_add_endpoint(struct usb_hcd *hcd, struct usb_device *udev, */ if (le32_to_cpu(ctrl_ctx->add_flags) & xhci_get_endpoint_flag(&ep->desc)) { - xhci_warn(xhci, "xHCI %s called with enabled ep %p\n", + xhci_warn(xhci, "xHCI %s called with enabled ep %pK\n", __func__, ep); return 0; } @@ -2833,7 +2833,7 @@ int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev) (xhci->xhc_state & XHCI_STATE_REMOVING)) return -ENODEV; - xhci_dbg(xhci, "%s called for udev %p\n", __func__, udev); + xhci_dbg(xhci, "%s called for udev %pK\n", __func__, udev); virt_dev = xhci->devs[udev->slot_id]; /* See section 4.6.6 - A0 = 1; A1 = D0 = D1 = 0 */ @@ -2901,7 +2901,7 @@ void xhci_reset_bandwidth(struct usb_hcd *hcd, struct usb_device *udev) return; xhci = hcd_to_xhci(hcd); - xhci_dbg(xhci, "%s called for udev %p\n", __func__, udev); + xhci_dbg(xhci, "%s called for udev %pK\n", __func__, udev); virt_dev = xhci->devs[udev->slot_id]; /* Free any rings allocated for added endpoints */ for (i = 0; i < 31; ++i) { @@ -2947,7 +2947,7 @@ static void xhci_setup_input_ctx_for_quirk(struct xhci_hcd *xhci, if (addr == 0) { xhci_warn(xhci, "WARN Cannot submit config ep after " "reset ep command\n"); - xhci_warn(xhci, "WARN deq seg = %p, deq ptr = %p\n", + xhci_warn(xhci, "WARN deq seg = %pK, deq ptr = %pK\n", deq_state->new_deq_seg, deq_state->new_deq_ptr); return; @@ -3932,7 +3932,7 @@ int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev) } temp_64 = xhci_read_64(xhci, &xhci->op_regs->dcbaa_ptr); xhci_dbg(xhci, "Op regs DCBAA ptr = %#016llx\n", temp_64); - xhci_dbg(xhci, "Slot ID %d dcbaa entry @%p = %#016llx\n", + xhci_dbg(xhci, "Slot ID %d dcbaa entry @%pK = %#016llx\n", udev->slot_id, &xhci->dcbaa->dev_context_ptrs[udev->slot_id], (unsigned long long) |