evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

usb: gadget: replace %p with %pK

Browse source 
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

Change-Id: Ice16947924f56b8f4244ae03b9ab4f2e36b7d56b
Signed-off-by: Vamsi Krishna Samavedam <vskrishn@codeaurora.org>
This commit is contained in:
Vamsi Krishna Samavedam 2016-11-03 17:40:37 -07:00 • committed by Hemant Kumar
parent f96c1912ec
commit 5f8f42688e
22 changed files with 158 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/usb/gadget/composite.c
View file

@ -216,7 +216,7 @@ int usb_add_function(struct usb_configuration *config,
{ {
int value = -EINVAL; int value = -EINVAL;
DBG(config->cdev, "adding '%s'/%p to config '%s'/%p\n", DBG(config->cdev, "adding '%s'/%pK to config '%s'/%pK\n",
function->name, function, function->name, function,
config->label, config); config->label, config);
@ -257,7 +257,7 @@ int usb_add_function(struct usb_configuration *config,
done: done:
if (value) if (value)
DBG(config->cdev, "adding '%s'/%p --> %d\n", DBG(config->cdev, "adding '%s'/%pK --> %d\n",
function->name, function, value); function->name, function, value);
return value; return value;
} }
@ -854,7 +854,7 @@ static int set_config(struct usb_composite_dev *cdev,
result = f->set_alt(f, tmp, 0); result = f->set_alt(f, tmp, 0);
if (result < 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); tmp, f->name, f, result);
reset_config(cdev); reset_config(cdev);
@ -927,7 +927,7 @@ int usb_add_config(struct usb_composite_dev *cdev,
if (!bind) if (!bind)
goto done; goto done;
DBG(cdev, "adding config #%u '%s'/%p\n", DBG(cdev, "adding config #%u '%s'/%pK\n",
config->bConfigurationValue, config->bConfigurationValue,
config->label, config); config->label, config);
@ -944,7 +944,7 @@ int usb_add_config(struct usb_composite_dev *cdev,
struct usb_function, list); struct usb_function, list);
list_del(&f->list); list_del(&f->list);
if (f->unbind) { if (f->unbind) {
DBG(cdev, "unbind function '%s'/%p\n", DBG(cdev, "unbind function '%s'/%pK\n",
f->name, f); f->name, f);
f->unbind(config, f); f->unbind(config, f);
/* may free memory for "f" */ /* may free memory for "f" */
@ -955,7 +955,7 @@ int usb_add_config(struct usb_composite_dev *cdev,
} else { } else {
unsigned i; unsigned i;
DBG(cdev, "cfg %d/%p speeds:%s%s%s\n", DBG(cdev, "cfg %d/%pK speeds:%s%s%s\n",
config->bConfigurationValue, config, config->bConfigurationValue, config,
config->superspeed ? " super" : "", config->superspeed ? " super" : "",
config->highspeed ? " high" : "", config->highspeed ? " high" : "",
@ -970,7 +970,7 @@ int usb_add_config(struct usb_composite_dev *cdev,
if (!f) if (!f)
continue; continue;
DBG(cdev, " interface %d = %s/%p\n", DBG(cdev, " interface %d = %s/%pK\n",
i, f->name, f); i, f->name, f);
} }
} }
@ -996,14 +996,14 @@ static void remove_config(struct usb_composite_dev *cdev,
struct usb_function, list); struct usb_function, list);
list_del(&f->list); list_del(&f->list);
if (f->unbind) { if (f->unbind) {
DBG(cdev, "unbind function '%s'/%p\n", f->name, f); DBG(cdev, "unbind function '%s'/%pK\n", f->name, f);
f->unbind(config, f); f->unbind(config, f);
/* may free memory for "f" */ /* may free memory for "f" */
} }
} }
list_del(&config->list); list_del(&config->list);
if (config->unbind) { if (config->unbind) {
DBG(cdev, "unbind config '%s'/%p\n", config->label, config); DBG(cdev, "unbind config '%s'/%pK\n", config->label, config);
config->unbind(config); config->unbind(config);
/* may free memory for "c" */ /* may free memory for "c" */
} }
@ -1411,7 +1411,7 @@ static void composite_setup_complete(struct usb_ep *ep, struct usb_request *req)
else if (cdev->os_desc_req == req) else if (cdev->os_desc_req == req)
cdev->os_desc_pending = false; cdev->os_desc_pending = false;
else else
WARN(1, "unknown request %p\n", req); WARN(1, "unknown request %pK\n", req);
} }
static int composite_ep0_queue(struct usb_composite_dev *cdev, static int composite_ep0_queue(struct usb_composite_dev *cdev,
@ -1426,7 +1426,7 @@ static int composite_ep0_queue(struct usb_composite_dev *cdev,
else if (cdev->os_desc_req == req) else if (cdev->os_desc_req == req)
cdev->os_desc_pending = true; cdev->os_desc_pending = true;
else else
WARN(1, "unknown request %p\n", req); WARN(1, "unknown request %pK\n", req);
} }
return ret; return ret;

4
drivers/usb/gadget/configfs.c
View file

@ -1257,7 +1257,7 @@ static void purge_configs_funcs(struct gadget_info *gi)
list_move_tail(&f->list, &cfg->func_list); list_move_tail(&f->list, &cfg->func_list);
if (f->unbind) { if (f->unbind) {
dev_err(&gi->cdev.gadget->dev, "unbind function" dev_err(&gi->cdev.gadget->dev, "unbind function"
" '%s'/%p\n", f->name, f); " '%s'/%pK\n", f->name, f);
f->unbind(c, f); f->unbind(c, f);
} }
} }
@ -1458,7 +1458,7 @@ static void android_work(struct work_struct *data)
} }
if (!uevent_sent) { if (!uevent_sent) {
pr_info("%s: did not send uevent (%d %d %p)\n", __func__, pr_info("%s: did not send uevent (%d %d %pK)\n", __func__,
gi->connected, gi->sw_connected, cdev->config); gi->connected, gi->sw_connected, cdev->config);
} }
} }

10
drivers/usb/gadget/function/f_accessory.c
View file

