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

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

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

parents 576fd3e7 ffdb2d3b

drivers/usb/gadget/composite.c

+10 −10
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ int usb_add_function(struct usb_configuration *config, 
{

	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,

			config->label, config);
@@ -301,7 +301,7 @@ int usb_add_function(struct usb_configuration *config, 


done:

	if (value)

		DBG(config->cdev, "adding '%s'/%p --> %d\n",

		DBG(config->cdev, "adding '%s'/%pK --> %d\n",

				function->name, function, value);

	return value;

}
@@ -935,7 +935,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);
@@ -1010,7 +1010,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);
@@ -1027,7 +1027,7 @@ int usb_add_config(struct usb_composite_dev *cdev, 
					struct usb_function, list);

			list_del(&f->list);

			if (f->unbind) {

				DBG(cdev, "unbind function '%s'/%p\n",

				DBG(cdev, "unbind function '%s'/%pK\n",

					f->name, f);

				f->unbind(config, f);

				/* may free memory for "f" */
@@ -1038,7 +1038,7 @@ int usb_add_config(struct usb_composite_dev *cdev, 
	} else {

		unsigned	i;



		DBG(cdev, "cfg %d/%p speeds:%s%s%s%s\n",

		DBG(cdev, "cfg %d/%pK speeds:%s%s%s%s\n",

			config->bConfigurationValue, config,

			config->superspeed_plus ? " superplus" : "",

			config->superspeed ? " super" : "",
@@ -1054,7 +1054,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);

		}

	}
@@ -1083,7 +1083,7 @@ static void remove_config(struct usb_composite_dev *cdev, 
	}

	list_del(&config->list);

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

			/* may free memory for "c" */

	}
@@ -1491,7 +1491,7 @@ static void composite_setup_complete(struct usb_ep *ep, struct usb_request *req) 
	else if (cdev->os_desc_req == req)

		cdev->os_desc_pending = false;

	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,
@@ -1506,7 +1506,7 @@ static int composite_ep0_queue(struct usb_composite_dev *cdev, 
		else if (cdev->os_desc_req == req)

			cdev->os_desc_pending = true;

		else

			WARN(1, "unknown request %p\n", req);

			WARN(1, "unknown request %pK\n", req);

	}



	return ret;

drivers/usb/gadget/configfs.c

+2 −2
Original line number Diff line number Diff line
@@ -1256,7 +1256,7 @@ static void purge_configs_funcs(struct gadget_info *gi) 
			list_move_tail(&f->list, &cfg->func_list);

			if (f->unbind) {

				dev_dbg(&gi->cdev.gadget->dev,

					"unbind function '%s'/%p\n",

					"unbind function '%s'/%pK\n",

					f->name, f);

				f->unbind(c, f);

			}
@@ -1459,7 +1459,7 @@ static void android_work(struct work_struct *data) 
	}



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

	}

}

drivers/usb/gadget/function/f_accessory.c

