Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25c9b535 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: host: replace %p with %pK"

parents 455f1374 61b86dc3

drivers/usb/host/ehci-dbg.c

+14 −14
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static 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),
@@ -107,7 +107,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);

}
@@ -115,7 +115,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 %p\n",

		label, itd->frame, itd, hc32_to_cpu(ehci, itd->hw_next),

		itd->urb);

	ehci_dbg(ehci,
@@ -146,7 +146,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 %p\n",

		label, sitd->frame, sitd, hc32_to_cpu(ehci, sitd->hw_next),

		sitd->urb);

	ehci_dbg(ehci,
@@ -406,7 +406,7 @@ static void qh_lines(struct ehci_hcd *ehci, struct ehci_qh *qh, 
	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)"

			" [cur %08x next %08x buf[0] %08x]",

			qh, scratch & 0x007f,

			speed_char (scratch),
@@ -454,7 +454,7 @@ static void qh_lines(struct ehci_hcd *ehci, struct ehci_qh *qh, 
			break;

		}

		temp = scnprintf(next, size,

				"\n\t%p%c%s len=%d %08x urb %p"

				"\n\t%pK%c%s len=%d %08x urb %pK"

				" [td %08x buf[0] %08x]",

				td, mark, type,

				(scratch >> 16) & 0x7fff,
@@ -674,7 +674,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)
@@ -710,20 +710,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,
@@ -895,7 +895,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
@@ -1017,7 +1017,7 @@ ehci_endpoint_disable (struct usb_hcd *hcd, struct usb_host_endpoint *ep) 
		/* 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;

drivers/usb/host/ehci-q.c

+4 −4
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ ehci_urb_done(struct ehci_hcd *ehci, struct urb *urb, int status) 


#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",
@@ -354,7 +354,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",
@@ -931,7 +931,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);
@@ -1119,7 +1119,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,

drivers/usb/host/ehci-sched.c

+11 −11
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ static void qh_link_periodic(struct ehci_hcd *ehci, struct ehci_qh *qh) 
	unsigned	period = qh->ps.period;



	dev_dbg(&qh->ps.udev->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->ps.phase, qh->ps.usecs, qh->ps.c_usecs);
@@ -642,7 +642,7 @@ static void qh_unlink_periodic(struct ehci_hcd *ehci, struct ehci_qh *qh) 
		: (qh->ps.usecs * 8);



	dev_dbg(&qh->ps.udev->dev,

		"unlink qh%d-%04x/%p start %d [%d/%d us]\n",

		"unlink qh%d-%04x/%pK start %d [%d/%d us]\n",

		qh->ps.period,

		hc32_to_cpup(ehci, &qh->hw->hw_info2) & (QH_CMASK | QH_SMASK),

		qh, qh->ps.phase, qh->ps.usecs, qh->ps.c_usecs);
@@ -752,7 +752,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);

		}

	}
@@ -870,7 +870,7 @@ static int qh_schedule(struct ehci_hcd *ehci, struct ehci_qh *qh) 


	/* reuse the previous schedule slots, if we can */

	if (qh->ps.phase != NO_FRAME) {

		ehci_dbg(ehci, "reused qh %p schedule\n", qh);

		ehci_dbg(ehci, "reused qh %pK schedule\n", qh);

		return 0;

	}
@@ -1549,7 +1549,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;

			}
@@ -1603,7 +1603,7 @@ iso_stream_schedule( 


	/* Is the schedule about to wrap around? */

	if (unlikely(!empty && start < period)) {

		ehci_dbg(ehci, "request %p would overflow (%u-%u < %u mod %u)\n",

		ehci_dbg(ehci, "request %pK would overflow (%u-%u < %u mod %u)\n",

				urb, stream->next_uframe, base, period, mod);

		status = -EFBIG;

		goto fail;
@@ -1632,7 +1632,7 @@ iso_stream_schedule( 
	/* How many uframes and packets do we need to skip? */

	skip = (now2 - start + period - 1) & -period;

	if (skip >= span) {		/* Entirely in the past? */

		ehci_dbg(ehci, "iso underrun %p (%u+%u < %u) [%u]\n",

		ehci_dbg(ehci, "iso underrun %pK (%u+%u < %u) [%u]\n",

				urb, start + base, span - period, now2 + base,

				base);
@@ -1659,7 +1659,7 @@ iso_stream_schedule( 
 use_start:

	/* Tried to schedule too far into the future? */

	if (unlikely(start + span - period >= mod + wrap)) {

		ehci_dbg(ehci, "request %p would overflow (%u+%u >= %u)\n",

		ehci_dbg(ehci, "request %pK would overflow (%u+%u >= %u)\n",

				urb, start, span - period, mod + wrap);

		status = -EFBIG;

		goto fail;
@@ -1955,7 +1955,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 %p 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",
@@ -2336,7 +2336,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",

drivers/usb/host/ohci-dbg.c

+5 −5
Original line number Diff line number Diff line
@@ -256,7 +256,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,
@@ -314,7 +314,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));
@@ -415,7 +415,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,
@@ -437,7 +437,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) {
@@ -516,7 +516,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;