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

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

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

parents 88532b42 e45e1ef6

drivers/usb/dwc3/dwc3-msm.c

+3 −3
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ static int dwc3_msm_ep_queue(struct usb_ep *ep, 
	list_add_tail(&req_complete->list_item, &mdwc->req_complete_list);

	request->complete = dwc3_msm_req_complete_func;



	dev_vdbg(dwc->dev, "%s: queing request %p to ep %s length %d\n",

	dev_vdbg(dwc->dev, "%s: queing request %pK to ep %s length %d\n",

			__func__, request, ep->name, request->length);

	size = dwc3_msm_read_reg(mdwc->base, DWC3_GEVNTSIZ(0));

	dbm_event_buffer_config(mdwc->dbm,
@@ -991,7 +991,7 @@ static void gsi_ring_db(struct usb_ep *ep, struct usb_gsi_request *request) 
		dev_dbg(mdwc->dev, "Failed to get GSI DBL address MSB\n");



	offset = dwc3_trb_dma_offset(dep, &dep->trb_pool[num_trbs-1]);

	dev_dbg(mdwc->dev, "Writing link TRB addr: %pa to %p (%x) for ep:%s\n",

	dev_dbg(mdwc->dev, "Writing link TRB addr: %pa to %pK (%x) for ep:%s\n",

		&offset, gsi_dbl_address_lsb, request->db_reg_phs_addr_lsb,

		ep->name);
@@ -1915,7 +1915,7 @@ static void dwc3_msm_notify_event(struct dwc3 *dwc, unsigned int event, 
			if (!evt)

				break;



			dev_dbg(mdwc->dev, "Evt buf %p dma %08llx length %d\n",

			dev_dbg(mdwc->dev, "Evt buf %pK dma %08llx length %d\n",

				evt->buf, (unsigned long long) evt->dma,

				evt->length);

			memset(evt->buf, 0, evt->length);

drivers/usb/dwc3/trace.h

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ DECLARE_EVENT_CLASS(dwc3_log_request, 
		__entry->short_not_ok = req->request.short_not_ok;

		__entry->no_interrupt = req->request.no_interrupt;

	),

	TP_printk("%s: req %p length %u/%u %s%s%s ==> %d",

	TP_printk("%s: req %pK length %u/%u %s%s%s ==> %d",

		__get_str(name), __entry->req, __entry->actual, __entry->length,

		__entry->zero ? "Z" : "z",

		__entry->short_not_ok ? "S" : "s",
@@ -246,7 +246,7 @@ DECLARE_EVENT_CLASS(dwc3_log_trb, 
		__entry->ctrl = trb->ctrl;

		__entry->type = usb_endpoint_type(dep->endpoint.desc);

	),

	TP_printk("%s: %d/%d trb %p buf %08x%08x size %s%d ctrl %08x (%c%c%c%c:%c%c:%s)",

	TP_printk("%s: %d/%d trb %pK buf %08x%08x size %s%d ctrl %08x (%c%c%c%c:%c%c:%s)",

		__get_str(name), __entry->queued, __entry->allocated,

		__entry->trb, __entry->bph, __entry->bpl,

		({char *s;