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

Commit 0e00609d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: serial: option.c: remove dbg() usage 



dbg() was a very old USB-serial-specific macro.
This patch removes it from being used in the
driver and uses dev_dbg() instead.

CC: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d44d9ab7

drivers/usb/serial/option.c

+8 −7
Original line number Diff line number Diff line
@@ -1368,17 +1368,18 @@ static void option_instat_callback(struct urb *urb) 
	int err;

	int status = urb->status;

	struct usb_serial_port *port = urb->context;

	struct device *dev = &port->dev;

	struct usb_wwan_port_private *portdata =

					usb_get_serial_port_data(port);



	dbg("%s: urb %p port %p has data %p", __func__, urb, port, portdata);

	dev_dbg(dev, "%s: urb %p port %p has data %p\n", __func__, urb, port, portdata);



	if (status == 0) {

		struct usb_ctrlrequest *req_pkt =

				(struct usb_ctrlrequest *)urb->transfer_buffer;



		if (!req_pkt) {

			dbg("%s: NULL req_pkt", __func__);

			dev_dbg(dev, "%s: NULL req_pkt\n", __func__);

			return;

		}

		if ((req_pkt->bRequestType == 0xA1) &&
@@ -1388,7 +1389,7 @@ static void option_instat_callback(struct urb *urb) 
					urb->transfer_buffer +

					sizeof(struct usb_ctrlrequest));



			dbg("%s: signal x%x", __func__, signals);

			dev_dbg(dev, "%s: signal x%x\n", __func__, signals);



			old_dcd_state = portdata->dcd_state;

			portdata->cts_state = 1;
@@ -1404,17 +1405,17 @@ static void option_instat_callback(struct urb *urb) 
				tty_kref_put(tty);

			}

		} else {

			dbg("%s: type %x req %x", __func__,

			dev_dbg(dev, "%s: type %x req %x\n", __func__,

				req_pkt->bRequestType, req_pkt->bRequest);

		}

	} else

		dev_err(&port->dev, "%s: error %d\n", __func__, status);

		dev_err(dev, "%s: error %d\n", __func__, status);



	/* Resubmit urb so we continue receiving IRQ data */

	if (status != -ESHUTDOWN && status != -ENOENT) {

		err = usb_submit_urb(urb, GFP_ATOMIC);

		if (err)

			dbg("%s: resubmit intr urb failed. (%d)",

			dev_dbg(dev, "%s: resubmit intr urb failed. (%d)\n",

				__func__, err);

	}

}