@ -555,7 +555,7 @@ static int create_bulk_endpoints(struct acc_dev *dev,
struct usb_ep *ep; struct usb_ep *ep;
int i; 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); ep = usb_ep_autoconfig(cdev->gadget, in_desc);
if (!ep) { if (!ep) {
@ -646,7 +646,7 @@ requeue_req:
r = -EIO; r = -EIO;
goto done; goto done;
} else { } else {
pr_debug("rx %p queue\n", req); pr_debug("rx %pK queue\n", req);
} }
/* wait for a request to complete */ /* wait for a request to complete */
@ -669,7 +669,7 @@ copy_data:
if (req->actual == 0) if (req->actual == 0)
goto requeue_req; 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; xfer = (req->actual < count) ? req->actual : count;
r = xfer; r = xfer;
if (copy_to_user(buf, req->buf, xfer)) if (copy_to_user(buf, req->buf, xfer))
@ -969,7 +969,7 @@ __acc_function_bind(struct usb_configuration *c,
int id; int id;
int ret; int ret;
DBG(cdev, "acc_function_bind dev: %p\n", dev); DBG(cdev, "acc_function_bind dev: %pK\n", dev);
if (configfs) { if (configfs) {
if (acc_string_defs[INTERFACE_STRING_INDEX].id == 0) { if (acc_string_defs[INTERFACE_STRING_INDEX].id == 0) {
@ -1151,7 +1151,7 @@ static void acc_hid_work(struct work_struct *data)
list_for_each_safe(entry, temp, &new_list) { list_for_each_safe(entry, temp, &new_list) {
hid = list_entry(entry, struct acc_hid_dev, list); hid = list_entry(entry, struct acc_hid_dev, list);
if (acc_hid_init(hid)) { 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); acc_hid_delete(hid);
} else { } else {
spin_lock_irqsave(&dev->lock, flags); spin_lock_irqsave(&dev->lock, flags);

2
drivers/usb/gadget/function/f_acm.c
View file

@ -702,7 +702,7 @@ fail:
if (acm->notify_req) if (acm->notify_req)
gs_free_req(acm->notify, acm->notify_req); gs_free_req(acm->notify, acm->notify_req);
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; return status;
} }

36
drivers/usb/gadget/function/f_cdev.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011, 2013-2016, The Linux Foundation. All rights reserved. * Copyright (c) 2011, 2013-2017, The Linux Foundation. All rights reserved.
* Linux Foundation chooses to take subject only to the GPLv2 license terms, * Linux Foundation chooses to take subject only to the GPLv2 license terms,
* and distributes only under these terms. * and distributes only under these terms.
* *
@ -846,7 +846,7 @@ static int usb_cser_alloc_requests(struct usb_ep *ep, struct list_head *head,
int i; int i;
struct usb_request *req; struct usb_request *req;
pr_debug("ep:%p head:%p num:%d size:%d cb:%p", pr_debug("ep:%pK head:%pK num:%d size:%d cb:%pK",
ep, head, num, size, cb); ep, head, num, size, cb);
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
@ -896,7 +896,7 @@ static void usb_cser_start_rx(struct f_cdev *port)
ret = usb_ep_queue(ep, req, GFP_KERNEL); ret = usb_ep_queue(ep, req, GFP_KERNEL);
spin_lock_irqsave(&port->port_lock, flags); spin_lock_irqsave(&port->port_lock, flags);
if (ret) { if (ret) {
pr_err("port(%d):%p usb ep(%s) queue failed\n", pr_err("port(%d):%pK usb ep(%s) queue failed\n",
port->port_num, port, ep->name); port->port_num, port, ep->name);
list_add(&req->list, pool); list_add(&req->list, pool);
break; break;
@ -911,7 +911,7 @@ static void usb_cser_read_complete(struct usb_ep *ep, struct usb_request *req)
struct f_cdev *port = ep->driver_data; struct f_cdev *port = ep->driver_data;
unsigned long flags; unsigned long flags;
pr_debug("ep:(%p)(%s) port:%p req_status:%d req->actual:%u\n", pr_debug("ep:(%pK)(%s) port:%pK req_status:%d req->actual:%u\n",
ep, ep->name, port, req->status, req->actual); ep, ep->name, port, req->status, req->actual);
if (!port) { if (!port) {
pr_err("port is null\n"); pr_err("port is null\n");
@ -938,7 +938,7 @@ static void usb_cser_write_complete(struct usb_ep *ep, struct usb_request *req)
unsigned long flags; unsigned long flags;
struct f_cdev *port = ep->driver_data; struct f_cdev *port = ep->driver_data;
pr_debug("ep:(%p)(%s) port:%p req_stats:%d\n", pr_debug("ep:(%pK)(%s) port:%pK req_stats:%d\n",
ep, ep->name, port, req->status); ep, ep->name, port, req->status);
if (!port) { if (!port) {
@ -973,7 +973,7 @@ static void usb_cser_start_io(struct f_cdev *port)
int ret = -ENODEV; int ret = -ENODEV;
unsigned long flags; unsigned long flags;
pr_debug("port: %p\n", port); pr_debug("port: %pK\n", port);
spin_lock_irqsave(&port->port_lock, flags); spin_lock_irqsave(&port->port_lock, flags);
if (!port->is_connected) if (!port->is_connected)
@ -1016,7 +1016,7 @@ static void usb_cser_stop_io(struct f_cdev *port)
struct usb_ep *out; struct usb_ep *out;
unsigned long flags; unsigned long flags;
pr_debug("port:%p\n", port); pr_debug("port:%pK\n", port);
in = port->port_usb.in; in = port->port_usb.in;
out = port->port_usb.out; out = port->port_usb.out;
@ -1059,7 +1059,7 @@ int f_cdev_open(struct inode *inode, struct file *file)
} }
file->private_data = port; file->private_data = port;
pr_debug("opening port(%s)(%p)\n", port->name, port); pr_debug("opening port(%s)(%pK)\n", port->name, port);
ret = wait_event_interruptible(port->open_wq, ret = wait_event_interruptible(port->open_wq,
port->is_connected); port->is_connected);
if (ret) { if (ret) {
@ -1072,7 +1072,7 @@ int f_cdev_open(struct inode *inode, struct file *file)
spin_unlock_irqrestore(&port->port_lock, flags); spin_unlock_irqrestore(&port->port_lock, flags);
usb_cser_start_rx(port); usb_cser_start_rx(port);
pr_debug("port(%s)(%p) open is success\n", port->name, port); pr_debug("port(%s)(%pK) open is success\n", port->name, port);
return 0; return 0;
} }
@ -1092,7 +1092,7 @@ int f_cdev_release(struct inode *inode, struct file *file)
port->port_open = false; port->port_open = false;
port->cbits_updated = false; port->cbits_updated = false;
spin_unlock_irqrestore(&port->port_lock, flags); spin_unlock_irqrestore(&port->port_lock, flags);
pr_debug("port(%s)(%p) is closed.\n", port->name, port); pr_debug("port(%s)(%pK) is closed.\n", port->name, port);
return 0; return 0;
} }
@ -1116,7 +1116,7 @@ ssize_t f_cdev_read(struct file *file,
return -EINVAL; return -EINVAL;
} }
pr_debug("read on port(%s)(%p) count:%zu\n", port->name, port, count); pr_debug("read on port(%s)(%pK) count:%zu\n", port->name, port, count);
spin_lock_irqsave(&port->port_lock, flags); spin_lock_irqsave(&port->port_lock, flags);
current_rx_req = port->current_rx_req; current_rx_req = port->current_rx_req;
pending_rx_bytes = port->pending_rx_bytes; pending_rx_bytes = port->pending_rx_bytes;
@ -1217,7 +1217,7 @@ ssize_t f_cdev_write(struct file *file,
} }
spin_lock_irqsave(&port->port_lock, flags); spin_lock_irqsave(&port->port_lock, flags);
pr_debug("write on port(%s)(%p)\n", port->name, port); pr_debug("write on port(%s)(%pK)\n", port->name, port);
if (!port->is_connected) { if (!port->is_connected) {
spin_unlock_irqrestore(&port->port_lock, flags); spin_unlock_irqrestore(&port->port_lock, flags);
@ -1386,7 +1386,7 @@ static long f_cdev_ioctl(struct file *fp, unsigned cmd,
case TIOCMBIC: case TIOCMBIC:
case TIOCMBIS: case TIOCMBIS:
case TIOCMSET: case TIOCMSET:
pr_debug("TIOCMSET on port(%s)%p\n", port->name, port); pr_debug("TIOCMSET on port(%s)%pK\n", port->name, port);
i = get_user(val, (uint32_t *)arg); i = get_user(val, (uint32_t *)arg);
if (i) { if (i) {
pr_err("Error getting TIOCMSET value\n"); pr_err("Error getting TIOCMSET value\n");
@ -1395,7 +1395,7 @@ static long f_cdev_ioctl(struct file *fp, unsigned cmd,
ret = f_cdev_tiocmset(port, val, ~val); ret = f_cdev_tiocmset(port, val, ~val);
break; break;
case TIOCMGET: case TIOCMGET:
pr_debug("TIOCMGET on port(%s)%p\n", port->name, port); pr_debug("TIOCMGET on port(%s)%pK\n", port->name, port);
ret = f_cdev_tiocmget(port); ret = f_cdev_tiocmget(port);
if (ret >= 0) { if (ret >= 0) {
ret = put_user(ret, (uint32_t *)arg); ret = put_user(ret, (uint32_t *)arg);
@ -1445,14 +1445,14 @@ int usb_cser_connect(struct f_cdev *port)
return -ENODEV; return -ENODEV;
} }
pr_debug("port(%s) (%p)\n", port->name, port); pr_debug("port(%s) (%pK)\n", port->name, port);
cser = &port->port_usb; cser = &port->port_usb;
cser->notify_modem = usb_cser_notify_modem; cser->notify_modem = usb_cser_notify_modem;
ret = usb_ep_enable(cser->in); ret = usb_ep_enable(cser->in);
if (ret) { if (ret) {
pr_err("usb_ep_enable failed eptype:IN ep:%p, err:%d", pr_err("usb_ep_enable failed eptype:IN ep:%pK, err:%d",
cser->in, ret); cser->in, ret);
return ret; return ret;
} }
@ -1460,7 +1460,7 @@ int usb_cser_connect(struct f_cdev *port)
ret = usb_ep_enable(cser->out); ret = usb_ep_enable(cser->out);
if (ret) { if (ret) {
pr_err("usb_ep_enable failed eptype:OUT ep:%p, err: %d", pr_err("usb_ep_enable failed eptype:OUT ep:%pK, err: %d",
cser->out, ret); cser->out, ret);
cser->in->driver_data = 0; cser->in->driver_data = 0;
return ret; return ret;
@ -1572,7 +1572,7 @@ static struct f_cdev *f_cdev_alloc(char *func_name, int portno)
goto err_create_dev; goto err_create_dev;
} }
pr_info("port_name:%s (%p) portno:(%d)\n", pr_info("port_name:%s (%pK) portno:(%d)\n",
port->name, port, port->port_num); port->name, port, port->port_num);
return port; return port;

4
drivers/usb/gadget/function/f_diag.c
View file

@ -2,7 +2,7 @@
* Diag Function Device - Route ARM9 and ARM11 DIAG messages * Diag Function Device - Route ARM9 and ARM11 DIAG messages
* between HOST and DEVICE. * between HOST and DEVICE.
* Copyright (C) 2007 Google, Inc. * Copyright (C) 2007 Google, Inc.
* Copyright (c) 2008-2016, The Linux Foundation. All rights reserved. * Copyright (c) 2008-2017, The Linux Foundation. All rights reserved.
* Author: Brian Swetland <swetland@google.com> * Author: Brian Swetland <swetland@google.com>
* This software is licensed under the terms of the GNU General Public * This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and * License version 2, as published by the Free Software Foundation, and
@ -244,7 +244,7 @@ static void diag_update_pid_and_serial_num(struct diag_context *ctxt)
} }
update_dload: update_dload:
pr_debug("%s: dload:%p pid:%x serial_num:%s\n", pr_debug("%s: dload:%pK pid:%x serial_num:%s\n",
__func__, diag_dload, local_diag_dload.pid, __func__, diag_dload, local_diag_dload.pid,
local_diag_dload.serial_number); local_diag_dload.serial_number);

10
drivers/usb/gadget/function/f_fs.c
View file

@ -699,7 +699,7 @@ static void ffs_epfile_io_complete(struct usb_ep *_ep, struct usb_request *req)
ep->status = req->status ? req->status : req->actual; ep->status = req->status ? req->status : req->actual;
/* Set is_busy false to indicate completion of last request */ /* Set is_busy false to indicate completion of last request */
ep->is_busy = false; ep->is_busy = false;
ffs_log("ep status %d for req %p", ep->status, req); ffs_log("ep status %d for req %pK", ep->status, req);
complete(req->context); complete(req->context);
} }
} }
@ -1720,12 +1720,12 @@ static void ffs_data_clear(struct ffs_data *ffs)
ffs_log("enter: state %d setup_state %d flag %lu", ffs->state, ffs_log("enter: state %d setup_state %d flag %lu", ffs->state,
ffs->setup_state, ffs->flags); ffs->setup_state, ffs->flags);
pr_debug("%s: ffs->gadget= %p, ffs->flags= %lu\n", pr_debug("%s: ffs->gadget= %pK, ffs->flags= %lu\n",
__func__, ffs->gadget, ffs->flags); __func__, ffs->gadget, ffs->flags);
ffs_closed(ffs); ffs_closed(ffs);
if (ffs->gadget) if (ffs->gadget)
pr_err("%s: ffs:%p ffs->gadget= %p, ffs->flags= %lu\n", pr_err("%s: ffs:%pK ffs->gadget= %pK, ffs->flags= %lu\n",
__func__, ffs, ffs->gadget, ffs->flags); __func__, ffs, ffs->gadget, ffs->flags);
BUG_ON(ffs->gadget); BUG_ON(ffs->gadget);
@ -1814,7 +1814,7 @@ static int functionfs_bind(struct ffs_data *ffs, struct usb_composite_dev *cdev)
ffs->gadget = cdev->gadget; ffs->gadget = cdev->gadget;
ffs_log("exit: state %d setup_state %d flag %lu gadget %p\n", ffs_log("exit: state %d setup_state %d flag %lu gadget %pK\n",
ffs->state, ffs->setup_state, ffs->flags, ffs->gadget); ffs->state, ffs->setup_state, ffs->flags, ffs->gadget);
ffs_data_get(ffs); ffs_data_get(ffs);
@ -1830,7 +1830,7 @@ static void functionfs_unbind(struct ffs_data *ffs)
ffs->ep0req = NULL; ffs->ep0req = NULL;
ffs->gadget = NULL; ffs->gadget = NULL;
clear_bit(FFS_FL_BOUND, &ffs->flags); clear_bit(FFS_FL_BOUND, &ffs->flags);
ffs_log("state %d setup_state %d flag %lu gadget %p\n", ffs_log("state %d setup_state %d flag %lu gadget %pK\n",
ffs->state, ffs->setup_state, ffs->flags, ffs->gadget); ffs->state, ffs->setup_state, ffs->flags, ffs->gadget);
ffs_data_put(ffs); ffs_data_put(ffs);
} }

24
drivers/usb/gadget/function/f_gsi.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2015-2016, Linux Foundation. All rights reserved. /* Copyright (c) 2015-2017, Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -883,7 +883,7 @@ static int gsi_ctrl_dev_open(struct inode *ip, struct file *fp)
ctrl_device); ctrl_device);
if (!c_port) { if (!c_port) {
log_event_err("%s: gsi ctrl port %p", __func__, c_port); log_event_err("%s: gsi ctrl port %pK", __func__, c_port);
return -ENODEV; return -ENODEV;
} }
@ -906,7 +906,7 @@ static int gsi_ctrl_dev_release(struct inode *ip, struct file *fp)
ctrl_device); ctrl_device);
if (!c_port) { if (!c_port) {
log_event_err("%s: gsi ctrl port %p", __func__, c_port); log_event_err("%s: gsi ctrl port %pK", __func__, c_port);
return -ENODEV; return -ENODEV;
} }
@ -931,7 +931,7 @@ gsi_ctrl_dev_read(struct file *fp, char __user *buf, size_t count, loff_t *pos)
log_event_dbg("%s: Enter %zu", __func__, count); log_event_dbg("%s: Enter %zu", __func__, count);
if (!c_port) { if (!c_port) {
log_event_err("%s: gsi ctrl port %p", __func__, c_port); log_event_err("%s: gsi ctrl port %pK", __func__, c_port);
return -ENODEV; return -ENODEV;
} }
@ -1003,7 +1003,7 @@ static ssize_t gsi_ctrl_dev_write(struct file *fp, const char __user *buf,
log_event_dbg("Enter %zu", count); log_event_dbg("Enter %zu", count);
if (!c_port || !req || !req->buf) { if (!c_port || !req || !req->buf) {
log_event_err("%s: c_port %p req %p req->buf %p", log_event_err("%s: c_port %pK req %pK req->buf %pK",
__func__, c_port, req, req ? req->buf : req); __func__, c_port, req, req ? req->buf : req);
return -ENODEV; return -ENODEV;
} }
@ -1063,7 +1063,7 @@ static long gsi_ctrl_dev_ioctl(struct file *fp, unsigned cmd,
int val, ret = 0; int val, ret = 0;
if (!c_port) { if (!c_port) {
log_event_err("%s: gsi ctrl port %p", __func__, c_port); log_event_err("%s: gsi ctrl port %pK", __func__, c_port);
return -ENODEV; return -ENODEV;
} }
@ -1180,7 +1180,7 @@ static unsigned int gsi_ctrl_dev_poll(struct file *fp, poll_table *wait)
unsigned int mask = 0; unsigned int mask = 0;
if (!c_port) { if (!c_port) {
log_event_err("%s: gsi ctrl port %p", __func__, c_port); log_event_err("%s: gsi ctrl port %pK", __func__, c_port);
return -ENODEV; return -ENODEV;
} }
@ -1297,7 +1297,7 @@ static void gsi_rndis_ipa_reset_trigger(struct f_gsi *rndis)
unsigned long flags; unsigned long flags;
if (!rndis) { if (!rndis) {
log_event_err("%s: gsi prot ctx is %p", __func__, rndis); log_event_err("%s: gsi prot ctx is %pK", __func__, rndis);
return; return;
} }
@ -1318,7 +1318,7 @@ void gsi_rndis_flow_ctrl_enable(bool enable, struct rndis_params *param)
struct gsi_data_port *d_port; struct gsi_data_port *d_port;
if (!rndis) { if (!rndis) {
log_event_err("%s: gsi prot ctx is %p", __func__, rndis); log_event_err("%s: gsi prot ctx is %pK", __func__, rndis);
return; return;
} }
@ -1522,7 +1522,7 @@ gsi_ctrl_set_ntb_cmd_complete(struct usb_ep *ep, struct usb_request *req)
struct f_gsi *gsi = req->context; struct f_gsi *gsi = req->context;
struct gsi_ntb_info *ntb = NULL; struct gsi_ntb_info *ntb = NULL;
log_event_dbg("dev:%p", gsi); log_event_dbg("dev:%pK", gsi);
req->context = NULL; req->context = NULL;
if (req->status || req->actual != req->length) { if (req->status || req->actual != req->length) {
@ -2457,7 +2457,7 @@ static int gsi_bind(struct usb_configuration *c, struct usb_function *f)
/* export host's Ethernet address in CDC format */ /* export host's Ethernet address in CDC format */
random_ether_addr(gsi->d_port.ipa_init_params.device_ethaddr); random_ether_addr(gsi->d_port.ipa_init_params.device_ethaddr);
random_ether_addr(gsi->d_port.ipa_init_params.host_ethaddr); random_ether_addr(gsi->d_port.ipa_init_params.host_ethaddr);
log_event_dbg("setting host_ethaddr=%pM, device_ethaddr = %pM", log_event_dbg("setting host_ethaddr=%pKM, device_ethaddr = %pKM",
gsi->d_port.ipa_init_params.host_ethaddr, gsi->d_port.ipa_init_params.host_ethaddr,
gsi->d_port.ipa_init_params.device_ethaddr); gsi->d_port.ipa_init_params.device_ethaddr);
memcpy(gsi->ethaddr, &gsi->d_port.ipa_init_params.host_ethaddr, memcpy(gsi->ethaddr, &gsi->d_port.ipa_init_params.host_ethaddr,
@ -2589,7 +2589,7 @@ static int gsi_bind(struct usb_configuration *c, struct usb_function *f)
/* export host's Ethernet address in CDC format */ /* export host's Ethernet address in CDC format */
random_ether_addr(gsi->d_port.ipa_init_params.device_ethaddr); random_ether_addr(gsi->d_port.ipa_init_params.device_ethaddr);
random_ether_addr(gsi->d_port.ipa_init_params.host_ethaddr); random_ether_addr(gsi->d_port.ipa_init_params.host_ethaddr);
log_event_dbg("setting host_ethaddr=%pM, device_ethaddr = %pM", log_event_dbg("setting host_ethaddr=%pKM, device_ethaddr = %pKM",
gsi->d_port.ipa_init_params.host_ethaddr, gsi->d_port.ipa_init_params.host_ethaddr,
gsi->d_port.ipa_init_params.device_ethaddr); gsi->d_port.ipa_init_params.device_ethaddr);

20
drivers/usb/gadget/function/f_mbim.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -741,7 +741,7 @@ static void mbim_notify_complete(struct usb_ep *ep, struct usb_request *req)
struct f_mbim *mbim = req->context; struct f_mbim *mbim = req->context;
struct usb_cdc_notification *event = req->buf; struct usb_cdc_notification *event = req->buf;
pr_debug("dev:%p\n", mbim); pr_debug("dev:%pK\n", mbim);
spin_lock(&mbim->lock); spin_lock(&mbim->lock);
switch (req->status) { switch (req->status) {
@ -771,7 +771,7 @@ static void mbim_notify_complete(struct usb_ep *ep, struct usb_request *req)
mbim_do_notify(mbim); mbim_do_notify(mbim);
spin_unlock(&mbim->lock); spin_unlock(&mbim->lock);
pr_debug("dev:%p Exit\n", mbim); pr_debug("dev:%pK Exit\n", mbim);
} }
static void mbim_ep0out_complete(struct usb_ep *ep, struct usb_request *req) static void mbim_ep0out_complete(struct usb_ep *ep, struct usb_request *req)
@ -782,7 +782,7 @@ static void mbim_ep0out_complete(struct usb_ep *ep, struct usb_request *req)
struct f_mbim *mbim = func_to_mbim(f); struct f_mbim *mbim = func_to_mbim(f);
struct mbim_ntb_input_size *ntb = NULL; struct mbim_ntb_input_size *ntb = NULL;
pr_debug("dev:%p\n", mbim); pr_debug("dev:%pK\n", mbim);
req->context = NULL; req->context = NULL;
if (req->status || req->actual != req->length) { if (req->status || req->actual != req->length) {
@ -820,7 +820,7 @@ static void mbim_ep0out_complete(struct usb_ep *ep, struct usb_request *req)
invalid: invalid:
usb_ep_set_halt(ep); usb_ep_set_halt(ep);
pr_err("dev:%p Failed\n", mbim); pr_err("dev:%pK Failed\n", mbim);
} }
static void static void
@ -853,7 +853,7 @@ fmbim_cmd_complete(struct usb_ep *ep, struct usb_request *req)
if (!first_command_sent) if (!first_command_sent)
first_command_sent = true; first_command_sent = true;
pr_debug("dev:%p port#%d\n", dev, dev->port_num); pr_debug("dev:%pK port#%d\n", dev, dev->port_num);
cpkt = mbim_alloc_ctrl_pkt(len, GFP_ATOMIC); cpkt = mbim_alloc_ctrl_pkt(len, GFP_ATOMIC);
if (!cpkt) { if (!cpkt) {
@ -1192,7 +1192,7 @@ static int mbim_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
return ret; return ret;
} }
pr_info("Set mbim port in_desc = 0x%p\n", pr_info("Set mbim port in_desc = 0x%pK\n",
mbim->bam_port.in->desc); mbim->bam_port.in->desc);
ret = config_ep_by_speed(cdev->gadget, f, ret = config_ep_by_speed(cdev->gadget, f,
@ -1204,7 +1204,7 @@ static int mbim_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
return ret; return ret;
} }
pr_info("Set mbim port out_desc = 0x%p\n", pr_info("Set mbim port out_desc = 0x%pK\n",
mbim->bam_port.out->desc); mbim->bam_port.out->desc);
pr_debug("Activate mbim\n"); pr_debug("Activate mbim\n");
@ -1829,7 +1829,7 @@ mbim_write(struct file *fp, const char __user *buf, size_t count, loff_t *pos)
pr_debug("Enter(%zu)\n", count); pr_debug("Enter(%zu)\n", count);
if (!dev || !req || !req->buf) { if (!dev || !req || !req->buf) {
pr_err("%s: dev %p req %p req->buf %p\n", pr_err("%s: dev %pK req %pK req->buf %pK\n",
__func__, dev, req, req ? req->buf : req); __func__, dev, req, req ? req->buf : req);
return -ENODEV; return -ENODEV;
} }
@ -1851,7 +1851,7 @@ mbim_write(struct file *fp, const char __user *buf, size_t count, loff_t *pos)
} }
if (dev->not_port.notify_state != MBIM_NOTIFY_RESPONSE_AVAILABLE) { if (dev->not_port.notify_state != MBIM_NOTIFY_RESPONSE_AVAILABLE) {
pr_err("dev:%p state=%d error\n", dev, pr_err("dev:%pK state=%d error\n", dev,
dev->not_port.notify_state); dev->not_port.notify_state);
mbim_unlock(&dev->write_excl); mbim_unlock(&dev->write_excl);
return -EINVAL; return -EINVAL;

10
drivers/usb/gadget/function/f_mtp.c
View file

@ -522,7 +522,7 @@ static int mtp_create_bulk_endpoints(struct mtp_dev *dev,
struct usb_ep *ep; struct usb_ep *ep;
int i; 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); ep = usb_ep_autoconfig(cdev->gadget, in_desc);
if (!ep) { if (!ep) {
@ -650,7 +650,7 @@ requeue_req:
r = -EIO; r = -EIO;
goto done; goto done;
} else { } else {
DBG(cdev, "rx %p queue\n", req); DBG(cdev, "rx %pK queue\n", req);
} }
/* wait for a request to complete */ /* wait for a request to complete */
@ -675,7 +675,7 @@ requeue_req:
if (req->actual == 0) if (req->actual == 0)
goto requeue_req; 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; xfer = (req->actual < count) ? req->actual : count;
r = xfer; r = xfer;
if (copy_to_user(buf, req->buf, xfer)) if (copy_to_user(buf, req->buf, xfer))
@ -955,7 +955,7 @@ static void receive_file_work(struct work_struct *data)
} }
if (write_req) { 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);
start_time = ktime_get(); start_time = ktime_get();
ret = vfs_write(filp, write_req->buf, write_req->actual, ret = vfs_write(filp, write_req->buf, write_req->actual,
&offset); &offset);
@ -1393,7 +1393,7 @@ mtp_function_bind(struct usb_configuration *c, struct usb_function *f)
struct mtp_instance *fi_mtp; struct mtp_instance *fi_mtp;
dev->cdev = cdev; dev->cdev = cdev;
DBG(cdev, "mtp_function_bind dev: %p\n", dev); DBG(cdev, "mtp_function_bind dev: %pK\n", dev);
/* allocate interface ID(s) */ /* allocate interface ID(s) */
id = usb_interface_id(c, f); id = usb_interface_id(c, f);

2
drivers/usb/gadget/function/f_obex.c
View file

@ -376,7 +376,7 @@ static int obex_bind(struct usb_configuration *c, struct usb_function *f)
return 0; return 0;
fail: fail:
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; return status;
} }

4
drivers/usb/gadget/function/f_qc_ecm.c
View file

@ -3,7 +3,7 @@
* *
* Copyright (C) 2003-2005,2008 David Brownell * Copyright (C) 2003-2005,2008 David Brownell
* Copyright (C) 2008 Nokia Corporation * Copyright (C) 2008 Nokia Corporation
* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. * Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -1134,7 +1134,7 @@ ecm_qc_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN],
if (ecm->xport != USB_GADGET_XPORT_BAM2BAM_IPA) if (ecm->xport != USB_GADGET_XPORT_BAM2BAM_IPA)
return status; return status;
pr_debug("setting ecm_ipa, host_ethaddr=%pM, device_ethaddr=%pM", pr_debug("setting ecm_ipa, host_ethaddr=%pKM, device_ethaddr=%pKM",
ipa_params.host_ethaddr, ipa_params.device_ethaddr); ipa_params.host_ethaddr, ipa_params.device_ethaddr);
status = ecm_ipa_init(&ipa_params); status = ecm_ipa_init(&ipa_params);
if (status) { if (status) {

4
drivers/usb/gadget/function/f_qc_rndis.c
View file

@ -6,7 +6,7 @@
* Copyright (C) 2008 Nokia Corporation * Copyright (C) 2008 Nokia Corporation
* Copyright (C) 2009 Samsung Electronics * Copyright (C) 2009 Samsung Electronics
* Author: Michal Nazarewicz (mina86@mina86.com) * Author: Michal Nazarewicz (mina86@mina86.com)
* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. * Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 * it under the terms of the GNU General Public License version 2
@ -1197,7 +1197,7 @@ usb_function *rndis_qc_bind_config_vendor(struct usb_function_instance *fi,
/* export host's Ethernet address in CDC format */ /* export host's Ethernet address in CDC format */
random_ether_addr(rndis_ipa_params.host_ethaddr); random_ether_addr(rndis_ipa_params.host_ethaddr);
random_ether_addr(rndis_ipa_params.device_ethaddr); random_ether_addr(rndis_ipa_params.device_ethaddr);
pr_debug("setting host_ethaddr=%pM, device_ethaddr=%pM\n", pr_debug("setting host_ethaddr=%pKM, device_ethaddr=%pKM\n",
rndis_ipa_params.host_ethaddr, rndis_ipa_params.host_ethaddr,
rndis_ipa_params.device_ethaddr); rndis_ipa_params.device_ethaddr);
rndis_ipa_supported = true; rndis_ipa_supported = true;

4
drivers/usb/gadget/function/f_qdss.c
View file

@ -1,7 +1,7 @@
/* /*
* f_qdss.c -- QDSS function Driver * f_qdss.c -- QDSS function Driver
* *
* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. * Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -569,7 +569,7 @@ static int qdss_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
struct usb_qdss_ch *ch = &qdss->ch; struct usb_qdss_ch *ch = &qdss->ch;
int ret = 0; int ret = 0;
pr_debug("qdss_set_alt qdss pointer = %p\n", qdss); pr_debug("qdss_set_alt qdss pointer = %pK\n", qdss);
qdss->gadget = gadget; qdss->gadget = gadget;
if (alt != 0) if (alt != 0)

28
drivers/usb/gadget/function/f_rmnet.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved. * Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -466,8 +466,8 @@ static void frmnet_suspend(struct usb_function *f)
else else
remote_wakeup_allowed = f->config->cdev->gadget->remote_wakeup; remote_wakeup_allowed = f->config->cdev->gadget->remote_wakeup;
pr_debug("%s: dev: %p remote_wakeup: %d\n", pr_debug("%s: dev: %pK remote_wakeup: %d\n", __func__, dev,
__func__, dev, remote_wakeup_allowed); remote_wakeup_allowed);
if (dev->notify) { if (dev->notify) {
usb_ep_fifo_flush(dev->notify); usb_ep_fifo_flush(dev->notify);
@ -486,8 +486,8 @@ static void frmnet_resume(struct usb_function *f)
else else
remote_wakeup_allowed = f->config->cdev->gadget->remote_wakeup; remote_wakeup_allowed = f->config->cdev->gadget->remote_wakeup;
pr_debug("%s: dev: %p remote_wakeup: %d\n", pr_debug("%s: dev: %pK remote_wakeup: %d\n", __func__, dev,
__func__, dev, remote_wakeup_allowed); remote_wakeup_allowed);
ipa_data_resume(&dev->ipa_port, dev->func_type, remote_wakeup_allowed); ipa_data_resume(&dev->ipa_port, dev->func_type, remote_wakeup_allowed);
} }
@ -514,7 +514,7 @@ frmnet_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
struct usb_composite_dev *cdev = f->config->cdev; struct usb_composite_dev *cdev = f->config->cdev;
int ret = 0; int ret = 0;
pr_debug("%s: dev: %p\n", __func__, dev); pr_debug("%s:dev:%pK\n", __func__, dev);
dev->cdev = cdev; dev->cdev = cdev;
if (dev->notify) { if (dev->notify) {
if (dev->notify->driver_data) { if (dev->notify->driver_data) {
@ -596,7 +596,7 @@ static void frmnet_ctrl_response_available(struct f_rmnet *dev)
int ret; int ret;
struct rmnet_ctrl_pkt *cpkt; struct rmnet_ctrl_pkt *cpkt;
pr_debug("%s: dev: %p\n", __func__, dev); pr_debug("%s:dev:%pK\n", __func__, dev);
spin_lock_irqsave(&dev->lock, flags); spin_lock_irqsave(&dev->lock, flags);
if (!atomic_read(&dev->online) || !req || !req->buf) { if (!atomic_read(&dev->online) || !req || !req->buf) {
spin_unlock_irqrestore(&dev->lock, flags); spin_unlock_irqrestore(&dev->lock, flags);
@ -644,7 +644,7 @@ static void frmnet_connect(struct grmnet *gr)
struct f_rmnet *dev; struct f_rmnet *dev;
if (!gr) { if (!gr) {
pr_err("%s: Invalid grmnet:%p\n", __func__, gr); pr_err("%s: Invalid grmnet:%pK\n", __func__, gr);
return; return;
} }
@ -660,7 +660,7 @@ static void frmnet_disconnect(struct grmnet *gr)
int status; int status;
if (!gr) { if (!gr) {
pr_err("%s: Invalid grmnet:%p\n", __func__, gr); pr_err("%s: Invalid grmnet:%pK\n", __func__, gr);
return; return;
} }
@ -702,7 +702,7 @@ frmnet_send_cpkt_response(void *gr, void *buf, size_t len)
unsigned long flags; unsigned long flags;
if (!gr || !buf) { if (!gr || !buf) {
pr_err("%s: Invalid grmnet/buf, grmnet:%p buf:%p\n", pr_err("%s: Invalid grmnet/buf, grmnet:%pK buf:%pK\n",
__func__, gr, buf); __func__, gr, buf);
return -ENODEV; return -ENODEV;
} }
@ -716,7 +716,7 @@ frmnet_send_cpkt_response(void *gr, void *buf, size_t len)
dev = port_to_rmnet(gr); dev = port_to_rmnet(gr);
pr_debug("%s: dev: %p\n", __func__, dev); pr_debug("%s: dev: %pK\n", __func__, dev);
if (!atomic_read(&dev->online) || !atomic_read(&dev->ctrl_online)) { if (!atomic_read(&dev->online) || !atomic_read(&dev->ctrl_online)) {
rmnet_free_ctrl_pkt(cpkt); rmnet_free_ctrl_pkt(cpkt);
return 0; return 0;
@ -741,7 +741,7 @@ frmnet_cmd_complete(struct usb_ep *ep, struct usb_request *req)
pr_err("%s: rmnet dev is null\n", __func__); pr_err("%s: rmnet dev is null\n", __func__);
return; return;
} }
pr_debug("%s: dev: %p\n", __func__, dev); pr_debug("%s: dev: %pK\n", __func__, dev);
cdev = dev->cdev; cdev = dev->cdev;
if (dev->port.send_encap_cmd) { if (dev->port.send_encap_cmd) {
@ -756,7 +756,7 @@ static void frmnet_notify_complete(struct usb_ep *ep, struct usb_request *req)
unsigned long flags; unsigned long flags;
struct rmnet_ctrl_pkt *cpkt; struct rmnet_ctrl_pkt *cpkt;
pr_debug("%s: dev: %p\n", __func__, dev); pr_debug("%s: dev: %pK\n", __func__, dev);
switch (status) { switch (status) {
case -ECONNRESET: case -ECONNRESET:
case -ESHUTDOWN: case -ESHUTDOWN:
@ -823,7 +823,7 @@ frmnet_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
u16 w_length = le16_to_cpu(ctrl->wLength); u16 w_length = le16_to_cpu(ctrl->wLength);
int ret = -EOPNOTSUPP; int ret = -EOPNOTSUPP;
pr_debug("%s: dev: %p\n", __func__, dev); pr_debug("%s: dev: %pK\n", __func__, dev);
if (!atomic_read(&dev->online)) { if (!atomic_read(&dev->online)) {
pr_warn("%s: usb cable is not connected\n", __func__); pr_warn("%s: usb cable is not connected\n", __func__);
return -ENOTCONN; return -ENOTCONN;

27
drivers/usb/gadget/function/u_bam.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2016, Linux Foundation. All rights reserved. /* Copyright (c) 2011-2017, Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -231,7 +231,7 @@ static int gbam_alloc_requests(struct usb_ep *ep, struct list_head *head,
int i; int i;
struct usb_request *req; struct usb_request *req;
pr_debug("%s: ep:%p head:%p num:%d cb:%p", __func__, pr_debug("%s: ep:%pK head:%pK num:%d cb:%pK", __func__,
ep, head, num, cb); ep, head, num, cb);
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
@ -491,7 +491,7 @@ void gbam_data_recv_cb(void *p, struct sk_buff *skb)
if (!skb) if (!skb)
return; return;
pr_debug("%s: p:%p#%d d:%p skb_len:%d\n", __func__, pr_debug("%s: p:%pK#%d d:%pK skb_len:%d\n", __func__,
port, port->port_num, d, skb->len); port, port->port_num, d, skb->len);
spin_lock_irqsave(&port->port_lock_dl, flags); spin_lock_irqsave(&port->port_lock_dl, flags);
@ -532,7 +532,8 @@ void gbam_data_write_done(void *p, struct sk_buff *skb)
d->pending_bytes_with_bam -= skb->len; d->pending_bytes_with_bam -= skb->len;
gbam_free_skb_to_pool(port, skb); gbam_free_skb_to_pool(port, skb);
pr_debug("%s:port:%p d:%p tom:%lu ppkt:%u pbytes:%u pno:%d\n", __func__, pr_debug("%s:port:%pK d:%pK tom:%lu ppkt:%u pbytes:%u pno:%d\n",
__func__,
port, d, d->to_modem, d->pending_pkts_with_bam, port, d, d->to_modem, d->pending_pkts_with_bam,
d->pending_bytes_with_bam, port->port_num); d->pending_bytes_with_bam, port->port_num);
@ -608,7 +609,7 @@ static void gbam_data_write_tobam(struct work_struct *w)
d->pending_bytes_with_bam += skb->len; d->pending_bytes_with_bam += skb->len;
d->to_modem++; d->to_modem++;
pr_debug("%s: port:%p d:%p tom:%lu ppkts:%u pbytes:%u pno:%d\n", pr_debug("%s: port:%pK d:%pK tom:%lu ppkts:%u pbytes:%u pno:%d\n",
__func__, port, d, __func__, port, d,
d->to_modem, d->pending_pkts_with_bam, d->to_modem, d->pending_pkts_with_bam,
d->pending_bytes_with_bam, port->port_num); d->pending_bytes_with_bam, port->port_num);
@ -1097,7 +1098,7 @@ static void gbam_start_io(struct gbam_port *port)
{ {
unsigned long flags; unsigned long flags;
pr_debug("%s: port:%p\n", __func__, port); pr_debug("%s: port:%pK\n", __func__, port);
if (_gbam_start_io(port, true)) if (_gbam_start_io(port, true))
return; return;
@ -1786,7 +1787,7 @@ static int gbam_port_alloc(int portno)
pdrv->driver.owner = THIS_MODULE; pdrv->driver.owner = THIS_MODULE;
platform_driver_register(pdrv); platform_driver_register(pdrv);
pr_debug("%s: port:%p portno:%d\n", __func__, port, portno); pr_debug("%s: port:%pK portno:%d\n", __func__, port, portno);
return 0; return 0;
} }
@ -1826,7 +1827,7 @@ static int gbam2bam_port_alloc(int portno)
INIT_LIST_HEAD(&d->rx_idle); INIT_LIST_HEAD(&d->rx_idle);
INIT_WORK(&d->write_tobam_w, gbam_data_write_tobam); INIT_WORK(&d->write_tobam_w, gbam_data_write_tobam);
pr_debug("%s: port:%p portno:%d\n", __func__, port, portno); pr_debug("%s: port:%pK portno:%d\n", __func__, port, portno);
return 0; return 0;
} }
@ -1858,7 +1859,7 @@ static ssize_t gbam_read_stats(struct file *file, char __user *ubuf,
d = &port->data_ch; d = &port->data_ch;
temp += scnprintf(buf + temp, DEBUG_BUF_SIZE - temp, temp += scnprintf(buf + temp, DEBUG_BUF_SIZE - temp,
"#PORT:%d port:%p data_ch:%p#\n" "#PORT:%d port:%pK data_ch:%pK#\n"
"dpkts_to_usbhost: %lu\n" "dpkts_to_usbhost: %lu\n"
"dpkts_to_modem: %lu\n" "dpkts_to_modem: %lu\n"
"dpkts_pwith_bam: %u\n" "dpkts_pwith_bam: %u\n"
@ -1981,7 +1982,7 @@ void gbam_disconnect(struct grmnet *gr, u8 port_num, enum transport_type trans)
unsigned long flags, flags_ul, flags_dl; unsigned long flags, flags_ul, flags_dl;
struct bam_ch_info *d; struct bam_ch_info *d;
pr_debug("%s: grmnet:%p port#%d\n", __func__, gr, port_num); pr_debug("%s: grmnet:%pK port#%d\n", __func__, gr, port_num);
if (trans == USB_GADGET_XPORT_BAM2BAM) { if (trans == USB_GADGET_XPORT_BAM2BAM) {
pr_err("%s: invalid xport#%d\n", __func__, trans); pr_err("%s: invalid xport#%d\n", __func__, trans);
@ -2109,7 +2110,7 @@ int gbam_connect(struct grmnet *gr, u8 port_num,
int ret; int ret;
unsigned long flags, flags_ul; unsigned long flags, flags_ul;
pr_debug("%s: grmnet:%p port#%d\n", __func__, gr, port_num); pr_debug("%s: grmnet:%pK port#%d\n", __func__, gr, port_num);
if (!gr) { if (!gr) {
pr_err("%s: grmnet port is null\n", __func__); pr_err("%s: grmnet port is null\n", __func__);
@ -2254,7 +2255,7 @@ int gbam_connect(struct grmnet *gr, u8 port_num,
ret = usb_ep_enable(gr->in); ret = usb_ep_enable(gr->in);
if (ret) { if (ret) {
pr_err("%s: usb_ep_enable failed eptype:IN ep:%p", pr_err("%s: usb_ep_enable failed eptype:IN ep:%pK",
__func__, gr->in); __func__, gr->in);
usb_ep_free_request(port->port_usb->out, d->rx_req); usb_ep_free_request(port->port_usb->out, d->rx_req);
d->rx_req = NULL; d->rx_req = NULL;
@ -2277,7 +2278,7 @@ int gbam_connect(struct grmnet *gr, u8 port_num,
if (gr->out) { if (gr->out) {
ret = usb_ep_enable(gr->out); ret = usb_ep_enable(gr->out);
if (ret) { if (ret) {
pr_err("%s: usb_ep_enable failed eptype:OUT ep:%p", pr_err("%s: usb_ep_enable failed eptype:OUT ep:%pK",
__func__, gr->out); __func__, gr->out);
gr->in->driver_data = 0; gr->in->driver_data = 0;
usb_ep_disable(gr->in); usb_ep_disable(gr->in);

26
drivers/usb/gadget/function/u_bam_data.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -166,7 +166,7 @@ static int bam_data_alloc_requests(struct usb_ep *ep, struct list_head *head,
struct bam_data_ch_info *d = &port->data_ch; struct bam_data_ch_info *d = &port->data_ch;
struct usb_request *req; struct usb_request *req;
pr_debug("%s: ep:%p head:%p num:%d cb:%p", __func__, pr_debug("%s: ep:%pK head:%pK num:%d cb:%pK", __func__,
ep, head, num, cb); ep, head, num, cb);
if (d->alloc_rx_reqs) { if (d->alloc_rx_reqs) {
@ -292,7 +292,7 @@ static void bam_data_write_done(void *p, struct sk_buff *skb)
d->pending_with_bam--; d->pending_with_bam--;
pr_debug("%s: port:%p d:%p pbam:%u, pno:%d\n", __func__, pr_debug("%s: port:%pK d:%pK pbam:%u, pno:%d\n", __func__,
port, d, d->pending_with_bam, port->port_num); port, d, d->pending_with_bam, port->port_num);
spin_unlock_irqrestore(&port->port_lock, flags); spin_unlock_irqrestore(&port->port_lock, flags);
@ -526,7 +526,7 @@ static void bam_data_write_toipa(struct work_struct *w)
d->pending_with_bam++; d->pending_with_bam++;
pr_debug("%s: port:%p d:%p pbam:%u pno:%d\n", __func__, pr_debug("%s: port:%pK d:%pK pbam:%u pno:%d\n", __func__,
port, d, d->pending_with_bam, port->port_num); port, d, d->pending_with_bam, port->port_num);
spin_unlock_irqrestore(&port->port_lock, flags); spin_unlock_irqrestore(&port->port_lock, flags);
@ -809,7 +809,7 @@ static void bam2bam_data_disconnect_work(struct work_struct *w)
usb_gadget_autopm_put_async(port->gadget); usb_gadget_autopm_put_async(port->gadget);
spin_unlock_irqrestore(&port->port_lock, flags); spin_unlock_irqrestore(&port->port_lock, flags);
pr_debug("Disconnect workqueue done (port %p)\n", port); pr_debug("Disconnect workqueue done (port %pK)\n", port);
} }
/* /*
* This function configured data fifo based on index passed to get bam2bam * This function configured data fifo based on index passed to get bam2bam
@ -1144,7 +1144,7 @@ static void bam2bam_data_connect_work(struct work_struct *w)
bam_data_start_rx_transfers(d, port); bam_data_start_rx_transfers(d, port);
bam_data_start_endless_tx(port); bam_data_start_endless_tx(port);
pr_debug("Connect workqueue done (port %p)", port); pr_debug("Connect workqueue done (port %pK)", port);
return; return;
disconnect_ipa: disconnect_ipa:
@ -1187,7 +1187,7 @@ void bam_data_start_rx_tx(u8 port_num)
} }
if (!d->rx_req || !d->tx_req) { if (!d->rx_req || !d->tx_req) {
pr_err("%s: No request d->rx_req=%p, d->tx_req=%p", __func__, pr_err("%s: No request d->rx_req=%pK, d->tx_req=%pK", __func__,
d->rx_req, d->tx_req); d->rx_req, d->tx_req);
goto out; goto out;
} }
@ -1347,7 +1347,7 @@ void bam_data_disconnect(struct data_port *gr, enum function_type func,
return; return;
} }
pr_debug("dev:%p port number:%d\n", gr, port_num); pr_debug("dev:%pK port number:%d\n", gr, port_num);
if (!gr) { if (!gr) {
pr_err("data port is null\n"); pr_err("data port is null\n");
@ -1493,7 +1493,7 @@ int bam_data_connect(struct data_port *gr, enum transport_type trans,
return -EINVAL; return -EINVAL;
} }
pr_debug("dev:%p port#%d\n", gr, port_num); pr_debug("dev:%pK port#%d\n", gr, port_num);
usb_bam_type = usb_bam_get_bam_type(gr->cdev->gadget->name); usb_bam_type = usb_bam_get_bam_type(gr->cdev->gadget->name);
@ -1570,7 +1570,7 @@ int bam_data_connect(struct data_port *gr, enum transport_type trans,
ret = usb_ep_enable(gr->in); ret = usb_ep_enable(gr->in);
if (ret) { if (ret) {
pr_err("usb_ep_enable failed eptype:IN ep:%p", gr->in); pr_err("usb_ep_enable failed eptype:IN ep:%pK", gr->in);
goto exit; goto exit;
} }
@ -1578,7 +1578,7 @@ int bam_data_connect(struct data_port *gr, enum transport_type trans,
ret = usb_ep_enable(gr->out); ret = usb_ep_enable(gr->out);
if (ret) { if (ret) {
pr_err("usb_ep_enable failed eptype:OUT ep:%p", gr->out); pr_err("usb_ep_enable failed eptype:OUT ep:%pK", gr->out);
goto disable_in_ep; goto disable_in_ep;
} }
@ -1849,7 +1849,7 @@ void bam_data_suspend(struct data_port *port_usb, u8 dev_port_num,
port_usb->in_ep_desc_backup = port_usb->in->desc; port_usb->in_ep_desc_backup = port_usb->in->desc;
port_usb->out_ep_desc_backup = port_usb->out->desc; port_usb->out_ep_desc_backup = port_usb->out->desc;
pr_debug("in_ep_desc_backup = %p, out_ep_desc_backup = %p", pr_debug("in_ep_desc_backup = %pK, out_ep_desc_backup = %pK",
port_usb->in_ep_desc_backup, port_usb->in_ep_desc_backup,
port_usb->out_ep_desc_backup); port_usb->out_ep_desc_backup);
@ -1890,7 +1890,7 @@ void bam_data_resume(struct data_port *port_usb, u8 dev_port_num,
port_usb->in->desc = port_usb->in_ep_desc_backup; port_usb->in->desc = port_usb->in_ep_desc_backup;
port_usb->out->desc = port_usb->out_ep_desc_backup; port_usb->out->desc = port_usb->out_ep_desc_backup;
pr_debug("in_ep_desc_backup = %p, out_ep_desc_backup = %p", pr_debug("in_ep_desc_backup = %pK, out_ep_desc_backup = %pK",
port_usb->in_ep_desc_backup, port_usb->in_ep_desc_backup,
port_usb->out_ep_desc_backup); port_usb->out_ep_desc_backup);

12
drivers/usb/gadget/function/u_ctrl_qti.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. * Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -112,7 +112,7 @@ static void qti_ctrl_queue_notify(struct qti_ctrl_port *port)
spin_lock_irqsave(&port->lock, flags); spin_lock_irqsave(&port->lock, flags);
if (!port->is_open) { if (!port->is_open) {
pr_err("%s: rmnet ctrl file handler %p is not open", pr_err("%s: rmnet ctrl file handler %pK is not open",
__func__, port); __func__, port);
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);
return; return;
@ -165,7 +165,7 @@ static int gqti_ctrl_send_cpkt_tomodem(enum qti_port_type qport,
/* drop cpkt if port is not open */ /* drop cpkt if port is not open */
if (!port->is_open) { if (!port->is_open) {
pr_debug("rmnet file handler %p(index=%d) is not open", pr_debug("rmnet file handler %pK(index=%d) is not open",
port, port->index); port, port->index);
port->drp_cpkt_cnt++; port->drp_cpkt_cnt++;
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);
@ -206,7 +206,7 @@ int gqti_ctrl_connect(void *gr, enum qti_port_type qport, unsigned intf)
struct grmnet *g_rmnet = NULL; struct grmnet *g_rmnet = NULL;
unsigned long flags; unsigned long flags;
pr_debug("%s: port type:%d gadget:%p\n", __func__, qport, gr); pr_debug("%s: port type:%d gadget:%pK\n", __func__, qport, gr);
if (qport >= QTI_NUM_PORTS) { if (qport >= QTI_NUM_PORTS) {
pr_err("%s: Invalid QTI port %d\n", __func__, qport); pr_err("%s: Invalid QTI port %d\n", __func__, qport);
return -ENODEV; return -ENODEV;
@ -259,7 +259,7 @@ void gqti_ctrl_disconnect(void *gr, enum qti_port_type qport)
struct rmnet_ctrl_pkt *cpkt; struct rmnet_ctrl_pkt *cpkt;
struct grmnet *g_rmnet = NULL; struct grmnet *g_rmnet = NULL;
pr_debug("%s: gadget:%p\n", __func__, gr); pr_debug("%s: gadget:%pK\n", __func__, gr);
if (qport >= QTI_NUM_PORTS) { if (qport >= QTI_NUM_PORTS) {
pr_err("%s: Invalid QTI port %d\n", __func__, qport); pr_err("%s: Invalid QTI port %d\n", __func__, qport);
@ -650,7 +650,7 @@ static int qti_ctrl_read_stats(struct seq_file *s, void *unused)
continue; continue;
spin_lock_irqsave(&port->lock, flags); spin_lock_irqsave(&port->lock, flags);
seq_printf(s, "\n#PORT:%d port: %p\n", i, port); seq_printf(s, "\n#PORT:%d port: %pK\n", i, port);
seq_printf(s, "name: %s\n", port->name); seq_printf(s, "name: %s\n", port->name);
seq_printf(s, "host_to_modem: %d\n", seq_printf(s, "host_to_modem: %d\n",
port->host_to_modem); port->host_to_modem);

26
drivers/usb/gadget/function/u_data_ipa.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -183,7 +183,7 @@ void ipa_data_start_rx_tx(enum ipa_func_type func)
} }
if (!port->rx_req || !port->tx_req) { if (!port->rx_req || !port->tx_req) {
pr_err("%s: No request d->rx_req=%p, d->tx_req=%p", __func__, pr_err("%s: No request d->rx_req=%pK, d->tx_req=%pK", __func__,
port->rx_req, port->tx_req); port->rx_req, port->tx_req);
spin_unlock_irqrestore(&port->port_lock, flags); spin_unlock_irqrestore(&port->port_lock, flags);
return; return;
@ -290,7 +290,7 @@ void ipa_data_disconnect(struct gadget_ipa_port *gp, enum ipa_func_type func)
unsigned long flags; unsigned long flags;
struct usb_gadget *gadget = NULL; struct usb_gadget *gadget = NULL;
pr_debug("dev:%p port number:%d\n", gp, func); pr_debug("dev:%pK port number:%d\n", gp, func);
if (func >= USB_IPA_NUM_FUNCS) { if (func >= USB_IPA_NUM_FUNCS) {
pr_err("invalid ipa portno#%d\n", func); pr_err("invalid ipa portno#%d\n", func);
return; return;
@ -667,7 +667,7 @@ static void ipa_data_connect_work(struct work_struct *w)
if (gport->in) if (gport->in)
ipa_data_start_endless_xfer(port, true); ipa_data_start_endless_xfer(port, true);
pr_debug("Connect workqueue done (port %p)", port); pr_debug("Connect workqueue done (port %pK)", port);
return; return;
disconnect_usb_bam_ipa_out: disconnect_usb_bam_ipa_out:
@ -717,7 +717,7 @@ int ipa_data_connect(struct gadget_ipa_port *gp, enum ipa_func_type func,
unsigned long flags; unsigned long flags;
int ret; int ret;
pr_debug("dev:%p port#%d src_connection_idx:%d dst_connection_idx:%d\n", pr_debug("dev:%pK port#%d src_connection_idx:%d dst_connection_idx:%d\n",
gp, func, src_connection_idx, dst_connection_idx); gp, func, src_connection_idx, dst_connection_idx);
if (func >= USB_IPA_NUM_FUNCS) { if (func >= USB_IPA_NUM_FUNCS) {
@ -781,7 +781,7 @@ int ipa_data_connect(struct gadget_ipa_port *gp, enum ipa_func_type func,
port->port_usb->in->endless = true; port->port_usb->in->endless = true;
ret = usb_ep_enable(port->port_usb->in); ret = usb_ep_enable(port->port_usb->in);
if (ret) { if (ret) {
pr_err("usb_ep_enable failed eptype:IN ep:%p", pr_err("usb_ep_enable failed eptype:IN ep:%pK",
port->port_usb->in); port->port_usb->in);
usb_ep_free_request(port->port_usb->in, port->tx_req); usb_ep_free_request(port->port_usb->in, port->tx_req);
port->tx_req = NULL; port->tx_req = NULL;
@ -794,7 +794,7 @@ int ipa_data_connect(struct gadget_ipa_port *gp, enum ipa_func_type func,
port->port_usb->out->endless = true; port->port_usb->out->endless = true;
ret = usb_ep_enable(port->port_usb->out); ret = usb_ep_enable(port->port_usb->out);
if (ret) { if (ret) {
pr_err("usb_ep_enable failed eptype:OUT ep:%p", pr_err("usb_ep_enable failed eptype:OUT ep:%pK",
port->port_usb->out); port->port_usb->out);
usb_ep_free_request(port->port_usb->out, port->rx_req); usb_ep_free_request(port->port_usb->out, port->rx_req);
port->rx_req = NULL; port->rx_req = NULL;
@ -953,12 +953,12 @@ void ipa_data_suspend(struct gadget_ipa_port *gp, enum ipa_func_type func,
*/ */
if (gp->in) { if (gp->in) {
gp->in_ep_desc_backup = gp->in->desc; gp->in_ep_desc_backup = gp->in->desc;
pr_debug("in_ep_desc_backup = %p\n", pr_debug("in_ep_desc_backup = %pK\n",
gp->in_ep_desc_backup); gp->in_ep_desc_backup);
} }
if (gp->out) { if (gp->out) {
gp->out_ep_desc_backup = gp->out->desc; gp->out_ep_desc_backup = gp->out->desc;
pr_debug("out_ep_desc_backup = %p\n", pr_debug("out_ep_desc_backup = %pK\n",
gp->out_ep_desc_backup); gp->out_ep_desc_backup);
} }
ipa_data_disconnect(gp, func); ipa_data_disconnect(gp, func);
@ -1040,7 +1040,7 @@ void ipa_data_resume(struct gadget_ipa_port *gp, enum ipa_func_type func,
u8 dst_connection_idx = 0; u8 dst_connection_idx = 0;
enum usb_ctrl usb_bam_type; enum usb_ctrl usb_bam_type;
pr_debug("dev:%p port number:%d\n", gp, func); pr_debug("dev:%pK port number:%d\n", gp, func);
if (func >= USB_IPA_NUM_FUNCS) { if (func >= USB_IPA_NUM_FUNCS) {
pr_err("invalid ipa portno#%d\n", func); pr_err("invalid ipa portno#%d\n", func);
@ -1066,7 +1066,7 @@ void ipa_data_resume(struct gadget_ipa_port *gp, enum ipa_func_type func,
/* Restore endpoint descriptors info. */ /* Restore endpoint descriptors info. */
if (gp->in) { if (gp->in) {
gp->in->desc = gp->in_ep_desc_backup; gp->in->desc = gp->in_ep_desc_backup;
pr_debug("in_ep_desc_backup = %p\n", pr_debug("in_ep_desc_backup = %pK\n",
gp->in_ep_desc_backup); gp->in_ep_desc_backup);
dst_connection_idx = usb_bam_get_connection_idx( dst_connection_idx = usb_bam_get_connection_idx(
usb_bam_type, IPA_P_BAM, PEER_PERIPHERAL_TO_USB, usb_bam_type, IPA_P_BAM, PEER_PERIPHERAL_TO_USB,
@ -1074,7 +1074,7 @@ void ipa_data_resume(struct gadget_ipa_port *gp, enum ipa_func_type func,
} }
if (gp->out) { if (gp->out) {
gp->out->desc = gp->out_ep_desc_backup; gp->out->desc = gp->out_ep_desc_backup;
pr_debug("out_ep_desc_backup = %p\n", pr_debug("out_ep_desc_backup = %pK\n",
gp->out_ep_desc_backup); gp->out_ep_desc_backup);
src_connection_idx = usb_bam_get_connection_idx( src_connection_idx = usb_bam_get_connection_idx(
usb_bam_type, IPA_P_BAM, USB_TO_PEER_PERIPHERAL, usb_bam_type, IPA_P_BAM, USB_TO_PEER_PERIPHERAL,
@ -1174,7 +1174,7 @@ static int ipa_data_port_alloc(enum ipa_func_type func)
ipa_data_ports[func] = port; ipa_data_ports[func] = port;
pr_debug("port:%p with portno:%d allocated\n", port, func); pr_debug("port:%pK with portno:%d allocated\n", port, func);
return 0; return 0;
} }

12
drivers/usb/gadget/function/u_ether.c
View file

@ -889,7 +889,7 @@ static int get_ether_addr_str(u8 dev_addr[ETH_ALEN], char *str, int len)
if (len < 18) if (len < 18)
return -EINVAL; return -EINVAL;
snprintf(str, len, "%pM", dev_addr); snprintf(str, len, "%pKM", dev_addr);
return 18; return 18;
} }
@ -971,8 +971,8 @@ struct eth_dev *gether_setup_name(struct usb_gadget *g,
free_netdev(net); free_netdev(net);
dev = ERR_PTR(status); dev = ERR_PTR(status);
} else { } else {
INFO(dev, "MAC %pM\n", net->dev_addr); INFO(dev, "MAC %pKM\n", net->dev_addr);
INFO(dev, "HOST MAC %pM\n", dev->host_mac); INFO(dev, "HOST MAC %pKM\n", dev->host_mac);
/* /*
* two kinds of host-initiated state changes: * two kinds of host-initiated state changes:
@ -1040,7 +1040,7 @@ int gether_register_netdev(struct net_device *net)
dev_dbg(&g->dev, "register_netdev failed, %d\n", status); dev_dbg(&g->dev, "register_netdev failed, %d\n", status);
return status; return status;
} else { } else {
INFO(dev, "HOST MAC %pM\n", dev->host_mac); INFO(dev, "HOST MAC %pKM\n", dev->host_mac);
/* two kinds of host-initiated state changes: /* two kinds of host-initiated state changes:
* - iff DATA transfer is active, carrier is "on" * - iff DATA transfer is active, carrier is "on"
@ -1056,7 +1056,7 @@ int gether_register_netdev(struct net_device *net)
if (status) if (status)
pr_warn("cannot set self ethernet address: %d\n", status); pr_warn("cannot set self ethernet address: %d\n", status);
else else
INFO(dev, "MAC %pM\n", dev->dev_mac); INFO(dev, "MAC %pKM\n", dev->dev_mac);
return status; return status;
} }
@ -1124,7 +1124,7 @@ int gether_get_host_addr_cdc(struct net_device *net, char *host_addr, int len)
return -EINVAL; return -EINVAL;
dev = netdev_priv(net); dev = netdev_priv(net);
snprintf(host_addr, len, "%pm", dev->host_mac); snprintf(host_addr, len, "%pKm", dev->host_mac);
return strlen(host_addr); return strlen(host_addr);
} }

6
drivers/usb/gadget/function/u_qc_ether.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2003-2005,2008 David Brownell * Copyright (C) 2003-2005,2008 David Brownell
* Copyright (C) 2003-2004 Robert Schwebel, Benedikt Spranger * Copyright (C) 2003-2004 Robert Schwebel, Benedikt Spranger
* Copyright (C) 2008 Nokia Corporation * Copyright (C) 2008 Nokia Corporation
* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved. * Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 * it under the terms of the GNU General Public License version 2
@ -317,8 +317,8 @@ int gether_qc_setup_name(struct usb_gadget *g, u8 ethaddr[ETH_ALEN],
dev_dbg(&g->dev, "register_netdev failed, %d\n", status); dev_dbg(&g->dev, "register_netdev failed, %d\n", status);
free_netdev(net); free_netdev(net);
} else { } else {
INFO(dev, "MAC %pM\n", net->dev_addr); INFO(dev, "MAC %pKM\n", net->dev_addr);
INFO(dev, "HOST MAC %pM\n", dev->host_mac); INFO(dev, "HOST MAC %pKM\n", dev->host_mac);
} }

21
drivers/usb/gadget/function/u_serial.c
View file

@ -4,7 +4,7 @@
* Copyright (C) 2003 Al Borchers (alborchers@steinerpoint.com) * Copyright (C) 2003 Al Borchers (alborchers@steinerpoint.com)
* Copyright (C) 2008 David Brownell * Copyright (C) 2008 David Brownell
* Copyright (C) 2008 by Nokia Corporation * Copyright (C) 2008 by Nokia Corporation
* Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
* *
* This code also borrows from usbserial.c, which is * This code also borrows from usbserial.c, which is
* Copyright (C) 1999 - 2002 Greg Kroah-Hartman (greg@kroah.com) * Copyright (C) 1999 - 2002 Greg Kroah-Hartman (greg@kroah.com)
@ -862,7 +862,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
spin_lock_irq(&port->port_lock); spin_lock_irq(&port->port_lock);
if (status) { 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->port_num, tty, file);
port->openclose = false; port->openclose = false;
goto exit_unlock_port; goto exit_unlock_port;
@ -892,7 +892,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
gser->connect(gser); 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);
status = 0; status = 0;
@ -928,7 +928,8 @@ static void gs_close(struct tty_struct *tty, struct file *file)
goto exit; 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);
/* mark port as closing but in use; we can drop port lock /* mark port as closing but in use; we can drop port lock
* and sleep if necessary * and sleep if necessary
@ -965,7 +966,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
port->openclose = false; 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); port->port_num, tty, file);
wake_up(&port->close_wait); wake_up(&port->close_wait);
@ -982,7 +983,7 @@ static int gs_write(struct tty_struct *tty, const unsigned char *buf, int count)
if (!port) if (!port)
return 0; return 0;
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); port->port_num, tty, count);
spin_lock_irqsave(&port->port_lock, flags); spin_lock_irqsave(&port->port_lock, flags);
@ -1004,7 +1005,7 @@ static int gs_put_char(struct tty_struct *tty, unsigned char ch)
if (!port) if (!port)
return 0; return 0;
pr_vdebug("gs_put_char: (%d,%p) char=0x%x, called from %ps\n", pr_vdebug("gs_put_char: (%d,%pK) char=0x%x, called from %pKs\n",
port->port_num, tty, ch, __builtin_return_address(0)); port->port_num, tty, ch, __builtin_return_address(0));
spin_lock_irqsave(&port->port_lock, flags); spin_lock_irqsave(&port->port_lock, flags);
@ -1021,7 +1022,7 @@ static void gs_flush_chars(struct tty_struct *tty)
if (!port) if (!port)
return; return;
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); spin_lock_irqsave(&port->port_lock, flags);
if (port->port_usb) if (port->port_usb)
@ -1042,7 +1043,7 @@ static int gs_write_room(struct tty_struct *tty)
room = gs_buf_space_avail(&port->port_write_buf); room = gs_buf_space_avail(&port->port_write_buf);
spin_unlock_irqrestore(&port->port_lock, flags); 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); port->port_num, tty, room);
return room; return room;
@ -1058,7 +1059,7 @@ static int gs_chars_in_buffer(struct tty_struct *tty)
chars = gs_buf_data_avail(&port->port_write_buf); chars = gs_buf_data_avail(&port->port_write_buf);
spin_unlock_irqrestore(&port->port_lock, flags); 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); port->port_num, tty, chars);
return chars; return chars;