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 | |
| 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')
97 files changed, 599 insertions, 599 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 71e11ebf1..1bcb77a9f 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -197,7 +197,7 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf) info->u->bSlaveInterface0); if (!info->control || !info->data) { dev_dbg(&intf->dev, - "master #%u/%p slave #%u/%p\n", + "master #%u/%pK slave #%u/%pK\n", info->u->bMasterInterface0, info->control, info->u->bSlaveInterface0, @@ -293,7 +293,7 @@ next_desc: info->data = usb_ifnum_to_if(dev->udev, 1); if (!info->control || !info->data || info->control != intf) { dev_dbg(&intf->dev, - "rndis: master #0/%p slave #1/%p\n", + "rndis: master #0/%pK slave #1/%pK\n", info->control, info->data); goto bad_desc; diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index a58024193..742c1cbb4 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -1014,7 +1014,7 @@ next_ndp: if (((offset + len) > skb_in->len) || (len > ctx->rx_max) || (len < ETH_HLEN)) { pr_debug("invalid frame detected (ignored)" - "offset[%u]=%u, length=%u, skb=%p\n", + "offset[%u]=%u, length=%u, skb=%pK\n", x, offset, len, skb_in); if (!x) goto err_ndp; diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index 8ba774de3..4fbde8a1f 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c @@ -423,7 +423,7 @@ static int kaweth_download_firmware(struct kaweth_device *kaweth, kaweth->firmware_buf[2]); netdev_dbg(kaweth->net, - "Downloading firmware at %p to kaweth device at %p\n", + "Downloading firmware at %pK to kaweth device at %pK\n", kaweth->firmware_buf, kaweth); netdev_dbg(kaweth->net, "Firmware length: %d\n", data_len); @@ -473,7 +473,7 @@ static int kaweth_reset(struct kaweth_device *kaweth) { int result; - netdev_dbg(kaweth->net, "kaweth_reset(%p)\n", kaweth); + netdev_dbg(kaweth->net, "kaweth_reset(%pK)\n", kaweth); result = usb_reset_configuration(kaweth->dev); mdelay(10); @@ -1018,7 +1018,7 @@ static int kaweth_probe( le16_to_cpu(udev->descriptor.idProduct), le16_to_cpu(udev->descriptor.bcdDevice)); - dev_dbg(dev, "Device at %p\n", udev); + dev_dbg(dev, "Device at %pK\n", udev); dev_dbg(dev, "Descriptor length: %x type: %x\n", (int)udev->descriptor.bLength, diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c index d3527dd8b..38c8a11bb 100644 --- a/drivers/usb/atm/usbatm.c +++ b/drivers/usb/atm/usbatm.c @@ -230,13 +230,13 @@ static int usbatm_submit_urb(struct urb *urb) struct usbatm_channel *channel = urb->context; int ret; - /* vdbg("%s: submitting urb 0x%p, size %u", + /* vdbg("%s: submitting urb 0x%pK, size %u", __func__, urb, urb->transfer_buffer_length); */ ret = usb_submit_urb(urb, GFP_ATOMIC); if (ret) { if (printk_ratelimit()) - atm_warn(channel->usbatm, "%s: urb 0x%p submission failed (%d)!\n", + atm_warn(channel->usbatm, "%s: urb 0x%pK submission failed (%d)!\n", __func__, urb, ret); /* consider all errors transient and return the buffer back to the queue */ @@ -261,7 +261,7 @@ static void usbatm_complete(struct urb *urb) unsigned long flags; int status = urb->status; - /* vdbg("%s: urb 0x%p, status %d, actual_length %d", + /* vdbg("%s: urb 0x%pK, status %d, actual_length %d", __func__, urb, status, urb->actual_length); */ /* usually in_interrupt(), but not always */ @@ -279,7 +279,7 @@ static void usbatm_complete(struct urb *urb) return; if (printk_ratelimit()) - atm_warn(channel->usbatm, "%s: urb 0x%p failed (%d)!\n", + atm_warn(channel->usbatm, "%s: urb 0x%pK failed (%d)!\n", __func__, urb, status); /* throttle processing in case of an error */ mod_timer(&channel->delay, jiffies + msecs_to_jiffies(THROTTLE_MSECS)); @@ -340,7 +340,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char sarb = instance->cached_vcc->sarb; if (sarb->tail + ATM_CELL_PAYLOAD > sarb->end) { - atm_rldbg(instance, "%s: buffer overrun (sarb->len %u, vcc: 0x%p)!\n", + atm_rldbg(instance, "%s: buffer overrun (sarb->len %u, vcc: 0x%pK)!\n", __func__, sarb->len, vcc); /* discard cells already received */ skb_trim(sarb, 0); @@ -359,7 +359,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char /* guard against overflow */ if (length > ATM_MAX_AAL5_PDU) { - atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n", + atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%pK)!\n", __func__, length, vcc); atomic_inc(&vcc->stats->rx_err); goto out; @@ -368,21 +368,21 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char pdu_length = usbatm_pdu_length(length); if (sarb->len < pdu_length) { - atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n", + atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%pK)!\n", __func__, pdu_length, sarb->len, vcc); atomic_inc(&vcc->stats->rx_err); goto out; } if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) { - atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n", + atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%pK)!\n", __func__, vcc); atomic_inc(&vcc->stats->rx_err); goto out; } vdbg(&instance->usb_intf->dev, - "%s: got packet (length: %u, pdu_length: %u, vcc: 0x%p)", + "%s: got packet (length: %u, pdu_length: %u, vcc: 0x%pK)", __func__, length, pdu_length, vcc); if (!(skb = dev_alloc_skb(length))) { @@ -394,7 +394,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char } vdbg(&instance->usb_intf->dev, - "%s: allocated new sk_buff (skb: 0x%p, skb->truesize: %u)", + "%s: allocated new sk_buff (skb: 0x%pK, skb->truesize: %u)", __func__, skb, skb->truesize); if (!atm_charge(vcc, skb->truesize)) { @@ -410,7 +410,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char __skb_put(skb, length); vdbg(&instance->usb_intf->dev, - "%s: sending skb 0x%p, skb->len %u, skb->truesize %u", + "%s: sending skb 0x%pK, skb->len %u, skb->truesize %u", __func__, skb, skb->len, skb->truesize); PACKETDEBUG(instance, skb->data, skb->len); @@ -541,7 +541,7 @@ static void usbatm_rx_process(unsigned long data) while ((urb = usbatm_pop_urb(&instance->rx_channel))) { vdbg(&instance->usb_intf->dev, - "%s: processing urb 0x%p", __func__, urb); + "%s: processing urb 0x%pK", __func__, urb); if (usb_pipeisoc(urb->pipe)) { unsigned char *merge_start = NULL; @@ -616,7 +616,7 @@ static void usbatm_tx_process(unsigned long data) buf_size - bytes_written); vdbg(&instance->usb_intf->dev, - "%s: wrote %u bytes from skb 0x%p to urb 0x%p", + "%s: wrote %u bytes from skb 0x%pK to urb 0x%pK", __func__, bytes_written, skb, urb); if (!UDSL_SKB(skb)->len) { @@ -649,7 +649,7 @@ static void usbatm_cancel_send(struct usbatm_data *instance, spin_lock_irq(&instance->sndqueue.lock); skb_queue_walk_safe(&instance->sndqueue, skb, n) { if (UDSL_SKB(skb)->atm.vcc == vcc) { - atm_dbg(instance, "%s: popping skb 0x%p\n", __func__, skb); + atm_dbg(instance, "%s: popping skb 0x%pK\n", __func__, skb); __skb_unlink(skb, &instance->sndqueue); usbatm_pop(vcc, skb); } @@ -658,7 +658,7 @@ static void usbatm_cancel_send(struct usbatm_data *instance, tasklet_disable(&instance->tx_channel.tasklet); if ((skb = instance->current_skb) && (UDSL_SKB(skb)->atm.vcc == vcc)) { - atm_dbg(instance, "%s: popping current skb (0x%p)\n", __func__, skb); + atm_dbg(instance, "%s: popping current skb (0x%pK)\n", __func__, skb); instance->current_skb = NULL; usbatm_pop(vcc, skb); } @@ -681,7 +681,7 @@ static int usbatm_atm_send(struct atm_vcc *vcc, struct sk_buff *skb) goto fail; } - vdbg(&instance->usb_intf->dev, "%s called (skb 0x%p, len %u)", __func__, + vdbg(&instance->usb_intf->dev, "%s called (skb 0x%pK, len %u)", __func__, skb, skb->len); if (vcc->qos.aal != ATM_AAL5) { @@ -873,7 +873,7 @@ static int usbatm_atm_open(struct atm_vcc *vcc) mutex_unlock(&instance->serialize); - atm_dbg(instance, "%s: allocated vcc data 0x%p\n", __func__, new); + atm_dbg(instance, "%s: allocated vcc data 0x%pK\n", __func__, new); return 0; @@ -893,7 +893,7 @@ static void usbatm_atm_close(struct atm_vcc *vcc) atm_dbg(instance, "%s entered\n", __func__); - atm_dbg(instance, "%s: deallocating vcc 0x%p with vpi %d vci %d\n", + atm_dbg(instance, "%s: deallocating vcc 0x%pK with vpi %d vci %d\n", __func__, vcc_data, vcc_data->vpi, vcc_data->vci); usbatm_cancel_send(instance, vcc); @@ -1162,7 +1162,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id, struct usbatm_channel *channel = i ? &instance->tx_channel : &instance->rx_channel; - dev_dbg(dev, "%s: using %d byte buffer for %s channel 0x%p\n", __func__, channel->buf_size, i ? "tx" : "rx", channel); + dev_dbg(dev, "%s: using %d byte buffer for %s channel 0x%pK\n", __func__, channel->buf_size, i ? "tx" : "rx", channel); } #endif diff --git a/drivers/usb/c67x00/c67x00-sched.c b/drivers/usb/c67x00/c67x00-sched.c index aa491627a..b6d4ea8e5 100644 --- a/drivers/usb/c67x00/c67x00-sched.c +++ b/drivers/usb/c67x00/c67x00-sched.c @@ -154,7 +154,7 @@ static void dbg_td(struct c67x00_hcd *c67x00, struct c67x00_td *td, char *msg) struct device *dev = c67x00_hcd_dev(c67x00); dev_dbg(dev, "### %s at 0x%04x\n", msg, td->td_addr); - dev_dbg(dev, "urb: 0x%p\n", td->urb); + dev_dbg(dev, "urb: 0x%pK\n", td->urb); dev_dbg(dev, "endpoint: %4d\n", usb_pipeendpoint(td->pipe)); dev_dbg(dev, "pipeout: %4d\n", usb_pipeout(td->pipe)); dev_dbg(dev, "ly_base_addr: 0x%04x\n", td_ly_base_addr(td)); diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c index 7ac5fac86..839ff6bc1 100644 --- a/drivers/usb/class/usblp.c +++ b/drivers/usb/class/usblp.c @@ -175,18 +175,18 @@ static void usblp_dump(struct usblp *usblp) struct device *dev = &usblp->intf->dev; int p; - dev_dbg(dev, "usblp=0x%p\n", usblp); - dev_dbg(dev, "dev=0x%p\n", usblp->dev); + dev_dbg(dev, "usblp=0x%pK\n", usblp); + dev_dbg(dev, "dev=0x%pK\n", usblp->dev); dev_dbg(dev, "present=%d\n", usblp->present); - dev_dbg(dev, "readbuf=0x%p\n", usblp->readbuf); + dev_dbg(dev, "readbuf=0x%pK\n", usblp->readbuf); dev_dbg(dev, "readcount=%d\n", usblp->readcount); dev_dbg(dev, "ifnum=%d\n", usblp->ifnum); for (p = USBLP_FIRST_PROTOCOL; p <= USBLP_LAST_PROTOCOL; p++) { dev_dbg(dev, "protocol[%d].alt_setting=%d\n", p, usblp->protocol[p].alt_setting); - dev_dbg(dev, "protocol[%d].epwrite=%p\n", p, + dev_dbg(dev, "protocol[%d].epwrite=%pK\n", p, usblp->protocol[p].epwrite); - dev_dbg(dev, "protocol[%d].epread=%p\n", p, + dev_dbg(dev, "protocol[%d].epread=%pK\n", p, usblp->protocol[p].epread); } dev_dbg(dev, "current_protocol=%d\n", usblp->current_protocol); diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c index 5e3f8c7e5..561ebede4 100644 --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c @@ -373,11 +373,11 @@ static void snoop_urb(struct usb_device *udev, if (userurb) { /* Async */ if (when == SUBMIT) - dev_info(&udev->dev, "userurb %p, ep%d %s-%s, " + dev_info(&udev->dev, "userurb %pK, ep%d %s-%s, " "length %u\n", userurb, ep, t, d, length); else - dev_info(&udev->dev, "userurb %p, ep%d %s-%s, " + dev_info(&udev->dev, "userurb %pK, ep%d %s-%s, " "actual_length %u status %d\n", userurb, ep, t, d, length, timeout_or_status); diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 2ef856180..f2a3cbcc0 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -1623,7 +1623,7 @@ int usb_hcd_unlink_urb (struct urb *urb, int status) if (retval == 0) retval = -EINPROGRESS; else if (retval != -EIDRM && retval != -EBUSY) - dev_dbg(&udev->dev, "hcd_unlink_urb %p fail %d\n", + dev_dbg(&udev->dev, "hcd_unlink_urb %pK fail %d\n", urb, retval); usb_put_dev(udev); } @@ -1705,7 +1705,7 @@ rescan: /* kick hcd */ unlink1(hcd, urb, -ESHUTDOWN); dev_dbg (hcd->self.controller, - "shutdown urb %p ep%d%s%s\n", + "shutdown urb %pK ep%d%s%s\n", urb, usb_endpoint_num(&ep->desc), is_in ? "in" : "out", ({ char *s; diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 1d386030d..397e87ee6 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -225,7 +225,7 @@ static int dwc3_event_buffers_setup(struct dwc3 *dwc) for (n = 0; n < dwc->num_event_buffers; n++) { evt = dwc->ev_buffs[n]; - dev_dbg(dwc->dev, "Event buf %p dma %08llx length %d\n", + dev_dbg(dwc->dev, "Event buf %pK dma %08llx length %d\n", evt->buf, (unsigned long long) evt->dma, evt->length); diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index 27040a631..396696797 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -236,7 +236,7 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request, spin_lock_irqsave(&dwc->lock, flags); if (!dep->endpoint.desc) { - dev_dbg(dwc->dev, "trying to queue request %p to disabled %s\n", + dev_dbg(dwc->dev, "trying to queue request %pK to disabled %s\n", request, dep->name); ret = -ESHUTDOWN; goto out; @@ -248,7 +248,7 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request, goto out; } - dev_vdbg(dwc->dev, "queueing request %p to %s length %d, state '%s'\n", + dev_vdbg(dwc->dev, "queueing request %pK to %s length %d, state '%s'\n", request, dep->name, request->length, dwc3_ep0_state_string(dwc->ep0state)); diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 8f96e7d1d..68dad5d0d 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -280,7 +280,7 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req, &req->request, req->direction); } - dev_dbg(dwc->dev, "request %p from %s completed %d/%d ===> %d\n", + dev_dbg(dwc->dev, "request %pK from %s completed %d/%d ===> %d\n", req, dep->name, req->request.actual, req->request.length, status); @@ -776,7 +776,7 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3 *dwc = dep->dwc; struct dwc3_trb *trb; - dev_vdbg(dwc->dev, "%s: req %p dma %08llx length %d%s%s\n", + dev_vdbg(dwc->dev, "%s: req %pK dma %08llx length %d%s%s\n", dep->name, req, (unsigned long long) dma, length, last ? " last" : "", chain ? " chain" : ""); @@ -1164,12 +1164,12 @@ static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request, int ret; if (!dep->endpoint.desc) { - dev_dbg(dwc->dev, "trying to queue request %p to disabled %s\n", + dev_dbg(dwc->dev, "trying to queue request %pK to disabled %s\n", request, ep->name); return -ESHUTDOWN; } - dev_vdbg(dwc->dev, "queing request %p to %s length %d\n", + dev_vdbg(dwc->dev, "queing request %pK to %s length %d\n", request, ep->name, request->length); spin_lock_irqsave(&dwc->lock, flags); @@ -1208,7 +1208,7 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep, dwc3_stop_active_transfer(dwc, dep->number); goto out1; } - dev_err(dwc->dev, "request %p was not queued to %s\n", + dev_err(dwc->dev, "request %pK was not queued to %s\n", request, ep->name); ret = -EINVAL; goto out0; @@ -1776,7 +1776,7 @@ static int __dwc3_cleanup_done_trbs(struct dwc3 *dwc, struct dwc3_ep *dep, * would help. Lets hope that if this occurs, someone * fixes the root cause instead of looking away :) */ - dev_err(dwc->dev, "%s's TRB (%p) still owned by HW\n", + dev_err(dwc->dev, "%s's TRB (%pK) still owned by HW\n", dep->name, trb); count = trb->size & DWC3_TRB_SIZE_MASK; diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c index 5e29ddeb4..318db26f0 100644 --- a/drivers/usb/early/ehci-dbgp.c +++ b/drivers/usb/early/ehci-dbgp.c @@ -892,7 +892,7 @@ int __init early_dbgp_init(char *s) set_fixmap_nocache(FIX_DBGP_BASE, bar_val & PAGE_MASK); ehci_bar = (void __iomem *)__fix_to_virt(FIX_DBGP_BASE); ehci_bar += bar_val & ~PAGE_MASK; - dbgp_printk("ehci_bar: %p\n", ehci_bar); + dbgp_printk("ehci_bar: %pK\n", ehci_bar); ehci_caps = ehci_bar; ehci_regs = ehci_bar + EARLY_HC_LENGTH(readl(&ehci_caps->hc_capbase)); diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c index f52dcfe8f..c6cc0b77f 100644 --- a/drivers/usb/gadget/amd5536udc.c +++ b/drivers/usb/gadget/amd5536udc.c @@ -532,7 +532,7 @@ udc_alloc_request(struct usb_ep *usbep, gfp_t gfp) return NULL; } - VDBG(ep->dev, "udc_alloc_req: req = %p dma_desc = %p, " + VDBG(ep->dev, "udc_alloc_req: req = %pK dma_desc = %pK, " "td_phys = %lx\n", req, dma_desc, (unsigned long)req->td_phys); @@ -561,10 +561,10 @@ udc_free_request(struct usb_ep *usbep, struct usb_request *usbreq) ep = container_of(usbep, struct udc_ep, ep); req = container_of(usbreq, struct udc_request, req); - VDBG(ep->dev, "free_req req=%p\n", req); + VDBG(ep->dev, "free_req req=%pK\n", req); BUG_ON(!list_empty(&req->queue)); if (req->td_data) { - VDBG(ep->dev, "req->td_data=%p\n", req->td_data); + VDBG(ep->dev, "req->td_data=%pK\n", req->td_data); /* free dma chain if created */ if (req->chain_len > 1) @@ -590,7 +590,7 @@ static void udc_init_bna_dummy(struct udc_request *req) UDC_DMA_STP_STS_BS_DMA_DONE, UDC_DMA_STP_STS_BS); #ifdef UDC_VERBOSE - pr_debug("bna desc = %p, sts = %08x\n", + pr_debug("bna desc = %pK, sts = %08x\n", req->td_data, req->td_data->status); #endif } @@ -730,7 +730,7 @@ static int prep_dma(struct udc_ep *ep, struct udc_request *req, gfp_t gfp) u32 tmp; VDBG(ep->dev, "prep_dma\n"); - VDBG(ep->dev, "prep_dma ep%d req->td_data=%p\n", + VDBG(ep->dev, "prep_dma ep%d req->td_data=%pK\n", ep->num, req->td_data); /* set buffer pointer */ @@ -838,7 +838,7 @@ __acquires(ep->dev->lock) /* remove from ep queue */ list_del_init(&req->queue); - VDBG(ep->dev, "req %p => complete %d bytes at %s with sts %d\n", + VDBG(ep->dev, "req %pK => complete %d bytes at %s with sts %d\n", &req->req, req->req.length, ep->ep.name, sts); spin_unlock(&dev->lock); @@ -856,7 +856,7 @@ static int udc_free_dma_chain(struct udc *dev, struct udc_request *req) struct udc_data_dma *td_last = NULL; unsigned int i; - DBG(dev, "free chain req = %p\n", req); + DBG(dev, "free chain req = %pK\n", req); /* do not free first desc., will be done by free for request */ td_last = req->td_data; @@ -1076,13 +1076,13 @@ udc_queue(struct usb_ep *usbep, struct usb_request *usbreq, gfp_t gfp) /* map dma (usually done before) */ if (ep->dma) { - VDBG(dev, "DMA map req %p\n", req); + VDBG(dev, "DMA map req %pK\n", req); retval = usb_gadget_map_request(&udc->gadget, usbreq, ep->in); if (retval) return retval; } - VDBG(dev, "%s queue req %p, len %d req->td_data=%p buf %p\n", + VDBG(dev, "%s queue req %pK, len %d req->td_data=%pK buf %pK\n", usbep->name, usbreq, usbreq->length, req->td_data, usbreq->buf); @@ -2090,7 +2090,7 @@ static irqreturn_t udc_data_out_isr(struct udc *dev, int ep_ix) req = NULL; udc_rxfifo_pending = 1; } - VDBG(dev, "req = %p\n", req); + VDBG(dev, "req = %pK\n", req); /* fifo mode */ if (!use_dma) { @@ -2141,8 +2141,8 @@ static irqreturn_t udc_data_out_isr(struct udc *dev, int ep_ix) VDBG(dev, "rx bytes=%u\n", count); /* packet per buffer mode - rx bytes */ } else { - VDBG(dev, "req->td_data=%p\n", req->td_data); - VDBG(dev, "last desc = %p\n", td); + VDBG(dev, "req->td_data=%pK\n", req->td_data); + VDBG(dev, "last desc = %pK\n", td); /* received number bytes */ if (use_dma_ppb_du) { /* every desc. counts bytes */ @@ -2363,7 +2363,7 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix) } /* DMA */ } else if (req && !req->dma_going) { - VDBG(dev, "IN DMA : req=%p req->td_data=%p\n", + VDBG(dev, "IN DMA : req=%pK req->td_data=%pK\n", req, req->td_data); if (req->td_data) { diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index 63a8a597a..15d993571 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -269,7 +269,7 @@ static void android_work(struct work_struct *data) kobject_uevent_env(&dev->dev->kobj, KOBJ_CHANGE, uevent_envp); pr_notice("[USB]%s: sent uevent %s\n", __func__, uevent_envp[0]); } else { - pr_notice("[USB]%s: did not send uevent (%d %d %p)\n", __func__, + pr_notice("[USB]%s: did not send uevent (%d %d %pK)\n", __func__, dev->connected, dev->sw_connected, cdev->config); } @@ -705,7 +705,7 @@ static void acm_function_unbind_config(struct android_usb_function *f, /* if (config->instances_on != 0) { for (i = 0; i < config->instances_on; i++) { - pr_notice("%s f_acm[%d]=%p\n", __func__, i, config->f_acm[i]); + pr_notice("%s f_acm[%d]=%pK\n", __func__, i, config->f_acm[i]); usb_remove_function(c, config->f_acm[i]); } } else { @@ -1999,7 +1999,7 @@ android_bind_enabled_functions(struct android_dev *dev, /* Added for USB Develpment debug, more log for more debuging help */ list_for_each_entry(f, &dev->enabled_functions, enabled_list) { - pr_notice("[USB]bind_config function '%s'/%p\n", f->name, f); + pr_notice("[USB]bind_config function '%s'/%pK\n", f->name, f); ret = f->bind_config(f, c); if (ret) { pr_err("%s: %s failed", __func__, f->name); @@ -2016,7 +2016,7 @@ android_unbind_enabled_functions(struct android_dev *dev, struct android_usb_function *f; list_for_each_entry(f, &dev->enabled_functions, enabled_list) { - pr_notice("[USB]unbind_config function '%s'/%p\n", f->name, f); + pr_notice("[USB]unbind_config function '%s'/%pK\n", f->name, f); if (f->unbind_config) f->unbind_config(f, c); } @@ -2214,7 +2214,7 @@ static ssize_t enable_store(struct device *pdev, struct device_attribute *attr, } list_for_each_entry(f, &dev->enabled_functions, enabled_list) { - pr_notice("[USB]enable function '%s'/%p\n", f->name, f); + pr_notice("[USB]enable function '%s'/%pK\n", f->name, f); if (f->enable) f->enable(f); } @@ -2233,7 +2233,7 @@ static ssize_t enable_store(struct device *pdev, struct device_attribute *attr, android_disable(dev); list_for_each_entry(f, &dev->enabled_functions, enabled_list) { - pr_notice("[USB]disable function '%s'/%p\n", f->name, f); + pr_notice("[USB]disable function '%s'/%pK\n", f->name, f); if (f->disable) { f->disable(f); } diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index 55e961317..e52509c83 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c @@ -138,7 +138,7 @@ static void proc_ep_show(struct seq_file *s, struct at91_ep *ep) else list_for_each_entry (req, &ep->queue, queue) { unsigned length = req->req.actual; - seq_printf(s, "\treq %p len %d/%d buf %p\n", + seq_printf(s, "\treq %pK len %d/%d buf %pK\n", &req->req, length, req->req.length, req->req.buf); } @@ -264,7 +264,7 @@ static void done(struct at91_ep *ep, struct at91_request *req, int status) else status = req->req.status; if (status && status != -ESHUTDOWN) - VDBG("%s done %p, status %d\n", ep->ep.name, req, status); + VDBG("%s done %pK, status %d\n", ep->ep.name, req, status); ep->stopped = 1; spin_unlock(&udc->lock); @@ -353,7 +353,7 @@ rescan: if (count == bufferspace) is_done = 1; - PACKET("%s %p out/%d%s\n", ep->ep.name, &req->req, count, + PACKET("%s %pK out/%d%s\n", ep->ep.name, &req->req, count, is_done ? " (done)" : ""); /* @@ -440,7 +440,7 @@ static int write_fifo(struct at91_ep *ep, struct at91_request *req) __raw_writel(csr, creg); req->req.actual += count; - PACKET("%s %p in/%d%s\n", ep->ep.name, &req->req, count, + PACKET("%s %pK in/%d%s\n", ep->ep.name, &req->req, count, is_last ? " (done)" : ""); if (is_last) done(ep, req, 0); diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index 5a5128a22..ec720cbcc 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -360,7 +360,7 @@ static void next_fifo_transaction(struct usba_ep *ep, struct usba_request *req) } else if (transaction_len == ep->ep.maxpacket && req->req.zero) req->last_transaction = 0; - DBG(DBG_QUEUE, "%s: submit_transaction, req %p (length %d)%s\n", + DBG(DBG_QUEUE, "%s: submit_transaction, req %pK (length %d)%s\n", ep->ep.name, req, transaction_len, req->last_transaction ? ", done" : ""); @@ -371,7 +371,7 @@ static void next_fifo_transaction(struct usba_ep *ep, struct usba_request *req) static void submit_request(struct usba_ep *ep, struct usba_request *req) { - DBG(DBG_QUEUE, "%s: submit_request: req %p (length %d)\n", + DBG(DBG_QUEUE, "%s: submit_request: req %pK (length %d)\n", ep->ep.name, req, req->req.length); req->req.actual = 0; @@ -493,7 +493,7 @@ request_complete(struct usba_ep *ep, struct usba_request *req, int status) usb_gadget_unmap_request(&udc->gadget, &req->req, ep->is_in); DBG(DBG_GADGET | DBG_REQ, - "%s: req %p complete: status %d, actual %u\n", + "%s: req %pK complete: status %d, actual %u\n", ep->ep.name, req, req->req.status, req->req.actual); spin_unlock(&udc->lock); @@ -520,7 +520,7 @@ usba_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc) unsigned long flags, ept_cfg, maxpacket; unsigned int nr_trans; - DBG(DBG_GADGET, "%s: ep_enable: desc=%p\n", ep->ep.name, desc); + DBG(DBG_GADGET, "%s: ep_enable: desc=%pK\n", ep->ep.name, desc); maxpacket = usb_endpoint_maxp(desc) & 0x7ff; @@ -672,7 +672,7 @@ usba_ep_alloc_request(struct usb_ep *_ep, gfp_t gfp_flags) { struct usba_request *req; - DBG(DBG_GADGET, "ep_alloc_request: %p, 0x%x\n", _ep, gfp_flags); + DBG(DBG_GADGET, "ep_alloc_request: %pK, 0x%x\n", _ep, gfp_flags); req = kzalloc(sizeof(*req), gfp_flags); if (!req) @@ -688,7 +688,7 @@ usba_ep_free_request(struct usb_ep *_ep, struct usb_request *_req) { struct usba_request *req = to_usba_req(_req); - DBG(DBG_GADGET, "ep_free_request: %p, %p\n", _ep, _req); + DBG(DBG_GADGET, "ep_free_request: %pK, %pK\n", _ep, _req); kfree(req); } @@ -751,7 +751,7 @@ usba_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) unsigned long flags; int ret; - DBG(DBG_GADGET | DBG_QUEUE | DBG_REQ, "%s: queue req %p, len %u\n", + DBG(DBG_GADGET | DBG_QUEUE | DBG_REQ, "%s: queue req %pK, len %u\n", ep->ep.name, req, _req->length); if (!udc->driver || udc->gadget.speed == USB_SPEED_UNKNOWN || @@ -834,7 +834,7 @@ static int usba_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req) unsigned long flags; u32 status; - DBG(DBG_GADGET | DBG_QUEUE, "ep_dequeue: %s, req %p\n", + DBG(DBG_GADGET | DBG_QUEUE, "ep_dequeue: %s, req %pK\n", ep->ep.name, req); spin_lock_irqsave(&udc->lock, flags); @@ -1481,7 +1481,7 @@ restart: return; } - DBG(DBG_FIFO, "Copying ctrl request from 0x%p:\n", ep->fifo); + DBG(DBG_FIFO, "Copying ctrl request from 0x%pK:\n", ep->fifo); memcpy_fromio(crq.data, ep->fifo, sizeof(crq)); /* Free up one bank in the FIFO so that we can @@ -1873,14 +1873,14 @@ static int __init usba_udc_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Unable to map I/O memory, aborting.\n"); goto err_map_regs; } - dev_info(&pdev->dev, "MMIO registers at 0x%08lx mapped at %p\n", + dev_info(&pdev->dev, "MMIO registers at 0x%08lx mapped at %pK\n", (unsigned long)regs->start, udc->regs); udc->fifo = ioremap(fifo->start, resource_size(fifo)); if (!udc->fifo) { dev_err(&pdev->dev, "Unable to map FIFO, aborting.\n"); goto err_map_fifo; } - dev_info(&pdev->dev, "FIFO at 0x%08lx mapped at %p\n", + dev_info(&pdev->dev, "FIFO at 0x%08lx mapped at %pK\n", (unsigned long)fifo->start, udc->fifo); platform_set_drvdata(pdev, udc); diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 6a7b8f6cd..130456b89 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -197,7 +197,7 @@ int usb_add_function(struct usb_configuration *config, pr_debug("[XLOG_DEBUG][USB][COM]%s: \n", __func__); - INFO(config->cdev, "adding '%s'/%p to config '%s'/%p\n", + INFO(config->cdev, "adding '%s'/%pK to config '%s'/%pK\n", function->name, function, config->label, config); @@ -231,7 +231,7 @@ int usb_add_function(struct usb_configuration *config, done: if (value) - INFO(config->cdev, "adding '%s'/%p --> %d\n", + INFO(config->cdev, "adding '%s'/%pK --> %d\n", function->name, function, value); return value; } @@ -240,14 +240,14 @@ EXPORT_SYMBOL_GPL(usb_add_function); void usb_remove_function(struct usb_configuration *c, struct usb_function *f) { if (f->disable) { - INFO(c->cdev, "disable function '%s'/%p\n", f->name, f); + INFO(c->cdev, "disable function '%s'/%pK\n", f->name, f); f->disable(f); } bitmap_zero(f->endpoints, 32); list_del(&f->list); if (f->unbind) { - INFO(c->cdev, "unbind function '%s'/%p\n", f->name, f); + INFO(c->cdev, "unbind function '%s'/%pK\n", f->name, f); f->unbind(c, f); } } @@ -611,7 +611,7 @@ static void reset_config(struct usb_composite_dev *cdev) DBG(cdev, "reset config\n"); list_for_each_entry(f, &cdev->config->functions, list) { - INFO(cdev, "disable function '%s'/%p\n", f->name, f); + INFO(cdev, "disable function '%s'/%pK\n", f->name, f); if (f->disable) f->disable(f); @@ -701,7 +701,7 @@ static int set_config(struct usb_composite_dev *cdev, result = f->set_alt(f, tmp, 0); if (result < 0) { - DBG(cdev, "interface %d (%s/%p) alt 0 --> %d\n", + DBG(cdev, "interface %d (%s/%pK) alt 0 --> %d\n", tmp, f->name, f, result); reset_config(cdev); @@ -776,7 +776,7 @@ int usb_add_config(struct usb_composite_dev *cdev, if (!bind) goto done; - DBG(cdev, "adding config #%u '%s'/%p\n", + DBG(cdev, "adding config #%u '%s'/%pK\n", config->bConfigurationValue, config->label, config); @@ -793,7 +793,7 @@ int usb_add_config(struct usb_composite_dev *cdev, struct usb_function, list); list_del(&f->list); if (f->unbind) { - INFO(cdev, "unbind function '%s'/%p\n", + INFO(cdev, "unbind function '%s'/%pK\n", f->name, f); f->unbind(config, f); /* may free memory for "f" */ @@ -805,7 +805,7 @@ int usb_add_config(struct usb_composite_dev *cdev, } else { unsigned i; - INFO(cdev, "cfg %d/%p speeds:%s%s%s\n", + INFO(cdev, "cfg %d/%pK speeds:%s%s%s\n", config->bConfigurationValue, config, config->superspeed ? " super" : "", config->highspeed ? " high" : "", @@ -820,7 +820,7 @@ int usb_add_config(struct usb_composite_dev *cdev, if (!f) continue; - DBG(cdev, " interface %d = %s/%p\n", + DBG(cdev, " interface %d = %s/%pK\n", i, f->name, f); } } @@ -848,13 +848,13 @@ static void unbind_config(struct usb_composite_dev *cdev, struct usb_function, list); list_del(&f->list); if (f->unbind) { - INFO(cdev, "unbind function '%s'/%p\n", f->name, f); + INFO(cdev, "unbind function '%s'/%pK\n", f->name, f); f->unbind(config, f); /* may free memory for "f" */ } } if (config->unbind) { - INFO(cdev, "unbind config '%s'/%p\n", config->label, config); + INFO(cdev, "unbind config '%s'/%pK\n", config->label, config); config->unbind(config); /* may free memory for "c" */ } diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c index 644c1053d..1ac0355e4 100644 --- a/drivers/usb/gadget/dummy_hcd.c +++ b/drivers/usb/gadget/dummy_hcd.c @@ -637,7 +637,7 @@ static int dummy_queue(struct usb_ep *_ep, struct usb_request *_req, return -ESHUTDOWN; #if 0 - dev_dbg(udc_dev(dum), "ep %p queue req %p to %s, len %d buf %p\n", + dev_dbg(udc_dev(dum), "ep %pK queue req %pK to %s, len %d buf %pK\n", ep, _req, _ep->name, _req->length, _req->buf); #endif _req->status = -EINPROGRESS; @@ -702,7 +702,7 @@ static int dummy_dequeue(struct usb_ep *_ep, struct usb_request *_req) if (retval == 0) { dev_dbg(udc_dev(dum), - "dequeued req %p from %s, len %d buf %p\n", + "dequeued req %pK from %s, len %d buf %pK\n", req, _ep->name, _req->length, _req->buf); _req->complete(_ep, _req); } @@ -1727,7 +1727,7 @@ restart: if (!ep) { /* set_configuration() disagreement */ dev_dbg(dummy_dev(dum_hcd), - "no ep configured for urb %p\n", + "no ep configured for urb %pK\n", urb); status = -EPROTO; goto return_urb; @@ -1742,7 +1742,7 @@ restart: } if (ep->halted && !ep->setup_stage) { /* NOTE: must not be iso! */ - dev_dbg(dummy_dev(dum_hcd), "ep %s halted, urb %p\n", + dev_dbg(dummy_dev(dum_hcd), "ep %s halted, urb %pK\n", ep->ep.name, urb); status = -EPIPE; goto return_urb; @@ -1759,7 +1759,7 @@ restart: list_for_each_entry(req, &ep->queue, queue) { list_del_init(&req->queue); req->req.status = -EOVERFLOW; - dev_dbg(udc_dev(dum), "stale req = %p\n", + dev_dbg(udc_dev(dum), "stale req = %pK\n", req); spin_unlock(&dum->lock); @@ -2252,7 +2252,7 @@ static inline ssize_t show_urb(char *buf, size_t size, struct urb *urb) int ep = usb_pipeendpoint(urb->pipe); return snprintf(buf, size, - "urb/%p %s ep%d%s%s len %d/%d\n", + "urb/%pK %s ep%d%s%s len %d/%d\n", urb, ({ char *s; switch (urb->dev->speed) { diff --git a/drivers/usb/gadget/f_accessory.c b/drivers/usb/gadget/f_accessory.c index 0af20512a..5cb18a20c 100644 --- a/drivers/usb/gadget/f_accessory.c +++ b/drivers/usb/gadget/f_accessory.c @@ -503,7 +503,7 @@ static int create_bulk_endpoints(struct acc_dev *dev, struct usb_ep *ep; int i; - DBG(cdev, "create_bulk_endpoints dev: %p\n", dev); + DBG(cdev, "create_bulk_endpoints dev: %pK\n", dev); ep = usb_ep_autoconfig(cdev->gadget, in_desc); if (!ep) { @@ -593,7 +593,7 @@ requeue_req: r = -EIO; goto done; } else { - pr_debug("rx %p queue\n", req); + pr_debug("rx %pK queue\n", req); } /* wait for a request to complete */ @@ -616,7 +616,7 @@ copy_data: if (req->actual == 0) goto requeue_req; - pr_debug("rx %p %u\n", req, req->actual); + pr_debug("rx %pK %u\n", req, req->actual); xfer = (req->actual < count) ? req->actual : count; r = xfer; if (copy_to_user(buf, req->buf, xfer)) @@ -914,7 +914,7 @@ acc_function_bind(struct usb_configuration *c, struct usb_function *f) int id; int ret; - DBG(cdev, "acc_function_bind dev: %p\n", dev); + DBG(cdev, "acc_function_bind dev: %pK\n", dev); ret = hid_register_driver(&acc_hid_driver); if (ret) @@ -1077,7 +1077,7 @@ static void acc_hid_work(struct work_struct *data) list_for_each_safe(entry, temp, &new_list) { hid = list_entry(entry, struct acc_hid_dev, list); if (acc_hid_init(hid)) { - pr_err("can't add HID device %p\n", hid); + pr_err("can't add HID device %pK\n", hid); acc_hid_delete(hid); } else { spin_lock_irqsave(&dev->lock, flags); diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/f_acm.c index bb2b3e2d7..706849c1c 100644 --- a/drivers/usb/gadget/f_acm.c +++ b/drivers/usb/gadget/f_acm.c @@ -739,7 +739,7 @@ fail: if (acm->port.in) acm->port.in->driver_data = NULL; - ERROR(cdev, "%s/%p: can't bind, err %d\n", f->name, f, status); + ERROR(cdev, "%s/%pK: can't bind, err %d\n", f->name, f, status); return status; } diff --git a/drivers/usb/gadget/f_adb.c b/drivers/usb/gadget/f_adb.c index 3eeb55355..06315b8af 100644 --- a/drivers/usb/gadget/f_adb.c +++ b/drivers/usb/gadget/f_adb.c @@ -343,7 +343,7 @@ static int adb_create_bulk_endpoints(struct adb_dev *dev, struct usb_ep *ep; int i; - DBG(cdev, "%s %s %d: create_bulk_endpoints dev: %p\n", __FILE__, __func__, __LINE__, dev); + DBG(cdev, "%s %s %d: create_bulk_endpoints dev: %pK\n", __FILE__, __func__, __LINE__, dev); ep = usb_ep_autoconfig(cdev->gadget, in_desc); /* __ADB_DEBUG__ start */ @@ -473,13 +473,13 @@ static ssize_t adb_read(struct file *fp, char __user *buf, size_t count, loff_t } } - pr_err("%s %s %d: failed to queue req %p (%d)\n", + pr_err("%s %s %d: failed to queue req %pK (%d)\n", __FILE__, __func__, __LINE__, req, ret); r = -EIO; dev->error = 1; goto done; } else { - pr_debug("%s %s %d: rx %p queue\n", __FILE__, __func__, __LINE__, req); + pr_debug("%s %s %d: rx %pK queue\n", __FILE__, __func__, __LINE__, req); } /* wait for a request to complete */ @@ -496,7 +496,7 @@ static ssize_t adb_read(struct file *fp, char __user *buf, size_t count, loff_t if (req->actual == 0) goto requeue_req; - pr_debug("%s %s %d: rx %p %d\n", __FILE__, __func__, __LINE__, req, req->actual); + pr_debug("%s %s %d: rx %pK %d\n", __FILE__, __func__, __LINE__, req, req->actual); xfer = (req->actual < count) ? req->actual : count; /* __ADB_DEBUG__ start */ @@ -730,7 +730,7 @@ static int adb_open(struct inode *ip, struct file *fp) spin_lock_irqsave(&open_lock, flags); - pr_debug("[adb]adb_open start, adb_open: %p check adb_release %p, open_release_pair: %d\n", + pr_debug("[adb]adb_open start, adb_open: %pK check adb_release %pK, open_release_pair: %d\n", adb_fops.open, adb_fops.release, open_release_pair); if (!_adb_dev) { @@ -773,7 +773,7 @@ static int adb_release(struct inode *ip, struct file *fp) spin_lock_irqsave(&open_lock, flags); pr_debug - ("[adb]adb_release start, adb_open: %p check adb_release %p, open_release_pair: %d\n", + ("[adb]adb_release start, adb_open: %pK check adb_release %pK, open_release_pair: %d\n", adb_fops.open, adb_fops.release, open_release_pair); if (open_release_pair < 1) { @@ -805,7 +805,7 @@ static int adb_function_bind(struct usb_configuration *c, struct usb_function *f int ret; dev->cdev = cdev; - DBG(cdev, "%s %s %d: dev: %p\n", __FILE__, __func__, __LINE__, dev); + DBG(cdev, "%s %s %d: dev: %pK\n", __FILE__, __func__, __LINE__, dev); /* allocate interface ID(s) */ id = usb_interface_id(c, f); @@ -897,7 +897,7 @@ static void adb_function_disable(struct usb_function *f) struct adb_dev *dev = func_to_adb(f); struct usb_composite_dev *cdev = dev->cdev; - DBG(cdev, "%s %s %d: cdev %p\n", __FILE__, __func__, __LINE__, cdev); + DBG(cdev, "%s %s %d: cdev %pK\n", __FILE__, __func__, __LINE__, cdev); dev->online = 0; dev->error = 1; usb_ep_disable(dev->ep_in); diff --git a/drivers/usb/gadget/f_mtp.c b/drivers/usb/gadget/f_mtp.c index 3071c2b9c..1905eb0e6 100644 --- a/drivers/usb/gadget/f_mtp.c +++ b/drivers/usb/gadget/f_mtp.c @@ -762,7 +762,7 @@ static int mtp_create_bulk_endpoints(struct mtp_dev *dev, struct usb_ep *ep; int i; - DBG(cdev, "create_bulk_endpoints dev: %p\n", dev); + DBG(cdev, "create_bulk_endpoints dev: %pK\n", dev); ep = usb_ep_autoconfig(cdev->gadget, in_desc); if (!ep) { @@ -943,7 +943,7 @@ requeue_req: r = -EIO; goto done; } else { - DBG(cdev, "rx %p queue\n", req); + DBG(cdev, "rx %pK queue\n", req); } /* wait for a request to complete */ @@ -968,7 +968,7 @@ requeue_req: if (req->actual == 0) goto requeue_req; - DBG(cdev, "rx %p %d\n", req, req->actual); + DBG(cdev, "rx %pK %d\n", req, req->actual); xfer = (req->actual < count) ? req->actual : count; r = xfer; if (copy_to_user(buf, req->buf, xfer)) @@ -978,7 +978,7 @@ requeue_req: if (req->actual == 0) goto requeue_req; - DBG(dev->cdev, "rx %p %d\n", req, req->actual); + DBG(dev->cdev, "rx %pK %d\n", req, req->actual); xfer = (req->actual < count) ? req->actual : count; r = xfer; if (copy_to_user(buf, req->buf, xfer)) @@ -1261,7 +1261,7 @@ static void send_file_work(struct work_struct *data) } - DBG(dev->cdev, "%s, line = %d: req = 0x%p \n", __func__, __LINE__, req); + DBG(dev->cdev, "%s, line = %d: req = 0x%pK \n", __func__, __LINE__, req); if (req) mtp_req_put(dev, &dev->tx_idle, req); @@ -1367,7 +1367,7 @@ static void receive_file_work(struct work_struct *data) } if (write_req) { - DBG(cdev, "rx %p %d\n", write_req, write_req->actual); + DBG(cdev, "rx %pK %d\n", write_req, write_req->actual); do_gettimeofday(&tv_begin); ret = vfs_write(filp, write_req->buf, write_req->actual, &offset); @@ -1464,7 +1464,7 @@ static void receive_file_work(struct work_struct *data) } if (dev->state == STATE_ERROR || dev->state == STATE_OFFLINE) { - DBG(dev->cdev, "%s, line %d: read_req = %p \n", __func__, __LINE__, read_req); + DBG(dev->cdev, "%s, line %d: read_req = %pK \n", __func__, __LINE__, read_req); if (read_req) { read_req->short_not_ok = 0; } @@ -2088,8 +2088,8 @@ mtp_function_bind(struct usb_configuration *c, struct usb_function *f) int ret; dev->cdev = cdev; - DBG(cdev, "mtp_function_bind dev: %p\n", dev); - printk("mtp_function_bind dev: %p\n", dev); + DBG(cdev, "mtp_function_bind dev: %pK\n", dev); + printk("mtp_function_bind dev: %pK\n", dev); /* allocate interface ID(s) */ id = usb_interface_id(c, f); diff --git a/drivers/usb/gadget/f_obex.c b/drivers/usb/gadget/f_obex.c index 8aa2be532..d916ce5fc 100644 --- a/drivers/usb/gadget/f_obex.c +++ b/drivers/usb/gadget/f_obex.c @@ -401,7 +401,7 @@ fail: if (obex->port.in) obex->port.in->driver_data = NULL; - ERROR(cdev, "%s/%p: can't bind, err %d\n", f->name, f, status); + ERROR(cdev, "%s/%pK: can't bind, err %d\n", f->name, f, status); return status; } diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c index 9fd233003..74aafa81b 100644 --- a/drivers/usb/gadget/fsl_qe_udc.c +++ b/drivers/usb/gadget/fsl_qe_udc.c @@ -110,7 +110,7 @@ static void done(struct qe_ep *ep, struct qe_req *req, int status) : DMA_FROM_DEVICE); if (status && (status != -ESHUTDOWN)) - dev_vdbg(udc->dev, "complete %s req %p stat %d len %u/%u\n", + dev_vdbg(udc->dev, "complete %s req %pK stat %d len %u/%u\n", ep->ep.name, &req->req, status, req->req.actual, req->req.length); diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c index a766a4ca1..1402a2dd5 100644 --- a/drivers/usb/gadget/fsl_udc_core.c +++ b/drivers/usb/gadget/fsl_udc_core.c @@ -188,7 +188,7 @@ static void done(struct fsl_ep *ep, struct fsl_req *req, int status) usb_gadget_unmap_request(&ep->udc->gadget, &req->req, ep_is_in(ep)); if (status && (status != -ESHUTDOWN)) - VDBG("complete %s req %p stat %d len %u/%u", + VDBG("complete %s req %pK stat %d len %u/%u", ep->ep.name, &req->req, status, req->req.actual, req->req.length); @@ -314,7 +314,7 @@ static int dr_controller_setup(struct fsl_udc *udc) tmp &= USB_EP_LIST_ADDRESS_MASK; fsl_writel(tmp, &dr_regs->endpointlistaddr); - VDBG("vir[qh_base] is %p phy[qh_base] is 0x%8x reg is 0x%8x", + VDBG("vir[qh_base] is %pK phy[qh_base] is 0x%8x reg is 0x%8x", udc->ep_qh, (int)tmp, fsl_readl(&dr_regs->endpointlistaddr)); @@ -2167,7 +2167,7 @@ static int fsl_proc_read(struct seq_file *m, void *v) } else { list_for_each_entry(req, &ep->queue, queue) { seq_printf(m, - "req %p actual 0x%x length 0x%x buf %p\n", + "req %pK actual 0x%x length 0x%x buf %pK\n", &req->req, req->req.actual, req->req.length, req->req.buf); } @@ -2186,8 +2186,8 @@ static int fsl_proc_read(struct seq_file *m, void *v) } else { list_for_each_entry(req, &ep->queue, queue) { seq_printf(m, - "req %p actual 0x%x length " - "0x%x buf %p\n", + "req %pK actual 0x%x length " + "0x%x buf %pK\n", &req->req, req->req.actual, req->req.length, req->req.buf); } /* end for each_entry of ep req */ diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c index 52dd6cc6c..af6126693 100644 --- a/drivers/usb/gadget/goku_udc.c +++ b/drivers/usb/gadget/goku_udc.c @@ -314,7 +314,7 @@ done(struct goku_ep *ep, struct goku_request *req, int status) #ifndef USB_TRACE if (status && status != -ESHUTDOWN) #endif - VDBG(dev, "complete %s req %p stat %d len %u/%u\n", + VDBG(dev, "complete %s req %pK stat %d len %u/%u\n", ep->ep.name, &req->req, status, req->req.actual, req->req.length); @@ -386,7 +386,7 @@ static int write_fifo(struct goku_ep *ep, struct goku_request *req) } #if 0 /* printk seemed to trash is_last...*/ //#ifdef USB_TRACE - VDBG(dev, "wrote %s %u bytes%s IN %u left %p\n", + VDBG(dev, "wrote %s %u bytes%s IN %u left %pK\n", ep->ep.name, count, is_last ? "/last" : "", req->req.length - req->req.actual, req); #endif @@ -446,7 +446,7 @@ top: req->req.actual += size; is_short = (size < ep->ep.maxpacket); #ifdef USB_TRACE - VDBG(ep->dev, "read %s %u bytes%s OUT req %p %u/%u\n", + VDBG(ep->dev, "read %s %u bytes%s OUT req %pK %u/%u\n", ep->ep.name, size, is_short ? "/S" : "", req, req->req.actual, req->req.length); #endif @@ -621,7 +621,7 @@ stop: req->req.actual++; #ifdef USB_TRACE - VDBG(dev, "done %s %s dma, %u/%u bytes, req %p\n", + VDBG(dev, "done %s %s dma, %u/%u bytes, req %pK\n", ep->ep.name, ep->is_in ? "IN" : "OUT", req->req.actual, req->req.length, req); #endif @@ -738,7 +738,7 @@ goku_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) } #ifdef USB_TRACE - VDBG(dev, "%s queue req %p, len %u buf %p\n", + VDBG(dev, "%s queue req %pK, len %u buf %pK\n", _ep->name, _req, _req->length, _req->buf); #endif @@ -822,7 +822,7 @@ static int goku_dequeue(struct usb_ep *_ep, struct usb_request *_req) if (dev->ep0state == EP0_SUSPEND) return -EBUSY; - VDBG(dev, "%s %s %s %s %p\n", __func__, _ep->name, + VDBG(dev, "%s %s %s %s %pK\n", __func__, _ep->name, ep->is_in ? "IN" : "OUT", ep->dma ? "dma" : "pio", _req); @@ -1190,7 +1190,7 @@ static int udc_proc_read(struct seq_file *m, void *v) tmp = req->req.actual; if (seq_printf(m, - "\treq %p len %u/%u buf %p\n", + "\treq %pK len %u/%u buf %pK\n", &req->req, tmp, req->req.length, req->req.buf) < 0) goto done; @@ -1768,7 +1768,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id) pci_set_drvdata(pdev, dev); INFO(dev, "%s\n", driver_desc); INFO(dev, "version: " DRIVER_VERSION " %s\n", dmastr()); - INFO(dev, "irq %d, pci mem %p\n", pdev->irq, base); + INFO(dev, "irq %d, pci mem %pK\n", pdev->irq, base); /* init to known state, then setup irqs */ udc_reset(dev); diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c index 9b2d24e4c..cc7593f73 100644 --- a/drivers/usb/gadget/imx_udc.c +++ b/drivers/usb/gadget/imx_udc.c @@ -367,7 +367,7 @@ static void done(struct imx_ep_struct *imx_ep, if (status && status != -ESHUTDOWN) D_ERR(imx_ep->imx_usb->dev, - "<%s> complete %s req %p stat %d len %u/%u\n", __func__, + "<%s> complete %s req %pK stat %d len %u/%u\n", __func__, imx_ep->ep.name, &req->req, status, req->req.actual, req->req.length); @@ -481,7 +481,7 @@ static int read_fifo(struct imx_ep_struct *imx_ep, struct imx_request *req) if (completed || !req->req.length) { done(imx_ep, req, 0); - D_REQ(imx_ep->imx_usb->dev, "<%s> %s req<%p> %s\n", + D_REQ(imx_ep->imx_usb->dev, "<%s> %s req<%pK> %s\n", __func__, imx_ep->ep.name, req, completed ? "completed" : "not completed"); if (!EP_NO(imx_ep)) @@ -510,7 +510,7 @@ static int write_fifo(struct imx_ep_struct *imx_ep, struct imx_request *req) if (unlikely(completed)) { done(imx_ep, req, 0); - D_REQ(imx_ep->imx_usb->dev, "<%s> %s req<%p> %s\n", + D_REQ(imx_ep->imx_usb->dev, "<%s> %s req<%pK> %s\n", __func__, imx_ep->ep.name, req, completed ? "completed" : "not completed"); if (!EP_NO(imx_ep)) @@ -823,7 +823,7 @@ static int imx_ep_queue if (req->in_use) { D_ERR(imx_usb->dev, - "<%s> refusing to queue req %p (already queued)\n", + "<%s> refusing to queue req %pK (already queued)\n", __func__, req); return 0; } diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c index c9e552bdf..a4797bcfd 100644 --- a/drivers/usb/gadget/inode.c +++ b/drivers/usb/gadget/inode.c @@ -310,7 +310,7 @@ nonblock: // case STATE_EP_DISABLED: /* "can't happen" */ // case STATE_EP_READY: /* "can't happen" */ default: /* error! */ - pr_debug ("%s: ep %p not available, state %d\n", + pr_debug ("%s: ep %pK not available, state %d\n", shortname, epdata, epdata->state); // FALLTHROUGH case STATE_EP_UNBOUND: /* clean disconnect */ @@ -1941,7 +1941,7 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) fail: spin_unlock_irq (&dev->lock); - pr_debug ("%s: %s fail %Zd, %p\n", shortname, __func__, value, dev); + pr_debug ("%s: %s fail %Zd, %pK\n", shortname, __func__, value, dev); kfree (dev->buf); dev->buf = NULL; return value; diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c index c2a57023e..272cffc5f 100644 --- a/drivers/usb/gadget/mv_udc_core.c +++ b/drivers/usb/gadget/mv_udc_core.c @@ -242,7 +242,7 @@ static void done(struct mv_ep *ep, struct mv_req *req, int status) usb_gadget_unmap_request(&udc->gadget, &req->req, ep_dir(ep)); if (status && (status != -ESHUTDOWN)) - dev_info(&udc->dev->dev, "complete %s req %p stat %d len %u/%u", + dev_info(&udc->dev->dev, "complete %s req %pK stat %d len %u/%u", ep->ep.name, &req->req, status, req->req.actual, req->req.length); diff --git a/drivers/usb/gadget/net2272.c b/drivers/usb/gadget/net2272.c index f1e50a3e3..44c86d420 100644 --- a/drivers/usb/gadget/net2272.c +++ b/drivers/usb/gadget/net2272.c @@ -387,7 +387,7 @@ net2272_done(struct net2272_ep *ep, struct net2272_request *req, int status) ep->is_in); if (status && status != -ESHUTDOWN) - dev_vdbg(dev->dev, "complete %s req %p stat %d len %u/%u buf %p\n", + dev_vdbg(dev->dev, "complete %s req %pK stat %d len %u/%u buf %pK\n", ep->ep.name, &req->req, status, req->req.actual, req->req.length, req->req.buf); @@ -411,7 +411,7 @@ net2272_write_packet(struct net2272_ep *ep, u8 *buf, length = min(req->req.length - req->req.actual, max); req->req.actual += length; - dev_vdbg(ep->dev->dev, "write packet %s req %p max %u len %u avail %u\n", + dev_vdbg(ep->dev->dev, "write packet %s req %pK max %u len %u avail %u\n", ep->ep.name, req, max, length, (net2272_ep_read(ep, EP_AVAIL1) << 8) | net2272_ep_read(ep, EP_AVAIL0)); @@ -517,7 +517,7 @@ net2272_read_packet(struct net2272_ep *ep, u8 *buf, req->req.actual += avail; - dev_vdbg(ep->dev->dev, "read packet %s req %p len %u avail %u\n", + dev_vdbg(ep->dev->dev, "read packet %s req %pK len %u avail %u\n", ep->ep.name, req, avail, (net2272_ep_read(ep, EP_AVAIL1) << 8) | net2272_ep_read(ep, EP_AVAIL0)); @@ -731,7 +731,7 @@ net2272_kick_dma(struct net2272_ep *ep, struct net2272_request *req) if (req->req.length & 1) return -EINVAL; - dev_vdbg(ep->dev->dev, "kick_dma %s req %p dma %08llx\n", + dev_vdbg(ep->dev->dev, "kick_dma %s req %pK dma %08llx\n", ep->ep.name, req, (unsigned long long) req->req.dma); net2272_ep_write(ep, EP_RSPSET, 1 << ALT_NAK_OUT_PACKETS); @@ -851,7 +851,7 @@ net2272_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) return status; } - dev_vdbg(dev->dev, "%s queue req %p, len %d buf %p dma %08llx %s\n", + dev_vdbg(dev->dev, "%s queue req %pK, len %d buf %pK dma %08llx %s\n", _ep->name, _req, _req->length, _req->buf, (unsigned long long) _req->dma, _req->zero ? "zero" : "!zero"); @@ -1535,7 +1535,7 @@ net2272_handle_dma(struct net2272_ep *ep) else req = NULL; - dev_vdbg(ep->dev->dev, "handle_dma %s req %p\n", ep->ep.name, req); + dev_vdbg(ep->dev->dev, "handle_dma %s req %pK\n", ep->ep.name, req); /* Ensure DREQ is de-asserted */ net2272_write(ep->dev, DMAREQ, @@ -1617,7 +1617,7 @@ net2272_handle_ep(struct net2272_ep *ep) stat1 = net2272_ep_read(ep, EP_STAT1); ep->irqs++; - dev_vdbg(ep->dev->dev, "%s ack ep_stat0 %02x, ep_stat1 %02x, req %p\n", + dev_vdbg(ep->dev->dev, "%s ack ep_stat0 %02x, ep_stat1 %02x, req %pK\n", ep->ep.name, stat0, stat1, req ? &req->req : NULL); net2272_ep_write(ep, EP_STAT0, stat0 & @@ -2268,7 +2268,7 @@ net2272_probe_fin(struct net2272 *dev, unsigned int irqflags) /* done */ dev_info(dev->dev, "%s\n", driver_desc); - dev_info(dev->dev, "irq %i, mem %p, chip rev %04x, dma %s\n", + dev_info(dev->dev, "irq %i, mem %pK, chip rev %04x, dma %s\n", dev->irq, dev->base_addr, dev->chiprev, dma_mode_string()); dev_info(dev->dev, "version: %s\n", driver_vers); diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c index fbd006ab3..cfe8ab31b 100644 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c @@ -474,7 +474,7 @@ write_fifo (struct net2280_ep *ep, struct usb_request *req) if (count > total) /* min() cannot be used on a bitfield */ count = total; - VDEBUG (ep->dev, "write %s fifo (IN) %d bytes%s req %p\n", + VDEBUG (ep->dev, "write %s fifo (IN) %d bytes%s req %pK\n", ep->ep.name, count, (count != ep->ep.maxpacket) ? " (short)" : "", req); @@ -601,7 +601,7 @@ read_fifo (struct net2280_ep *ep, struct net2280_request *req) is_short = (count == 0) || ((count % ep->ep.maxpacket) != 0); - VDEBUG (ep->dev, "read %s fifo (OUT) %d bytes%s%s%s req %p %d/%d\n", + VDEBUG (ep->dev, "read %s fifo (OUT) %d bytes%s%s%s req %pK %d/%d\n", ep->ep.name, count, is_short ? " (short)" : "", cleanup ? " flush" : "", prevent ? " nak" : "", req, req->req.actual, req->req.length); @@ -810,7 +810,7 @@ done (struct net2280_ep *ep, struct net2280_request *req, int status) usb_gadget_unmap_request(&dev->gadget, &req->req, ep->is_in); if (status && status != -ESHUTDOWN) - VDEBUG (dev, "complete %s req %p stat %d len %u/%u\n", + VDEBUG (dev, "complete %s req %pK stat %d len %u/%u\n", ep->ep.name, &req->req, status, req->req.actual, req->req.length); @@ -863,7 +863,7 @@ net2280_queue (struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) } #if 0 - VDEBUG (dev, "%s queue req %p, len %d buf %p\n", + VDEBUG (dev, "%s queue req %pK, len %d buf %pK\n", _ep->name, _req, _req->length, _req->buf); #endif @@ -1039,7 +1039,7 @@ static void restart_dma (struct net2280_ep *ep) struct net2280_request *entry, *prev = NULL; int reqmode, done = 0; - DEBUG (ep->dev, "%s dma hiccup td %p\n", ep->ep.name, req->td); + DEBUG (ep->dev, "%s dma hiccup td %pK\n", ep->ep.name, req->td); ep->in_fifo_validate = likely (req->req.zero || (req->req.length % ep->ep.maxpacket) != 0); if (ep->in_fifo_validate) @@ -1653,14 +1653,14 @@ show_queues (struct device *_dev, struct device_attribute *attr, char *buf) list_for_each_entry (req, &ep->queue, queue) { if (ep->dma && req->td_dma == readl (&ep->dma->dmadesc)) t = scnprintf (next, size, - "\treq %p len %d/%d " - "buf %p (dmacount %08x)\n", + "\treq %pK len %d/%d " + "buf %pK (dmacount %08x)\n", &req->req, req->req.actual, req->req.length, req->req.buf, readl (&ep->dma->dmacount)); else t = scnprintf (next, size, - "\treq %p len %d/%d buf %p\n", + "\treq %pK len %d/%d buf %pK\n", &req->req, req->req.actual, req->req.length, req->req.buf); if (t <= 0 || t > size) @@ -1999,7 +1999,7 @@ static void handle_ep_small (struct net2280_ep *ep) t = readl (&ep->regs->ep_stat); ep->irqs++; #if 0 - VDEBUG (ep->dev, "%s ack ep_stat %08x, req %p\n", + VDEBUG (ep->dev, "%s ack ep_stat %08x, req %pK\n", ep->ep.name, t, req ? &req->req : 0); #endif if (!ep->is_in || ep->dev->pdev->device == 0x2280) @@ -2811,7 +2811,7 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id) /* done */ INFO (dev, "%s\n", driver_desc); - INFO (dev, "irq %d, pci mem %p, chip rev %04x\n", + INFO (dev, "irq %d, pci mem %pK, chip rev %04x\n", pdev->irq, base, dev->chiprev); INFO (dev, "version: " DRIVER_VERSION "; dma %s\n", use_dma diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index b8ed74a82..99c864aca 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c @@ -309,7 +309,7 @@ done(struct omap_ep *ep, struct omap_req *req, int status) #ifndef USB_TRACE if (status && status != -ESHUTDOWN) #endif - VDBG("complete %s req %p stat %d len %u/%u\n", + VDBG("complete %s req %pK stat %d len %u/%u\n", ep->ep.name, &req->req, status, req->req.actual, req->req.length); @@ -821,7 +821,7 @@ static void dma_channel_release(struct omap_ep *ep) active = omap_get_dma_active_status(ep->lch); - DBG("%s release %s %cxdma%d %p\n", ep->ep.name, + DBG("%s release %s %cxdma%d %pK\n", ep->ep.name, active ? "active" : "idle", (ep->bEndpointAddress & USB_DIR_IN) ? 't' : 'r', ep->dma_channel - 1, req); @@ -909,7 +909,7 @@ omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) usb_gadget_map_request(&udc->gadget, &req->req, (ep->bEndpointAddress & USB_DIR_IN)); - VDBG("%s queue req %p, len %d buf %p\n", + VDBG("%s queue req %pK, len %d buf %pK\n", ep->ep.name, _req, _req->length, _req->buf); spin_lock_irqsave(&udc->lock, flags); @@ -2208,7 +2208,7 @@ static void proc_ep_show(struct seq_file *s, struct omap_ep *ep) (ep, req->req.dma + length); buf[0] = 0; } - seq_printf(s, "\treq %p len %d/%d buf %p\n", + seq_printf(s, "\treq %pK len %d/%d buf %pK\n", &req->req, length, req->req.length, req->req.buf); } diff --git a/drivers/usb/gadget/pch_udc.c b/drivers/usb/gadget/pch_udc.c index 24174e1d1..1569d7f76 100644 --- a/drivers/usb/gadget/pch_udc.c +++ b/drivers/usb/gadget/pch_udc.c @@ -1814,7 +1814,7 @@ static void pch_udc_free_request(struct usb_ep *usbep, req = container_of(usbreq, struct pch_udc_request, req); dev = ep->dev; if (!list_empty(&req->queue)) - dev_err(&dev->pdev->dev, "%s: %s req=0x%p queue not empty\n", + dev_err(&dev->pdev->dev, "%s: %s req=0x%pK queue not empty\n", __func__, usbep->name, req); if (req->td_data != NULL) { if (req->chain_len > 1) diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index 95c531d5a..17b0a1dbe 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c @@ -341,7 +341,7 @@ static void done(struct pxa25x_ep *ep, struct pxa25x_request *req, int status) status = req->req.status; if (status && status != -ESHUTDOWN) - DBG(DBG_VERBOSE, "complete %s req %p stat %d len %u/%u\n", + DBG(DBG_VERBOSE, "complete %s req %pK stat %d len %u/%u\n", ep->ep.name, &req->req, status, req->req.actual, req->req.length); @@ -407,7 +407,7 @@ write_fifo (struct pxa25x_ep *ep, struct pxa25x_request *req) is_short = unlikely (max < ep->fifo_size); } - DBG(DBG_VERY_NOISY, "wrote %s %d bytes%s%s %d left %p\n", + DBG(DBG_VERY_NOISY, "wrote %s %d bytes%s%s %d left %pK\n", ep->ep.name, count, is_last ? "/L" : "", is_short ? "/S" : "", req->req.length - req->req.actual, req); @@ -461,7 +461,7 @@ write_ep0_fifo (struct pxa25x_ep *ep, struct pxa25x_request *req) /* last packet "must be" short (or a zlp) */ is_short = (count != EP0_FIFO_SIZE); - DBG(DBG_VERY_NOISY, "ep0in %d bytes %d left %p\n", count, + DBG(DBG_VERY_NOISY, "ep0in %d bytes %d left %pK\n", count, req->req.length - req->req.actual, req); if (unlikely (is_short)) { @@ -535,7 +535,7 @@ read_fifo (struct pxa25x_ep *ep, struct pxa25x_request *req) } else /* zlp */ count = 0; is_short = (count < ep->ep.maxpacket); - DBG(DBG_VERY_NOISY, "read %s %02x, %d bytes%s req %p %d/%d\n", + DBG(DBG_VERY_NOISY, "read %s %02x, %d bytes%s req %pK %d/%d\n", ep->ep.name, udccs, count, is_short ? "/S" : "", req, req->req.actual, req->req.length); @@ -660,7 +660,7 @@ pxa25x_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) && req->req.length > usb_endpoint_maxp(ep->ep.desc))) return -EMSGSIZE; - DBG(DBG_NOISY, "%s queue req %p, len %d buf %p\n", + DBG(DBG_NOISY, "%s queue req %pK, len %d buf %pK\n", _ep->name, _req, _req->length, _req->buf); local_irq_save(flags); @@ -1105,7 +1105,7 @@ udc_seq_show(struct seq_file *m, void *_d) } list_for_each_entry(req, &ep->queue, queue) { seq_printf(m, - "\treq %p len %d/%d buf %p\n", + "\treq %pK len %d/%d buf %pK\n", &req->req, req->req.actual, req->req.length, req->req.buf); } diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index 6b4c7d958..7a886fa46 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c @@ -160,7 +160,7 @@ static int queues_dbg_show(struct seq_file *s, void *p) } list_for_each_entry(req, &ep->queue, queue) { - pos += seq_printf(s, "\treq %p len %d/%d buf %p\n", + pos += seq_printf(s, "\treq %pK len %d/%d buf %pK\n", &req->req, req->req.actual, req->req.length, req->req.buf); } @@ -635,7 +635,7 @@ static void pxa_eps_setup(struct pxa_udc *dev) { unsigned int i; - dev_dbg(dev->dev, "%s: dev=%p\n", __func__, dev); + dev_dbg(dev->dev, "%s: dev=%pK\n", __func__, dev); for (i = 1; i < NR_PXA_ENDPOINTS; i++) pxa_ep_setup(&dev->pxa_ep[i]); @@ -696,7 +696,7 @@ static void ep_add_request(struct pxa_ep *ep, struct pxa27x_request *req) { if (unlikely(!req)) return; - ep_vdbg(ep, "req:%p, lg=%d, udccsr=0x%03x\n", req, + ep_vdbg(ep, "req:%pK, lg=%d, udccsr=0x%03x\n", req, req->req.length, udc_ep_readl(ep, UDCCSR)); req->in_use = 1; @@ -719,7 +719,7 @@ static void ep_del_request(struct pxa_ep *ep, struct pxa27x_request *req) { if (unlikely(!req)) return; - ep_vdbg(ep, "req:%p, lg=%d, udccsr=0x%03x\n", req, + ep_vdbg(ep, "req:%pK, lg=%d, udccsr=0x%03x\n", req, req->req.length, udc_ep_readl(ep, UDCCSR)); list_del_init(&req->queue); @@ -751,7 +751,7 @@ static void req_done(struct pxa_ep *ep, struct pxa27x_request *req, int status, status = req->req.status; if (status && status != -ESHUTDOWN) - ep_dbg(ep, "complete req %p stat %d len %u/%u\n", + ep_dbg(ep, "complete req %pK stat %d len %u/%u\n", &req->req, status, req->req.actual, req->req.length); @@ -957,7 +957,7 @@ static int read_fifo(struct pxa_ep *ep, struct pxa27x_request *req) inc_ep_stats_bytes(ep, count, !USB_DIR_IN); is_short = (count < ep->fifo_size); - ep_dbg(ep, "read udccsr:%03x, count:%d bytes%s req %p %d/%d\n", + ep_dbg(ep, "read udccsr:%03x, count:%d bytes%s req %pK %d/%d\n", udc_ep_readl(ep, UDCCSR), count, is_short ? "/S" : "", &req->req, req->req.actual, req->req.length); @@ -1033,7 +1033,7 @@ static int write_fifo(struct pxa_ep *ep, struct pxa27x_request *req) } } while (!ep_is_full(ep)); - ep_dbg(ep, "wrote count:%d bytes%s%s, left:%d req=%p\n", + ep_dbg(ep, "wrote count:%d bytes%s%s, left:%d req=%pK\n", totcount, is_last ? "/L" : "", is_short ? "/S" : "", req->req.length - req->req.actual, &req->req); @@ -1061,7 +1061,7 @@ static int read_ep0_fifo(struct pxa_ep *ep, struct pxa27x_request *req) inc_ep_stats_bytes(ep, count, !USB_DIR_IN); is_short = (count < ep->fifo_size); - ep_dbg(ep, "read udccsr:%03x, count:%d bytes%s req %p %d/%d\n", + ep_dbg(ep, "read udccsr:%03x, count:%d bytes%s req %pK %d/%d\n", udc_ep_readl(ep, UDCCSR), count, is_short ? "/S" : "", &req->req, req->req.actual, req->req.length); @@ -1104,7 +1104,7 @@ static int write_ep0_fifo(struct pxa_ep *ep, struct pxa27x_request *req) if (unlikely(is_short)) ep_write_UDCCSR(ep, UDCCSR0_IPR); - ep_dbg(ep, "in %d bytes%s%s, %d left, req=%p, udccsr0=0x%03x\n", + ep_dbg(ep, "in %d bytes%s%s, %d left, req=%pK, udccsr0=0x%03x\n", count, is_short ? "/S" : "", is_last ? "/L" : "", req->req.length - req->req.actual, &req->req, udc_ep_readl(ep, UDCCSR)); @@ -1168,7 +1168,7 @@ static int pxa_ep_queue(struct usb_ep *_ep, struct usb_request *_req, recursion_detected = ep->in_handle_ep; is_first_req = list_empty(&ep->queue); - ep_dbg(ep, "queue req %p(first=%s), len %d buf %p\n", + ep_dbg(ep, "queue req %pK(first=%s), len %d buf %pK\n", _req, is_first_req ? "yes" : "no", _req->length, _req->buf); @@ -1179,7 +1179,7 @@ static int pxa_ep_queue(struct usb_ep *_ep, struct usb_request *_req, } if (req->in_use) { - ep_err(ep, "refusing to queue req %p (already queued)\n", req); + ep_err(ep, "refusing to queue req %pK (already queued)\n", req); goto out_locked; } @@ -2004,7 +2004,7 @@ static void handle_ep0(struct pxa_udc *udc, int fifo_irq, int opc_irq) req = list_entry(ep->queue.next, struct pxa27x_request, queue); udccsr0 = udc_ep_readl(ep, UDCCSR); - ep_dbg(ep, "state=%s, req=%p, udccsr0=0x%03x, udcbcr=%d, irq_msk=%x\n", + ep_dbg(ep, "state=%s, req=%pK, udccsr0=0x%03x, udcbcr=%d, irq_msk=%x\n", EP0_STNAME(udc), req, udccsr0, udc_ep_readl(ep, UDCBCR), (fifo_irq << 1 | opc_irq)); @@ -2102,7 +2102,7 @@ static void handle_ep(struct pxa_ep *ep) else req = NULL; - ep_dbg(ep, "req:%p, udccsr 0x%03x loop=%d\n", + ep_dbg(ep, "req:%pK, udccsr 0x%03x loop=%d\n", req, udccsr, loop++); if (unlikely(udccsr & (UDCCSR_SST | UDCCSR_TRN))) diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c index af22f2404..b60c8c3fe 100644 --- a/drivers/usb/gadget/s3c-hsotg.c +++ b/drivers/usb/gadget/s3c-hsotg.c @@ -703,7 +703,7 @@ static void s3c_hsotg_start_req(struct s3c_hsotg *hsotg, ureq->length, ureq->actual); if (0) dev_dbg(hsotg->dev, - "REQ buf %p len %d dma 0x%08x noi=%d zp=%d snok=%d\n", + "REQ buf %pK len %d dma 0x%08x noi=%d zp=%d snok=%d\n", ureq->buf, length, ureq->dma, ureq->no_interrupt, ureq->zero, ureq->short_not_ok); @@ -851,7 +851,7 @@ static int s3c_hsotg_map_dma(struct s3c_hsotg *hsotg, return 0; dma_error: - dev_err(hsotg->dev, "%s: failed to map buffer %p, %d bytes\n", + dev_err(hsotg->dev, "%s: failed to map buffer %pK, %d bytes\n", __func__, req->buf, req->length); return -EIO; @@ -865,7 +865,7 @@ static int s3c_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req, struct s3c_hsotg *hs = hs_ep->parent; bool first; - dev_dbg(hs->dev, "%s: req %p: %d@%p, noi=%d, zero=%d, snok=%d\n", + dev_dbg(hs->dev, "%s: req %pK: %d@%pK, noi=%d, zero=%d, snok=%d\n", ep->name, req, req->length, req->buf, req->no_interrupt, req->zero, req->short_not_ok); @@ -927,7 +927,7 @@ static void s3c_hsotg_complete_oursetup(struct usb_ep *ep, struct s3c_hsotg_ep *hs_ep = our_ep(ep); struct s3c_hsotg *hsotg = hs_ep->parent; - dev_dbg(hsotg->dev, "%s: ep %p, req %p\n", __func__, ep, req); + dev_dbg(hsotg->dev, "%s: ep %pK, req %pK\n", __func__, ep, req); s3c_hsotg_ep_free_request(ep, req); } @@ -977,7 +977,7 @@ static int s3c_hsotg_send_reply(struct s3c_hsotg *hsotg, struct usb_request *req; int ret; - dev_dbg(hsotg->dev, "%s: buff %p, len %d\n", __func__, buff, length); + dev_dbg(hsotg->dev, "%s: buff %pK, len %d\n", __func__, buff, length); req = s3c_hsotg_ep_alloc_request(&ep->ep, GFP_ATOMIC); hsotg->ep0_reply = req; @@ -1337,7 +1337,7 @@ static void s3c_hsotg_complete_request(struct s3c_hsotg *hsotg, return; } - dev_dbg(hsotg->dev, "complete: ep %p %s, req %p, %d => %p\n", + dev_dbg(hsotg->dev, "complete: ep %pK %s, req %pK, %d => %pK\n", hs_ep, hs_ep->ep.name, hs_req, result, hs_req->req.complete); /* @@ -2654,7 +2654,7 @@ static int s3c_hsotg_ep_disable(struct usb_ep *ep) u32 epctrl_reg; u32 ctrl; - dev_info(hsotg->dev, "%s(ep %p)\n", __func__, ep); + dev_info(hsotg->dev, "%s(ep %pK)\n", __func__, ep); if (ep == &hsotg->eps[0].ep) { dev_err(hsotg->dev, "%s: called for ep0\n", __func__); @@ -2712,7 +2712,7 @@ static int s3c_hsotg_ep_dequeue(struct usb_ep *ep, struct usb_request *req) struct s3c_hsotg *hs = hs_ep->parent; unsigned long flags; - dev_info(hs->dev, "ep_dequeue(%p,%p)\n", ep, req); + dev_info(hs->dev, "ep_dequeue(%pK,%pK)\n", ep, req); spin_lock_irqsave(&hs->lock, flags); @@ -2741,7 +2741,7 @@ static int s3c_hsotg_ep_sethalt(struct usb_ep *ep, int value) u32 epctl; u32 xfertype; - dev_info(hs->dev, "%s(ep %p %s, %d)\n", __func__, ep, ep->name, value); + dev_info(hs->dev, "%s(ep %pK %s, %d)\n", __func__, ep, ep->name, value); /* write both IN and OUT control registers */ @@ -2821,7 +2821,7 @@ static void s3c_hsotg_phy_enable(struct s3c_hsotg *hsotg) { struct platform_device *pdev = to_platform_device(hsotg->dev); - dev_dbg(hsotg->dev, "pdev 0x%p\n", pdev); + dev_dbg(hsotg->dev, "pdev 0x%pK\n", pdev); if (hsotg->phy) usb_phy_init(hsotg->phy); @@ -3338,7 +3338,7 @@ static int ep_show(struct seq_file *seq, void *v) seq_printf(seq, "mps %d\n", ep->ep.maxpacket); seq_printf(seq, "total_data=%ld\n", ep->total_data); - seq_printf(seq, "request list (%p,%p):\n", + seq_printf(seq, "request list (%pK,%pK):\n", ep->queue.next, ep->queue.prev); spin_lock_irqsave(&hsotg->lock, flags); @@ -3349,7 +3349,7 @@ static int ep_show(struct seq_file *seq, void *v) break; } - seq_printf(seq, "%c req %p: %d bytes @%p, ", + seq_printf(seq, "%c req %pK: %d bytes @%pK, ", req == ep->req ? '*' : ' ', req, req->req.length, req->req.buf); seq_printf(seq, "%d done, res %d\n", @@ -3515,7 +3515,7 @@ static int s3c_hsotg_probe(struct platform_device *pdev) goto err_clk; } - dev_info(dev, "regs %p, irq %d\n", hsotg->regs, hsotg->irq); + dev_info(dev, "regs %pK, irq %d\n", hsotg->regs, hsotg->irq); hsotg->gadget.max_speed = USB_SPEED_HIGH; hsotg->gadget.ops = &s3c_hsotg_gadget_ops; diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c index 09c4f70c9..2d170320f 100644 --- a/drivers/usb/gadget/s3c2410_udc.c +++ b/drivers/usb/gadget/s3c2410_udc.c @@ -1167,7 +1167,7 @@ s3c2410_udc_alloc_request(struct usb_ep *_ep, gfp_t mem_flags) { struct s3c2410_request *req; - dprintk(DEBUG_VERBOSE, "%s(%p,%d)\n", __func__, _ep, mem_flags); + dprintk(DEBUG_VERBOSE, "%s(%pK,%d)\n", __func__, _ep, mem_flags); if (!_ep) return NULL; @@ -1189,7 +1189,7 @@ s3c2410_udc_free_request(struct usb_ep *_ep, struct usb_request *_req) struct s3c2410_ep *ep = to_s3c2410_ep(_ep); struct s3c2410_request *req = to_s3c2410_req(_req); - dprintk(DEBUG_VERBOSE, "%s(%p,%p)\n", __func__, _ep, _req); + dprintk(DEBUG_VERBOSE, "%s(%pK,%pK)\n", __func__, _ep, _req); if (!ep || !_req || (!ep->ep.desc && _ep->name != ep0name)) return; @@ -1316,7 +1316,7 @@ static int s3c2410_udc_dequeue(struct usb_ep *_ep, struct usb_request *_req) unsigned long flags; struct s3c2410_request *req = NULL; - dprintk(DEBUG_VERBOSE, "%s(%p,%p)\n", __func__, _ep, _req); + dprintk(DEBUG_VERBOSE, "%s(%pK,%pK)\n", __func__, _ep, _req); if (!the_controller->driver) return -ESHUTDOWN; @@ -1339,7 +1339,7 @@ static int s3c2410_udc_dequeue(struct usb_ep *_ep, struct usb_request *_req) if (retval == 0) { dprintk(DEBUG_VERBOSE, - "dequeued req %p from %s, len %d buf %p\n", + "dequeued req %pK from %s, len %d buf %pK\n", req, _ep->name, _req->length, _req->buf); s3c2410_udc_done(ep, req, -ECONNRESET); diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c index e464070e0..17e369a02 100644 --- a/drivers/usb/gadget/u_serial.c +++ b/drivers/usb/gadget/u_serial.c @@ -808,7 +808,7 @@ static int gs_open(struct tty_struct *tty, struct file *file) spin_lock_irq(&port->port_lock); if (status) { - pr_debug("gs_open: ttyGS%d (%p,%p) no buffer\n", + pr_debug("gs_open: ttyGS%d (%pK,%pK) no buffer\n", port->port_num, tty, file); port->openclose = false; goto exit_unlock_port; @@ -838,10 +838,10 @@ static int gs_open(struct tty_struct *tty, struct file *file) gser->connect(gser); } - pr_debug("gs_open: ttyGS%d (%p,%p)\n", port->port_num, tty, file); + pr_debug("gs_open: ttyGS%d (%pK,%pK)\n", port->port_num, tty, file); printk( ACM_LOG \ - "gs_open: ttyGS%d (%p,%p)\n", port->port_num, tty, file); + "gs_open: ttyGS%d (%pK,%pK)\n", port->port_num, tty, file); status = 0; @@ -877,10 +877,10 @@ static void gs_close(struct tty_struct *tty, struct file *file) goto exit; } - pr_debug("gs_close: ttyGS%d (%p,%p) ...\n", port->port_num, tty, file); + pr_debug("gs_close: ttyGS%d (%pK,%pK) ...\n", port->port_num, tty, file); printk( ACM_LOG \ - "gs_close: ttyGS%d (%p,%p) ...\n", port->port_num, tty, file); + "gs_close: ttyGS%d (%pK,%pK) ...\n", port->port_num, tty, file); /* mark port as closing but in use; we can drop port lock * and sleep if necessary @@ -918,7 +918,7 @@ static void gs_close(struct tty_struct *tty, struct file *file) port->openclose = false; - pr_debug("gs_close: ttyGS%d (%p,%p) done!\n", + pr_debug("gs_close: ttyGS%d (%pK,%pK) done!\n", port->port_num, tty, file); wake_up(&port->port.close_wait); @@ -934,13 +934,13 @@ static int gs_write(struct tty_struct *tty, const unsigned char *buf, int count) //ALPS00423739 if(!port) { - printk("ERROR!!! port is closed!! %s, line %d: port = %p\n", __func__, __LINE__, port); + printk("ERROR!!! port is closed!! %s, line %d: port = %pK\n", __func__, __LINE__, port); /*abort immediately after disconnect */ return -EINVAL; } //ALPS00423739 - pr_vdebug("gs_write: ttyGS%d (%p) writing %d bytes\n", + pr_vdebug("gs_write: ttyGS%d (%pK) writing %d bytes\n", port->port_num, tty, count); spin_lock_irqsave(&port->port_lock, flags); @@ -963,13 +963,13 @@ static int gs_put_char(struct tty_struct *tty, unsigned char ch) //ALPS00423739 if(!port) { - printk("ERROR!!! port is closed!! %s, line %d: port = %p\n", __func__, __LINE__, port); + printk("ERROR!!! port is closed!! %s, line %d: port = %pK\n", __func__, __LINE__, port); /*abort immediately after disconnect */ return -EINVAL; } //ALPS00423739 - pr_vdebug("gs_put_char: (%d,%p) char=0x%x, called from %pf\n", + pr_vdebug("gs_put_char: (%d,%pK) char=0x%x, called from %pf\n", port->port_num, tty, ch, __builtin_return_address(0)); spin_lock_irqsave(&port->port_lock, flags); @@ -987,13 +987,13 @@ static void gs_flush_chars(struct tty_struct *tty) //ALPS00423739 if(!port) { - printk("ERROR!!! port is closed!! %s, line %d: port = %p\n", __func__, __LINE__, port); + printk("ERROR!!! port is closed!! %s, line %d: port = %pK\n", __func__, __LINE__, port); /*abort immediately after disconnect */ return; } //ALPS00423739 - pr_vdebug("gs_flush_chars: (%d,%p)\n", port->port_num, tty); + pr_vdebug("gs_flush_chars: (%d,%pK)\n", port->port_num, tty); spin_lock_irqsave(&port->port_lock, flags); if (port->port_usb) @@ -1010,7 +1010,7 @@ static int gs_write_room(struct tty_struct *tty) //ALPS00423739 if(!port) { - printk("ERROR!!! port is closed!! %s, line %d: port = %p\n", __func__, __LINE__, port); + printk("ERROR!!! port is closed!! %s, line %d: port = %pK\n", __func__, __LINE__, port); /*abort immediately after disconnect */ return -EINVAL; } @@ -1021,7 +1021,7 @@ static int gs_write_room(struct tty_struct *tty) room = gs_buf_space_avail(&port->port_write_buf); spin_unlock_irqrestore(&port->port_lock, flags); - pr_vdebug("gs_write_room: (%d,%p) room=%d\n", + pr_vdebug("gs_write_room: (%d,%pK) room=%d\n", port->port_num, tty, room); return room; @@ -1036,7 +1036,7 @@ static int gs_chars_in_buffer(struct tty_struct *tty) //ALPS00423739 if(!port) { - printk("ERROR!!! port is closed!! %s, line %d: port = %p\n", __func__, __LINE__, port); + printk("ERROR!!! port is closed!! %s, line %d: port = %pK\n", __func__, __LINE__, port); /*abort immediately after disconnect */ return -EINVAL; } @@ -1046,7 +1046,7 @@ static int gs_chars_in_buffer(struct tty_struct *tty) chars = gs_buf_data_avail(&port->port_write_buf); spin_unlock_irqrestore(&port->port_lock, flags); - pr_vdebug("gs_chars_in_buffer: (%d,%p) chars=%d\n", + pr_vdebug("gs_chars_in_buffer: (%d,%pK) chars=%d\n", port->port_num, tty, chars); return chars; @@ -1061,7 +1061,7 @@ static void gs_unthrottle(struct tty_struct *tty) //ALPS00423739 if(!port) { - printk("ERROR!!! port is closed!! %s, line %d: port = %p\n", __func__, __LINE__, port); + printk("ERROR!!! port is closed!! %s, line %d: port = %pK\n", __func__, __LINE__, port); /*abort immediately after disconnect */ return; } @@ -1088,7 +1088,7 @@ static int gs_break_ctl(struct tty_struct *tty, int duration) //ALPS00423739 if(!port) { - printk("ERROR!!! port is closed!! %s, line %d: port = %p\n", __func__, __LINE__, port); + printk("ERROR!!! port is closed!! %s, line %d: port = %pK\n", __func__, __LINE__, port); /*abort immediately after disconnect */ return -EINVAL; } 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) diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c index 284b85461..50663dcce 100644 --- a/drivers/usb/misc/adutux.c +++ b/drivers/usb/misc/adutux.c @@ -405,10 +405,10 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count, unsigned long flags; DECLARE_WAITQUEUE(wait, current); - dbg(2," %s : enter, count = %Zd, file=%p", __func__, count, file); + dbg(2," %s : enter, count = %Zd, file=%pK", __func__, count, file); dev = file->private_data; - dbg(2," %s : dev=%p", __func__, dev); + dbg(2," %s : dev=%pK", __func__, dev); if (mutex_lock_interruptible(&dev->mtx)) return -ERESTARTSYS; @@ -832,7 +832,7 @@ static int adu_probe(struct usb_interface *interface, udev->descriptor.idProduct, dev->serial_number, (dev->minor - ADU_MINOR_BASE)); exit: - dbg(2," %s : leave, return value %p (dev)", __func__, dev); + dbg(2," %s : leave, return value %pK (dev)", __func__, dev); return retval; diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c index a4a3c7cd4..aae550219 100644 --- a/drivers/usb/misc/ftdi-elan.c +++ b/drivers/usb/misc/ftdi-elan.c @@ -197,7 +197,7 @@ static struct usb_driver ftdi_elan_driver; static void ftdi_elan_delete(struct kref *kref) { struct usb_ftdi *ftdi = kref_to_usb_ftdi(kref); - dev_warn(&ftdi->udev->dev, "FREEING ftdi=%p\n", ftdi); + dev_warn(&ftdi->udev->dev, "FREEING ftdi=%pK\n", ftdi); usb_put_dev(ftdi->udev); ftdi->disconnected += 1; mutex_lock(&ftdi_module_lock); @@ -579,8 +579,8 @@ static void ftdi_elan_status_work(struct work_struct *work) } else if (ftdi->controlreg & 0x00400000) { if (ftdi->gone_away > 0) { dev_err(&ftdi->udev->dev, "PCI device eject con" - "firmed platform_dev.dev.parent=%p plat" - "form_dev.dev=%p\n", + "firmed platform_dev.dev.parent=%pK plat" + "form_dev.dev=%pK\n", ftdi->platform_dev.dev.parent, &ftdi->platform_dev.dev); platform_device_unregister(&ftdi->platform_dev); @@ -729,7 +729,7 @@ static void ftdi_elan_write_bulk_callback(struct urb *urb) if (status && !(status == -ENOENT || status == -ECONNRESET || status == -ESHUTDOWN)) { - dev_err(&ftdi->udev->dev, "urb=%p write bulk status received: %" + dev_err(&ftdi->udev->dev, "urb=%pK write bulk status received: %" "d\n", urb, status); } usb_free_coherent(urb->dev, urb->transfer_buffer_length, @@ -824,7 +824,7 @@ static int ftdi_elan_command_engine(struct usb_ftdi *ftdi) } retval = usb_submit_urb(urb, GFP_KERNEL); if (retval) { - dev_err(&ftdi->udev->dev, "failed %d to submit urb %p to write " + dev_err(&ftdi->udev->dev, "failed %d to submit urb %pK to write " "%d commands totaling %d bytes to the Uxxx\n", retval, urb, command_size, total_size); usb_free_coherent(ftdi->udev, total_size, buf, urb->transfer_dma); @@ -2816,7 +2816,7 @@ static int ftdi_elan_probe(struct usb_interface *interface, goto error; } else { ftdi->class = &ftdi_elan_jtag_class; - dev_info(&ftdi->udev->dev, "USB FDTI=%p JTAG interface " + dev_info(&ftdi->udev->dev, "USB FDTI=%pK JTAG interface " "%d now attached to ftdi%d\n", ftdi, iface_desc->desc.bInterfaceNumber, interface->minor); @@ -2826,7 +2826,7 @@ static int ftdi_elan_probe(struct usb_interface *interface, ftdi->bulk_in_endpointAddr == 0x83 && ftdi->bulk_out_endpointAddr == 0x04) { ftdi->class = NULL; - dev_info(&ftdi->udev->dev, "USB FDTI=%p ELAN interface %d now a" + dev_info(&ftdi->udev->dev, "USB FDTI=%pK ELAN interface %d now a" "ctivated\n", ftdi, iface_desc->desc.bInterfaceNumber); INIT_DELAYED_WORK(&ftdi->status_work, ftdi_elan_status_work); INIT_DELAYED_WORK(&ftdi->command_work, ftdi_elan_command_work); diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c index b9b356a9d..33a8a417a 100644 --- a/drivers/usb/misc/rio500.c +++ b/drivers/usb/misc/rio500.c @@ -484,7 +484,7 @@ static int probe_rio(struct usb_interface *intf, usb_deregister_dev(intf, &usb_rio_class); return -ENOMEM; } - dev_dbg(&intf->dev, "obuf address:%p\n", rio->obuf); + dev_dbg(&intf->dev, "obuf address:%pK\n", rio->obuf); if (!(rio->ibuf = kmalloc(IBUF_SIZE, GFP_KERNEL))) { dev_err(&dev->dev, @@ -493,7 +493,7 @@ static int probe_rio(struct usb_interface *intf, kfree(rio->obuf); return -ENOMEM; } - dev_dbg(&intf->dev, "ibuf address:%p\n", rio->ibuf); + dev_dbg(&intf->dev, "ibuf address:%pK\n", rio->ibuf); mutex_init(&(rio->lock)); diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c index 20d7e5312..141d1fe6e 100644 --- a/drivers/usb/misc/uss720.c +++ b/drivers/usb/misc/uss720.c @@ -527,7 +527,7 @@ static size_t parport_uss720_epp_write_data(struct parport *pp, const void *buf, return 0; i = usb_bulk_msg(usbdev, usb_sndbulkpipe(usbdev, 1), (void *)buf, length, &rlen, 20000); if (i) - printk(KERN_ERR "uss720: sendbulk ep 1 buf %p len %Zu rlen %u\n", buf, length, rlen); + printk(KERN_ERR "uss720: sendbulk ep 1 buf %pK len %Zu rlen %u\n", buf, length, rlen); change_mode(pp, ECR_PS2); return rlen; #endif @@ -588,7 +588,7 @@ static size_t parport_uss720_ecp_write_data(struct parport *pp, const void *buff return 0; i = usb_bulk_msg(usbdev, usb_sndbulkpipe(usbdev, 1), (void *)buffer, len, &rlen, 20000); if (i) - printk(KERN_ERR "uss720: sendbulk ep 1 buf %p len %Zu rlen %u\n", buffer, len, rlen); + printk(KERN_ERR "uss720: sendbulk ep 1 buf %pK len %Zu rlen %u\n", buffer, len, rlen); change_mode(pp, ECR_PS2); return rlen; } @@ -606,7 +606,7 @@ static size_t parport_uss720_ecp_read_data(struct parport *pp, void *buffer, siz return 0; i = usb_bulk_msg(usbdev, usb_rcvbulkpipe(usbdev, 2), buffer, len, &rlen, 20000); if (i) - printk(KERN_ERR "uss720: recvbulk ep 2 buf %p len %Zu rlen %u\n", buffer, len, rlen); + printk(KERN_ERR "uss720: recvbulk ep 2 buf %pK len %Zu rlen %u\n", buffer, len, rlen); change_mode(pp, ECR_PS2); return rlen; } @@ -639,7 +639,7 @@ static size_t parport_uss720_write_compat(struct parport *pp, const void *buffer return 0; i = usb_bulk_msg(usbdev, usb_sndbulkpipe(usbdev, 1), (void *)buffer, len, &rlen, 20000); if (i) - printk(KERN_ERR "uss720: sendbulk ep 1 buf %p len %Zu rlen %u\n", buffer, len, rlen); + printk(KERN_ERR "uss720: sendbulk ep 1 buf %pK len %Zu rlen %u\n", buffer, len, rlen); change_mode(pp, ECR_PS2); return rlen; } diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c index ad408251d..060d78d53 100644 --- a/drivers/usb/mon/mon_text.c +++ b/drivers/usb/mon/mon_text.c @@ -347,7 +347,7 @@ static int mon_text_open(struct inode *inode, struct file *file) rp->r.rnf_error = mon_text_error; rp->r.rnf_complete = mon_text_complete; - snprintf(rp->slab_name, SLAB_NAME_SZ, "mon_text_%p", rp); + snprintf(rp->slab_name, SLAB_NAME_SZ, "mon_text_%pK", rp); rp->e_slab = kmem_cache_create(rp->slab_name, sizeof(struct mon_event_text), sizeof(long), 0, mon_text_ctor); diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c index 5e63b160d..f38fafdd5 100644 --- a/drivers/usb/musb/blackfin.c +++ b/drivers/usb/musb/blackfin.c @@ -47,7 +47,7 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *src) musb_writew(epio, MUSB_TXCOUNT, len); - dev_dbg(musb->controller, "TX ep%d fifo %p count %d buf %p, epio %p\n", + dev_dbg(musb->controller, "TX ep%d fifo %pK count %d buf %pK, epio %pK\n", hw_ep->epnum, fifo, len, src, epio); dump_fifo_data(src, len); @@ -159,7 +159,7 @@ void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst) *(dst + len - 1) = (u8)inw((unsigned long)fifo + 4); } } - dev_dbg(musb->controller, "%cX ep%d fifo %p count %d buf %p\n", + dev_dbg(musb->controller, "%cX ep%d fifo %pK count %d buf %pK\n", 'R', hw_ep->epnum, fifo, len, dst); dump_fifo_data(dst, len); diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c index 9db211ee1..8a749b4e9 100644 --- a/drivers/usb/musb/cppi_dma.c +++ b/drivers/usb/musb/cppi_dma.c @@ -323,7 +323,7 @@ cppi_channel_allocate(struct dma_controller *c, * with the other DMA engine too */ if (cppi_ch->hw_ep) - dev_dbg(musb->controller, "re-allocating DMA%d %cX channel %p\n", + dev_dbg(musb->controller, "re-allocating DMA%d %cX channel %pK\n", index, transmit ? 'T' : 'R', cppi_ch); cppi_ch->hw_ep = ep; cppi_ch->channel.status = MUSB_DMA_STATUS_FREE; @@ -345,7 +345,7 @@ static void cppi_channel_release(struct dma_channel *channel) tibase = c->controller->tibase; if (!c->hw_ep) dev_dbg(c->controller->musb->controller, - "releasing idle DMA channel %p\n", c); + "releasing idle DMA channel %pK\n", c); else if (!c->transmit) core_rxirq_enable(tibase, c->index + 1); @@ -656,7 +656,7 @@ cppi_next_tx_segment(struct musb *musb, struct cppi_channel *tx) bd->hw_options |= CPPI_ZERO_SET; } - dev_dbg(musb->controller, "TXBD %p: nxt %08x buf %08x len %04x opt %08x\n", + dev_dbg(musb->controller, "TXBD %pK: nxt %08x buf %08x len %04x opt %08x\n", bd, bd->hw_next, bd->hw_bufp, bd->hw_off_len, bd->hw_options); @@ -1110,7 +1110,7 @@ static bool cppi_rx_scan(struct cppi *cppi, unsigned ch) musb_ep_select(cppi->mregs, rx->index + 1); csr = musb_readw(regs, MUSB_RXCSR); if (csr & MUSB_RXCSR_DMAENAB) { - dev_dbg(musb->controller, "list%d %p/%p, last %llx%s, csr %04x\n", + dev_dbg(musb->controller, "list%d %pK/%pK, last %llx%s, csr %04x\n", rx->index, rx->head, rx->tail, rx->last_processed @@ -1216,7 +1216,7 @@ irqreturn_t cppi_interrupt(int irq, void *dev_id) if (bd->hw_options & CPPI_OWN_SET) break; - dev_dbg(musb->controller, "C/TXBD %p n %x b %x off %x opt %x\n", + dev_dbg(musb->controller, "C/TXBD %pK n %x b %x off %x opt %x\n", bd, bd->hw_next, bd->hw_bufp, bd->hw_off_len, bd->hw_options); diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 462a7d57c..560a2dea2 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -241,7 +241,7 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *src) prefetch((u8 *)src); - dev_dbg(musb->controller, "%cX ep%d fifo %p count %d buf %p\n", + dev_dbg(musb->controller, "%cX ep%d fifo %pK count %d buf %pK\n", 'T', hw_ep->epnum, fifo, len, src); /* we can't assume unaligned reads work */ @@ -284,7 +284,7 @@ void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst) if (unlikely(len == 0)) return; - dev_dbg(musb->controller, "%cX ep%d fifo %p count %d buf %p\n", + dev_dbg(musb->controller, "%cX ep%d fifo %pK count %d buf %pK\n", 'R', hw_ep->epnum, fifo, len, dst); /* we can't assume unaligned writes work */ diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index ba7092349..b924a7b91 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -160,11 +160,11 @@ __acquires(ep->musb->lock) unmap_dma_buffer(req, musb); if (request->status == 0) - dev_dbg(musb->controller, "%s done request %p, %d/%d\n", + dev_dbg(musb->controller, "%s done request %pK, %d/%d\n", ep->end_point.name, request, req->request.actual, req->request.length); else - dev_dbg(musb->controller, "%s request %p, %d/%d fault %d\n", + dev_dbg(musb->controller, "%s request %pK, %d/%d fault %d\n", ep->end_point.name, request, req->request.actual, req->request.length, request->status); @@ -464,7 +464,7 @@ void musb_g_tx(struct musb *musb, u8 epnum) csr |= MUSB_TXCSR_P_WZC_BITS; csr &= ~(MUSB_TXCSR_P_UNDERRUN | MUSB_TXCSR_TXPKTRDY); musb_writew(epio, MUSB_TXCSR, csr); - dev_vdbg(musb->controller, "underrun on ep%d, req %p\n", + dev_vdbg(musb->controller, "underrun on ep%d, req %pK\n", epnum, request); } @@ -489,7 +489,7 @@ void musb_g_tx(struct musb *musb, u8 epnum) /* Ensure writebuffer is empty. */ csr = musb_readw(epio, MUSB_TXCSR); request->actual += musb_ep->dma->actual_len; - dev_dbg(musb->controller, "TXCSR%d %04x, DMA off, len %zu, req %p\n", + dev_dbg(musb->controller, "TXCSR%d %04x, DMA off, len %zu, req %pK\n", epnum, csr, musb_ep->dma->actual_len, request); } @@ -844,7 +844,7 @@ void musb_g_rx(struct musb *musb, u8 epnum) csr = musb_readw(epio, MUSB_RXCSR); dma = is_dma_capable() ? musb_ep->dma : NULL; - dev_dbg(musb->controller, "<== %s, rxcsr %04x%s %p\n", musb_ep->end_point.name, + dev_dbg(musb->controller, "<== %s, rxcsr %04x%s %pK\n", musb_ep->end_point.name, csr, dma ? " (dma)" : "", request); if (csr & MUSB_RXCSR_P_SENTSTALL) { @@ -859,7 +859,7 @@ void musb_g_rx(struct musb *musb, u8 epnum) csr &= ~MUSB_RXCSR_P_OVERRUN; musb_writew(epio, MUSB_RXCSR, csr); - dev_dbg(musb->controller, "%s iso overrun on %p\n", musb_ep->name, request); + dev_dbg(musb->controller, "%s iso overrun on %pK\n", musb_ep->name, request); if (request->status == -EINPROGRESS) request->status = -EOVERFLOW; } @@ -884,7 +884,7 @@ void musb_g_rx(struct musb *musb, u8 epnum) request->actual += musb_ep->dma->actual_len; - dev_dbg(musb->controller, "RXCSR%d %04x, dma off, %04x, len %zu, req %p\n", + dev_dbg(musb->controller, "RXCSR%d %04x, dma off, %04x, len %zu, req %pK\n", epnum, csr, musb_readw(epio, MUSB_RXCSR), musb_ep->dma->actual_len, request); @@ -1215,7 +1215,7 @@ struct free_record { */ void musb_ep_restart(struct musb *musb, struct musb_request *req) { - dev_dbg(musb->controller, "<== %s request %p len %u on hw_ep%d\n", + dev_dbg(musb->controller, "<== %s request %pK len %u on hw_ep%d\n", req->tx ? "TX/IN" : "RX/OUT", &req->request, req->request.length, req->epnum); @@ -1249,7 +1249,7 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req, if (request->ep != musb_ep) return -EINVAL; - dev_dbg(musb->controller, "<== to %s request=%p\n", ep->name, req); + dev_dbg(musb->controller, "<== to %s request=%pK\n", ep->name, req); /* request is mine now... */ request->request.actual = 0; @@ -1263,7 +1263,7 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req, /* don't queue if the ep is down */ if (!musb_ep->desc) { - dev_dbg(musb->controller, "req %p queued to %s while ep %s\n", + dev_dbg(musb->controller, "req %pK queued to %s while ep %s\n", req, ep->name, "disabled"); status = -ESHUTDOWN; goto cleanup; @@ -1300,7 +1300,7 @@ static int musb_gadget_dequeue(struct usb_ep *ep, struct usb_request *request) break; } if (r != req) { - dev_dbg(musb->controller, "request %p not queued to %s\n", request, ep->name); + dev_dbg(musb->controller, "request %pK not queued to %s\n", request, ep->name); status = -EINVAL; goto done; } diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index c6cc52016..2f49180bd 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -241,7 +241,7 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh) len = urb->transfer_buffer_length - urb->actual_length; } - dev_dbg(musb->controller, "qh %p urb %p dev%d ep%d%s%s, hw_ep %d, %p/%d\n", + dev_dbg(musb->controller, "qh %pK urb %pK dev%d ep%d%s%s, hw_ep %d, %pK/%d\n", qh, urb, address, qh->epnum, is_in ? "in" : "out", ({char *s; switch (qh->type) { @@ -303,7 +303,7 @@ __releases(musb->lock) __acquires(musb->lock) { dev_dbg(musb->controller, - "complete %p %pF (%d), dev%d ep%d%s, %d/%d\n", + "complete %pK %pF (%d), dev%d ep%d%s, %d/%d\n", urb, urb->complete, status, usb_pipedevice(urb->pipe), usb_pipeendpoint(urb->pipe), @@ -423,7 +423,7 @@ static void musb_advance_schedule(struct musb *musb, struct urb *urb, } if (qh != NULL && qh->is_ready) { - dev_dbg(musb->controller, "... next ep%d %cX urb %p\n", + dev_dbg(musb->controller, "... next ep%d %cX urb %pK\n", hw_ep->epnum, is_in ? 'R' : 'T', next_urb(qh)); musb_start_urb(musb, is_in, qh); } @@ -468,7 +468,7 @@ musb_host_packet_rx(struct musb *musb, struct urb *urb, u8 epnum, u8 iso_err) /* musb_ep_select(mbase, epnum); */ rx_count = musb_readw(epio, MUSB_RXCOUNT); - dev_dbg(musb->controller, "RX%d count %d, buffer %p len %d/%d\n", epnum, rx_count, + dev_dbg(musb->controller, "RX%d count %d, buffer %pK len %d/%d\n", epnum, rx_count, urb->transfer_buffer, qh->offset, urb->transfer_buffer_length); @@ -705,7 +705,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, u8 use_dma = 1; u16 csr; - dev_dbg(musb->controller, "%s hw%d urb %p spd%d dev%d ep%d%s " + dev_dbg(musb->controller, "%s hw%d urb %pK spd%d dev%d ep%d%s " "h_addr%02x h_port%02x bytes %d\n", is_out ? "-->" : "<--", epnum, urb, urb->dev->speed, @@ -1060,7 +1060,7 @@ static bool musb_h_ep0_continue(struct musb *musb, u16 len, struct urb *urb) if (fifo_count) { fifo_dest = (u8 *) (urb->transfer_buffer + urb->actual_length); - dev_dbg(musb->controller, "Sending %d byte%s to ep0 fifo %p\n", + dev_dbg(musb->controller, "Sending %d byte%s to ep0 fifo %pK\n", fifo_count, (fifo_count == 1) ? "" : "s", fifo_dest); @@ -1105,7 +1105,7 @@ irqreturn_t musb_h_ep0_irq(struct musb *musb) ? musb_readb(epio, MUSB_COUNT0) : 0; - dev_dbg(musb->controller, "<== csr0 %04x, qh %p, count %d, urb %p, stage %d\n", + dev_dbg(musb->controller, "<== csr0 %04x, qh %pK, count %d, urb %pK, stage %d\n", csr, qh, len, urb, musb->ep0_stage); /* if we just did status stage, we are done */ @@ -2032,7 +2032,7 @@ static int musb_schedule( idle = 1; qh->mux = 0; hw_ep = musb->endpoints + best_end; - dev_dbg(musb->controller, "qh %p periodic slot %d\n", qh, best_end); + dev_dbg(musb->controller, "qh %pK periodic slot %d\n", qh, best_end); success: if (head) { idle = list_empty(head); @@ -2255,7 +2255,7 @@ static int musb_cleanup_urb(struct urb *urb, struct musb_qh *qh) if (dma) { status = ep->musb->dma_controller->channel_abort(dma); dev_dbg(musb->controller, - "abort %cX%d DMA for urb %p --> %d\n", + "abort %cX%d DMA for urb %pK --> %d\n", is_in ? 'R' : 'T', ep->epnum, urb, status); urb->actual_length += dma->actual_len; @@ -2301,7 +2301,7 @@ static int musb_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) int is_in = usb_pipein(urb->pipe); int ret; - dev_dbg(musb->controller, "urb=%p, dev%d ep%d%s\n", urb, + dev_dbg(musb->controller, "urb=%pK, dev%d ep%d%s\n", urb, usb_pipedevice(urb->pipe), usb_pipeendpoint(urb->pipe), is_in ? "in" : "out"); diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c index 3d1fd52a1..9fe94d92f 100644 --- a/drivers/usb/musb/musbhsdma.c +++ b/drivers/usb/musb/musbhsdma.c @@ -127,7 +127,7 @@ static void configure_channel(struct dma_channel *channel, u8 bchannel = musb_channel->idx; u16 csr = 0; - dev_dbg(musb->controller, "%p, pkt_sz %d, addr 0x%x, len %d, mode %d\n", + dev_dbg(musb->controller, "%pK, pkt_sz %d, addr 0x%x, len %d, mode %d\n", channel, packet_sz, dma_addr, len, mode); if (mode) { @@ -316,7 +316,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) channel->actual_len = addr - musb_channel->start_addr; - dev_dbg(musb->controller, "ch %p, 0x%x -> 0x%x (%zu / %d) %s\n", + dev_dbg(musb->controller, "ch %pK, 0x%x -> 0x%x (%zu / %d) %s\n", channel, musb_channel->start_addr, addr, channel->actual_len, musb_channel->len, diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c index 7369ba33c..eff0fb5b4 100644 --- a/drivers/usb/musb/tusb6010.c +++ b/drivers/usb/musb/tusb6010.c @@ -184,7 +184,7 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *buf) prefetch(buf); - dev_dbg(musb->controller, "%cX ep%d fifo %p count %d buf %p\n", + dev_dbg(musb->controller, "%cX ep%d fifo %pK count %d buf %pK\n", 'T', epnum, fifo, len, buf); if (epnum) @@ -232,7 +232,7 @@ void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *buf) void __iomem *fifo = hw_ep->fifo; u8 epnum = hw_ep->epnum; - dev_dbg(musb->controller, "%cX ep%d fifo %p count %d buf %p\n", + dev_dbg(musb->controller, "%cX ep%d fifo %pK count %d buf %pK\n", 'R', epnum, fifo, len, buf); if (epnum) diff --git a/drivers/usb/renesas_usbhs/mod_host.c b/drivers/usb/renesas_usbhs/mod_host.c index b86815421..5687ae442 100644 --- a/drivers/usb/renesas_usbhs/mod_host.c +++ b/drivers/usb/renesas_usbhs/mod_host.c @@ -583,7 +583,7 @@ static struct usbhsh_device *usbhsh_device_attach(struct usbhsh_hpriv *hpriv, upphub = usbhsh_device_number(hpriv, parent); hubport = usbhsh_device_hubport(udev); - dev_dbg(dev, "%s connecte to Hub [%d:%d](%p)\n", __func__, + dev_dbg(dev, "%s connecte to Hub [%d:%d](%pK)\n", __func__, upphub, hubport, parent); } @@ -591,7 +591,7 @@ static struct usbhsh_device *usbhsh_device_attach(struct usbhsh_hpriv *hpriv, usbhsh_device_number(hpriv, udev), upphub, hubport, usbv->speed); - dev_dbg(dev, "%s [%d](%p)\n", __func__, + dev_dbg(dev, "%s [%d](%pK)\n", __func__, usbhsh_device_number(hpriv, udev), udev); return udev; @@ -606,7 +606,7 @@ static void usbhsh_device_detach(struct usbhsh_hpriv *hpriv, struct usb_device *usbv = usbhsh_udev_to_usbv(udev); unsigned long flags; - dev_dbg(dev, "%s [%d](%p)\n", __func__, + dev_dbg(dev, "%s [%d](%pK)\n", __func__, usbhsh_device_number(hpriv, udev), udev); if (usbhsh_device_has_endpoint(udev)) { diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index a4e5be5ae..9dc3c0f80 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c @@ -109,7 +109,7 @@ static int ch341_control_in(struct usb_device *dev, { int r; - dev_dbg(&dev->dev, "ch341_control_in(%02x,%02x,%04x,%04x,%p,%u)\n", + dev_dbg(&dev->dev, "ch341_control_in(%02x,%02x,%04x,%04x,%pK,%u)\n", USB_DIR_IN|0x40, (int)request, (int)value, (int)index, buf, (int)bufsize); diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c index ea9c4f4ae..bc431126b 100644 --- a/drivers/usb/serial/garmin_gps.c +++ b/drivers/usb/serial/garmin_gps.c @@ -415,7 +415,7 @@ static int gsp_rec_packet(struct garmin_data *garmin_data_p, int count) /* sanity check, remove after test ... */ if ((__u8 *)&(usbdata[3]) != recpkt) { - dev_dbg(dev, "%s - ptr mismatch %p - %p\n", __func__, + dev_dbg(dev, "%s - ptr mismatch %pK - %pK\n", __func__, &(usbdata[4]), recpkt); return -EINVPKT; } diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index 9f24fd776..1043a61f9 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c @@ -759,7 +759,7 @@ static void edge_bulk_out_cmd_callback(struct urb *urb) int status = urb->status; atomic_dec(&CmdUrbs); - dev_dbg(&urb->dev->dev, "%s - FREE URB %p (outstanding %d)\n", + dev_dbg(&urb->dev->dev, "%s - FREE URB %pK (outstanding %d)\n", __func__, urb, atomic_read(&CmdUrbs)); @@ -2216,7 +2216,7 @@ static int write_cmd_usb(struct edgeport_port *edge_port, return -ENOMEM; atomic_inc(&CmdUrbs); - dev_dbg(dev, "%s - ALLOCATE URB %p (outstanding %d)\n", + dev_dbg(dev, "%s - ALLOCATE URB %pK (outstanding %d)\n", __func__, urb, atomic_read(&CmdUrbs)); usb_fill_bulk_urb(urb, edge_serial->serial->dev, diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c index 32a67c69e..034889170 100644 --- a/drivers/usb/serial/keyspan.c +++ b/drivers/usb/serial/keyspan.c @@ -1296,7 +1296,7 @@ static struct urb *keyspan_setup_urb(struct usb_serial *serial, int endpoint, return NULL; } - dev_dbg(&serial->interface->dev, "%s - using urb %p for %s endpoint %x\n", + dev_dbg(&serial->interface->dev, "%s - using urb %pK for %s endpoint %x\n", __func__, urb, ep_type_name, endpoint); return urb; } diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index 2d1ad823b..76808474d 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c @@ -1036,7 +1036,7 @@ static int mos7720_open(struct tty_struct *tty, struct usb_serial_port *port) port_number = port->number - port->serial->minor; read_mos_reg(serial, port_number, LSR, &data); - dev_dbg(&port->dev, "SS::%p LSR:%x\n", mos7720_port, data); + dev_dbg(&port->dev, "SS::%pK LSR:%x\n", mos7720_port, data); write_mos_reg(serial, dummy, SP1_REG, 0x02); write_mos_reg(serial, dummy, SP2_REG, 0x02); diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index f9e43048e..8971f133f 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -2013,7 +2013,7 @@ static void option_instat_callback(struct urb *urb) struct usb_wwan_port_private *portdata = usb_get_serial_port_data(port); - dev_dbg(dev, "%s: urb %p port %p has data %p\n", __func__, urb, port, portdata); + dev_dbg(dev, "%s: urb %pK port %pK has data %pK\n", __func__, urb, port, portdata); if (status == 0) { struct usb_ctrlrequest *req_pkt = diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index af9f82a1f..b12778741 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c @@ -616,7 +616,7 @@ static void sierra_instat_callback(struct urb *urb) struct sierra_port_private *portdata = usb_get_serial_port_data(port); struct usb_serial *serial = port->serial; - dev_dbg(&port->dev, "%s: urb %p port %p has data %p\n", __func__, + dev_dbg(&port->dev, "%s: urb %pK port %pK has data %pK\n", __func__, urb, port, portdata); if (status == 0) { @@ -755,10 +755,10 @@ static struct urb *sierra_setup_urb(struct usb_serial *serial, int endpoint, usb_sndbulkpipe(serial->dev, endpoint) | dir, buf, len, callback, ctx); - dev_dbg(&serial->dev->dev, "%s %c u : %p d:%p\n", __func__, + dev_dbg(&serial->dev->dev, "%s %c u : %pK d:%pK\n", __func__, dir == USB_DIR_IN ? 'i' : 'o', urb, buf); } else { - dev_dbg(&serial->dev->dev, "%s %c u:%p d:%p\n", __func__, + dev_dbg(&serial->dev->dev, "%s %c u:%pK d:%pK\n", __func__, dir == USB_DIR_IN ? 'i' : 'o', urb, buf); sierra_release_urb(urb); diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c index 36f6b6a56..541c2dd92 100644 --- a/drivers/usb/serial/usb_wwan.c +++ b/drivers/usb/serial/usb_wwan.c @@ -247,7 +247,7 @@ int usb_wwan_write(struct tty_struct *tty, struct usb_serial_port *port, err = usb_submit_urb(this_urb, GFP_ATOMIC); if (err) { dev_dbg(&port->dev, - "usb_submit_urb %p (write bulk) failed (%d)\n", + "usb_submit_urb %pK (write bulk) failed (%d)\n", this_urb, err); clear_bit(i, &portdata->out_busy); spin_lock_irqsave(&intfdata->susp_lock, flags); diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index bb7bf198c..354cbd1f3 100644 --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c @@ -324,7 +324,7 @@ static int queuecommand_lck(struct scsi_cmnd *srb, /* check for state-transition errors */ if (us->srb != NULL) { - printk(KERN_ERR USB_STORAGE "Error in %s: us->srb = %p\n", + printk(KERN_ERR USB_STORAGE "Error in %s: us->srb = %pK\n", __func__, us->srb); return SCSI_MLQUEUE_HOST_BUSY; } diff --git a/drivers/usb/wusbcore/rh.c b/drivers/usb/wusbcore/rh.c index 59ff254df..078588636 100644 --- a/drivers/usb/wusbcore/rh.c +++ b/drivers/usb/wusbcore/rh.c @@ -383,7 +383,7 @@ int wusbhc_rh_control(struct usb_hcd *usb_hcd, u16 reqntype, u16 wValue, case SetHubFeature: default: - dev_err(wusbhc->dev, "%s (%p [%p], %x, %x, %x, %p, %x) " + dev_err(wusbhc->dev, "%s (%pK [%pK], %x, %x, %x, %pK, %x) " "UNIMPLEMENTED\n", __func__, usb_hcd, wusbhc, reqntype, wValue, wIndex, buf, wLength); /* dump_stack(); */ @@ -396,7 +396,7 @@ EXPORT_SYMBOL_GPL(wusbhc_rh_control); int wusbhc_rh_suspend(struct usb_hcd *usb_hcd) { struct wusbhc *wusbhc = usb_hcd_to_wusbhc(usb_hcd); - dev_err(wusbhc->dev, "%s (%p [%p]) UNIMPLEMENTED\n", __func__, + dev_err(wusbhc->dev, "%s (%pK [%pK]) UNIMPLEMENTED\n", __func__, usb_hcd, wusbhc); /* dump_stack(); */ return -ENOSYS; @@ -406,7 +406,7 @@ EXPORT_SYMBOL_GPL(wusbhc_rh_suspend); int wusbhc_rh_resume(struct usb_hcd *usb_hcd) { struct wusbhc *wusbhc = usb_hcd_to_wusbhc(usb_hcd); - dev_err(wusbhc->dev, "%s (%p [%p]) UNIMPLEMENTED\n", __func__, + dev_err(wusbhc->dev, "%s (%pK [%pK]) UNIMPLEMENTED\n", __func__, usb_hcd, wusbhc); /* dump_stack(); */ return -ENOSYS; @@ -416,7 +416,7 @@ EXPORT_SYMBOL_GPL(wusbhc_rh_resume); int wusbhc_rh_start_port_reset(struct usb_hcd *usb_hcd, unsigned port_idx) { struct wusbhc *wusbhc = usb_hcd_to_wusbhc(usb_hcd); - dev_err(wusbhc->dev, "%s (%p [%p], port_idx %u) UNIMPLEMENTED\n", + dev_err(wusbhc->dev, "%s (%pK [%pK], port_idx %u) UNIMPLEMENTED\n", __func__, usb_hcd, wusbhc, port_idx); WARN_ON(1); return -ENOSYS; diff --git a/drivers/usb/wusbcore/wa-nep.c b/drivers/usb/wusbcore/wa-nep.c index f67f7f1e6..dddb39b13 100644 --- a/drivers/usb/wusbcore/wa-nep.c +++ b/drivers/usb/wusbcore/wa-nep.c @@ -182,7 +182,7 @@ static int wa_nep_queue(struct wahc *wa, size_t size) struct device *dev = &wa->usb_iface->dev; struct wa_notif_work *nw; - /* dev_fnstart(dev, "(wa %p, size %zu)\n", wa, size); */ + /* dev_fnstart(dev, "(wa %pK, size %zu)\n", wa, size); */ BUG_ON(size > wa->nep_buffer_size); if (size == 0) goto out; @@ -205,7 +205,7 @@ static int wa_nep_queue(struct wahc *wa, size_t size) atomic_inc(&wa->notifs_queued); /* Throttling ctl */ queue_work(wusbd, &nw->work); out: - /* dev_fnend(dev, "(wa %p, size %zu) = result\n", wa, size, result); */ + /* dev_fnend(dev, "(wa %pK, size %zu) = result\n", wa, size, result); */ return result; } diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c index 028fc8337..dd4ba4f03 100644 --- a/drivers/usb/wusbcore/wa-xfer.c +++ b/drivers/usb/wusbcore/wa-xfer.c @@ -250,7 +250,7 @@ static unsigned __wa_xfer_is_done(struct wa_xfer *xfer) switch (seg->status) { case WA_SEG_DONE: if (found_short && seg->result > 0) { - dev_dbg(dev, "xfer %p#%u: bad short segments (%zu)\n", + dev_dbg(dev, "xfer %pK#%u: bad short segments (%zu)\n", xfer, cnt, seg->result); urb->status = -EINVAL; goto out; @@ -259,23 +259,23 @@ static unsigned __wa_xfer_is_done(struct wa_xfer *xfer) if (seg->result < xfer->seg_size && cnt != xfer->segs-1) found_short = 1; - dev_dbg(dev, "xfer %p#%u: DONE short %d " + dev_dbg(dev, "xfer %pK#%u: DONE short %d " "result %zu urb->actual_length %d\n", xfer, seg->index, found_short, seg->result, urb->actual_length); break; case WA_SEG_ERROR: xfer->result = seg->result; - dev_dbg(dev, "xfer %p#%u: ERROR result %zu\n", + dev_dbg(dev, "xfer %pK#%u: ERROR result %zu\n", xfer, seg->index, seg->result); goto out; case WA_SEG_ABORTED: - dev_dbg(dev, "xfer %p#%u ABORTED: result %d\n", + dev_dbg(dev, "xfer %pK#%u ABORTED: result %d\n", xfer, seg->index, urb->status); xfer->result = urb->status; goto out; default: - dev_warn(dev, "xfer %p#%u: is_done bad state %d\n", + dev_warn(dev, "xfer %pK#%u: is_done bad state %d\n", xfer, cnt, seg->status); xfer->result = -EINVAL; goto out; @@ -387,7 +387,7 @@ static void __wa_xfer_abort(struct wa_xfer *xfer) error_submit: if (printk_ratelimit()) - dev_err(dev, "xfer %p: Can't submit abort request: %d\n", + dev_err(dev, "xfer %pK: Can't submit abort request: %d\n", xfer, result); kfree(b); error_kmalloc: @@ -517,7 +517,7 @@ static void wa_seg_dto_cb(struct urb *urb) spin_lock_irqsave(&xfer->lock, flags); wa = xfer->wa; dev = &wa->usb_iface->dev; - dev_dbg(dev, "xfer %p#%u: data out done (%d bytes)\n", + dev_dbg(dev, "xfer %pK#%u: data out done (%d bytes)\n", xfer, seg->index, urb->actual_length); if (seg->status < WA_SEG_PENDING) seg->status = WA_SEG_PENDING; @@ -532,7 +532,7 @@ static void wa_seg_dto_cb(struct urb *urb) wa = xfer->wa; dev = &wa->usb_iface->dev; rpipe = xfer->ep->hcpriv; - dev_dbg(dev, "xfer %p#%u: data out error %d\n", + dev_dbg(dev, "xfer %pK#%u: data out error %d\n", xfer, seg->index, urb->status); if (edc_inc(&wa->nep_edc, EDC_MAX_ERRORS, EDC_ERROR_TIMEFRAME)){ @@ -590,7 +590,7 @@ static void wa_seg_cb(struct urb *urb) spin_lock_irqsave(&xfer->lock, flags); wa = xfer->wa; dev = &wa->usb_iface->dev; - dev_dbg(dev, "xfer %p#%u: request done\n", xfer, seg->index); + dev_dbg(dev, "xfer %pK#%u: request done\n", xfer, seg->index); if (xfer->is_inbound && seg->status < WA_SEG_PENDING) seg->status = WA_SEG_PENDING; spin_unlock_irqrestore(&xfer->lock, flags); @@ -604,7 +604,7 @@ static void wa_seg_cb(struct urb *urb) dev = &wa->usb_iface->dev; rpipe = xfer->ep->hcpriv; if (printk_ratelimit()) - dev_err(dev, "xfer %p#%u: request error %d\n", + dev_err(dev, "xfer %pK#%u: request error %d\n", xfer, seg->index, urb->status); if (edc_inc(&wa->nep_edc, EDC_MAX_ERRORS, EDC_ERROR_TIMEFRAME)){ @@ -728,7 +728,7 @@ static int __wa_xfer_setup(struct wa_xfer *xfer, struct urb *urb) xfer_hdr_size = result; result = __wa_xfer_setup_segs(xfer, xfer_hdr_size); if (result < 0) { - dev_err(dev, "xfer %p: Failed to allocate %d segments: %d\n", + dev_err(dev, "xfer %pK: Failed to allocate %d segments: %d\n", xfer, xfer->segs, result); goto error_setup_segs; } @@ -771,14 +771,14 @@ static int __wa_seg_submit(struct wa_rpipe *rpipe, struct wa_xfer *xfer, int result; result = usb_submit_urb(&seg->urb, GFP_ATOMIC); if (result < 0) { - printk(KERN_ERR "xfer %p#%u: REQ submit failed: %d\n", + printk(KERN_ERR "xfer %pK#%u: REQ submit failed: %d\n", xfer, seg->index, result); goto error_seg_submit; } if (seg->dto_urb) { result = usb_submit_urb(seg->dto_urb, GFP_ATOMIC); if (result < 0) { - printk(KERN_ERR "xfer %p#%u: DTO submit failed: %d\n", + printk(KERN_ERR "xfer %pK#%u: DTO submit failed: %d\n", xfer, seg->index, result); goto error_dto_submit; } @@ -818,7 +818,7 @@ static void wa_xfer_delayed_run(struct wa_rpipe *rpipe) list_del(&seg->list_node); xfer = seg->xfer; result = __wa_seg_submit(rpipe, xfer, seg); - dev_dbg(dev, "xfer %p#%u submitted from delayed [%d segments available] %d\n", + dev_dbg(dev, "xfer %pK#%u submitted from delayed [%d segments available] %d\n", xfer, seg->index, atomic_read(&rpipe->segs_available), result); if (unlikely(result < 0)) { spin_unlock_irqrestore(&rpipe->seg_lock, flags); @@ -863,11 +863,11 @@ static int __wa_xfer_submit(struct wa_xfer *xfer) available = atomic_read(&rpipe->segs_available); empty = list_empty(&rpipe->seg_list); seg = xfer->seg[cnt]; - dev_dbg(dev, "xfer %p#%u: available %u empty %u (%s)\n", + dev_dbg(dev, "xfer %pK#%u: available %u empty %u (%s)\n", xfer, cnt, available, empty, available == 0 || !empty ? "delayed" : "submitted"); if (available == 0 || !empty) { - dev_dbg(dev, "xfer %p#%u: delayed\n", xfer, cnt); + dev_dbg(dev, "xfer %pK#%u: delayed\n", xfer, cnt); seg->status = WA_SEG_DELAYED; list_add_tail(&seg->list_node, &rpipe->seg_list); } else { @@ -1029,7 +1029,7 @@ int wa_urb_enqueue(struct wahc *wa, struct usb_host_endpoint *ep, if (urb->transfer_buffer == NULL && !(urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP) && urb->transfer_buffer_length != 0) { - dev_err(dev, "BUG? urb %p: NULL xfer buffer & NODMA\n", urb); + dev_err(dev, "BUG? urb %pK: NULL xfer buffer & NODMA\n", urb); dump_stack(); } @@ -1048,7 +1048,7 @@ int wa_urb_enqueue(struct wahc *wa, struct usb_host_endpoint *ep, xfer->ep = ep; urb->hcpriv = xfer; - dev_dbg(dev, "xfer %p urb %p pipe 0x%02x [%d bytes] %s %s %s\n", + dev_dbg(dev, "xfer %pK urb %pK pipe 0x%02x [%d bytes] %s %s %s\n", xfer, urb, urb->pipe, urb->transfer_buffer_length, urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP ? "dma" : "nodma", urb->pipe & USB_DIR_IN ? "inbound" : "outbound", @@ -1130,7 +1130,7 @@ int wa_urb_dequeue(struct wahc *wa, struct urb *urb) switch (seg->status) { case WA_SEG_NOTREADY: case WA_SEG_READY: - printk(KERN_ERR "xfer %p#%u: dequeue bad state %u\n", + printk(KERN_ERR "xfer %pK#%u: dequeue bad state %u\n", xfer, cnt, seg->status); WARN_ON(1); break; @@ -1267,7 +1267,7 @@ static void wa_xfer_result_chew(struct wahc *wa, struct wa_xfer *xfer) seg = xfer->seg[seg_idx]; rpipe = xfer->ep->hcpriv; usb_status = xfer_result->bTransferStatus; - dev_dbg(dev, "xfer %p#%u: bTransferStatus 0x%02x (seg %u)\n", + dev_dbg(dev, "xfer %pK#%u: bTransferStatus 0x%02x (seg %u)\n", xfer, seg_idx, usb_status, seg->status); if (seg->status == WA_SEG_ABORTED || seg->status == WA_SEG_ERROR) /* already handled */ @@ -1276,13 +1276,13 @@ static void wa_xfer_result_chew(struct wahc *wa, struct wa_xfer *xfer) seg->status = WA_SEG_PENDING; /* before wa_seg{_dto}_cb() */ if (seg->status != WA_SEG_PENDING) { if (printk_ratelimit()) - dev_err(dev, "xfer %p#%u: Bad segment state %u\n", + dev_err(dev, "xfer %pK#%u: Bad segment state %u\n", xfer, seg_idx, seg->status); seg->status = WA_SEG_PENDING; /* workaround/"fix" it */ } if (usb_status & 0x80) { seg->result = wa_xfer_status_to_errno(usb_status); - dev_err(dev, "DTI: xfer %p#%u failed (0x%02x)\n", + dev_err(dev, "DTI: xfer %pK#%u failed (0x%02x)\n", xfer, seg->index, usb_status); goto error_complete; } @@ -1333,7 +1333,7 @@ error_submit_buf_in: wa_reset_all(wa); } if (printk_ratelimit()) - dev_err(dev, "xfer %p#%u: can't submit DTI data phase: %d\n", + dev_err(dev, "xfer %pK#%u: can't submit DTI data phase: %d\n", xfer, seg_idx, result); seg->result = result; error_complete: @@ -1353,7 +1353,7 @@ error_bad_seg: spin_unlock_irqrestore(&xfer->lock, flags); wa_urb_dequeue(wa, xfer->urb); if (printk_ratelimit()) - dev_err(dev, "xfer %p#%u: bad segment\n", xfer, seg_idx); + dev_err(dev, "xfer %pK#%u: bad segment\n", xfer, seg_idx); if (edc_inc(&wa->dti_edc, EDC_MAX_ERRORS, EDC_ERROR_TIMEFRAME)) { dev_err(dev, "DTI: URB max acceptable errors " "exceeded, resetting device\n"); @@ -1393,7 +1393,7 @@ static void wa_buf_in_cb(struct urb *urb) wa = xfer->wa; dev = &wa->usb_iface->dev; rpipe = xfer->ep->hcpriv; - dev_dbg(dev, "xfer %p#%u: data in done (%zu bytes)\n", + dev_dbg(dev, "xfer %pK#%u: data in done (%zu bytes)\n", xfer, seg->index, (size_t)urb->actual_length); seg->status = WA_SEG_DONE; seg->result = urb->actual_length; @@ -1415,7 +1415,7 @@ static void wa_buf_in_cb(struct urb *urb) dev = &wa->usb_iface->dev; rpipe = xfer->ep->hcpriv; if (printk_ratelimit()) - dev_err(dev, "xfer %p#%u: data in error %d\n", + dev_err(dev, "xfer %pK#%u: data in error %d\n", xfer, seg->index, urb->status); if (edc_inc(&wa->nep_edc, EDC_MAX_ERRORS, EDC_ERROR_TIMEFRAME)){ @@ -1477,7 +1477,7 @@ static void wa_xfer_result_cb(struct urb *urb) switch (wa->dti_urb->status) { case 0: /* We have a xfer result buffer; check it */ - dev_dbg(dev, "DTI: xfer result %d bytes at %p\n", + dev_dbg(dev, "DTI: xfer result %d bytes at %pK\n", urb->actual_length, urb->transfer_buffer); if (wa->dti_urb->actual_length != sizeof(*xfer_result)) { dev_err(dev, "DTI Error: xfer result--bad size " |