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>

26 files changed, 174 insertions, 174 deletions

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;
 	}