Merge "usb: host: replace %p with %pK" (f9fd1308) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/usb/core/devio.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

drivers/usb/core/hcd.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1643,7 +1643,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);
		}
		@@ -1812,7 +1812,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;

drivers/usb/core/urb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -336,7 +336,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
		if (!urb \|\| !urb->complete)
		return -EINVAL;
		if (urb->hcpriv) {
		WARN_ONCE(1, "URB %p submitted while active\n", urb);
		WARN_ONCE(1, "URB %pK submitted while active\n", urb);
		return -EBUSY;
		}

drivers/usb/host/ehci-dbg.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -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,
		@@ -436,7 +436,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,
		@@ -464,7 +464,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;
		@@ -661,7 +661,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->ps.period,
		hc32_to_cpup(ehci,
		&hw->hw_info2)
		@@ -723,20 +723,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->ps.period,
		hc32_to_cpup(ehci, &p.sitd->hw_uframe)
		& 0x0000ffff,
		@@ -908,7 +908,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;

drivers/usb/host/ehci-hcd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1006,7 +1006,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;