+5 −5
Original line number Diff line number Diff line
@@ -515,7 +515,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, "%s dev: %pK\n", __func__, dev);



	ep = usb_ep_autoconfig(cdev->gadget, in_desc);

	if (!ep) {
@@ -605,7 +605,7 @@ static ssize_t acc_read(struct file *fp, char __user *buf, 
		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 */
@@ -628,7 +628,7 @@ static ssize_t acc_read(struct file *fp, char __user *buf, 
		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))
@@ -938,7 +938,7 @@ __acc_function_bind(struct usb_configuration *c, 
	int			id;

	int			ret;



	DBG(cdev, "acc_function_bind dev: %p\n", dev);

	DBG(cdev, "acc_function_bind dev: %pK\n", dev);



	if (configfs) {

		if (acc_string_defs[INTERFACE_STRING_INDEX].id == 0) {
@@ -1117,7 +1117,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);

drivers/usb/gadget/function/f_acm.c

+1 −1
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ acm_bind(struct usb_configuration *c, struct usb_function *f) 
	if (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;

}

drivers/usb/gadget/function/f_cdev.c

+18 −18
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2011, 2013-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011, 2013-2019, The Linux Foundation. All rights reserved.

 * Linux Foundation chooses to take subject only to the GPLv2 license terms,

 * and distributes only under these terms.

 *
@@ -843,7 +843,7 @@ static int usb_cser_alloc_requests(struct usb_ep *ep, struct list_head *head, 
	int i;

	struct usb_request *req;



	pr_debug("ep:%p head:%p num:%d size:%d cb:%p",

	pr_debug("ep:%pK head:%p num:%d size:%d cb:%p\n",

				ep, head, num, size, cb);



	for (i = 0; i < num; i++) {
@@ -893,7 +893,7 @@ static void usb_cser_start_rx(struct f_cdev *port) 
		ret = usb_ep_queue(ep, req, GFP_KERNEL);

		spin_lock_irqsave(&port->port_lock, flags);

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

			list_add(&req->list, pool);

			break;
@@ -908,7 +908,7 @@ static void usb_cser_read_complete(struct usb_ep *ep, struct usb_request *req) 
	struct f_cdev *port = ep->driver_data;

	unsigned long flags;



	pr_debug("ep:(%p)(%s) port:%p req_status:%d req->actual:%u\n",

	pr_debug("ep:(%pK)(%s) port:%p req_status:%d req->actual:%u\n",

			ep, ep->name, port, req->status, req->actual);

	if (!port) {

		pr_err("port is null\n");
@@ -934,7 +934,7 @@ static void usb_cser_write_complete(struct usb_ep *ep, struct usb_request *req) 
	unsigned long flags;

	struct f_cdev *port = ep->driver_data;



	pr_debug("ep:(%p)(%s) port:%p req_stats:%d\n",

	pr_debug("ep:(%pK)(%s) port:%p req_stats:%d\n",

			ep, ep->name, port, req->status);



	if (!port) {
@@ -967,7 +967,7 @@ static void usb_cser_start_io(struct f_cdev *port) 
	int ret = -ENODEV;

	unsigned long	flags;



	pr_debug("port: %p\n", port);

	pr_debug("port: %pK\n", port);



	spin_lock_irqsave(&port->port_lock, flags);

	if (!port->is_connected)
@@ -1010,7 +1010,7 @@ static void usb_cser_stop_io(struct f_cdev *port) 
	struct usb_ep	*out;

	unsigned long	flags;



	pr_debug("port:%p\n", port);

	pr_debug("port:%pK\n", port);



	in = port->port_usb.in;

	out = port->port_usb.out;
@@ -1053,7 +1053,7 @@ int f_cdev_open(struct inode *inode, struct file *file) 
	}



	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,

					port->is_connected);

	if (ret) {
@@ -1066,7 +1066,7 @@ int f_cdev_open(struct inode *inode, struct file *file) 
	spin_unlock_irqrestore(&port->port_lock, flags);

	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;

}
@@ -1086,7 +1086,7 @@ int f_cdev_release(struct inode *inode, struct file *file) 
	port->port_open = false;

	port->cbits_updated = false;

	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;

}
@@ -1110,7 +1110,7 @@ ssize_t f_cdev_read(struct file *file, 
		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);

	current_rx_req = port->current_rx_req;

	pending_rx_bytes = port->pending_rx_bytes;
@@ -1211,7 +1211,7 @@ ssize_t f_cdev_write(struct file *file, 
	}



	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) {

		spin_unlock_irqrestore(&port->port_lock, flags);
@@ -1381,7 +1381,7 @@ static long f_cdev_ioctl(struct file *fp, unsigned int cmd, 
	case TIOCMBIC:

	case TIOCMBIS:

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

		if (i) {

			pr_err("Error getting TIOCMSET value\n");
@@ -1390,7 +1390,7 @@ static long f_cdev_ioctl(struct file *fp, unsigned int cmd, 
		ret = f_cdev_tiocmset(port, val, ~val);

		break;

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

		if (ret >= 0) {

			ret = put_user(ret, (uint32_t *)arg);
@@ -1440,14 +1440,14 @@ int usb_cser_connect(struct f_cdev *port) 
		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->notify_modem = usb_cser_notify_modem;



	ret = usb_ep_enable(cser->in);

	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\n",

					cser->in, ret);

		return ret;

	}
@@ -1455,7 +1455,7 @@ int usb_cser_connect(struct f_cdev *port) 


	ret = usb_ep_enable(cser->out);

	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\n",

					cser->out, ret);

		cser->in->driver_data = 0;

		return ret;
@@ -1567,7 +1567,7 @@ static struct f_cdev *f_cdev_alloc(char *func_name, int portno) 
		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);

	return port;