Skip to content

L
linux
Commit 9bcac5a8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Vojtech Pavlik
Browse files
Options

[PATCH] USB: convert visor driver to use dev_err() and dev_info() macros

parent 1b2fe820
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 27 deletions
drivers/usb/serial/visor.c
View file @ 9bcac5a8
...@@ -303,7 +303,7 @@ static int visor_open (struct usb_serial_port *port, struct file *filp) ...@@ -303,7 +303,7 @@ static int visor_open (struct usb_serial_port *port, struct file *filp)
if (!port->read_urb) { if (!port->read_urb) {
/* this is needed for some brain dead Sony devices */ /* this is needed for some brain dead Sony devices */
err ("Device lied about number of ports, please use a lower one."); dev_err(port->dev, "Device lied about number of ports, please use a lower one.\n");
return -ENODEV; return -ENODEV;
} }
...@@ -327,8 +327,8 @@ static int visor_open (struct usb_serial_port *port, struct file *filp) ...@@ -327,8 +327,8 @@ static int visor_open (struct usb_serial_port *port, struct file *filp)
visor_read_bulk_callback, port); visor_read_bulk_callback, port);
result = usb_submit_urb(port->read_urb, GFP_KERNEL); result = usb_submit_urb(port->read_urb, GFP_KERNEL);
if (result) { if (result) {
err("%s - failed submitting read urb, error %d", dev_err(port->dev, "%s - failed submitting read urb, error %d\n",
__FUNCTION__, result); __FUNCTION__, result);
goto exit; goto exit;
} }
...@@ -336,8 +336,8 @@ static int visor_open (struct usb_serial_port *port, struct file *filp) ...@@ -336,8 +336,8 @@ static int visor_open (struct usb_serial_port *port, struct file *filp)
dbg("%s - adding interrupt input for treo", __FUNCTION__); dbg("%s - adding interrupt input for treo", __FUNCTION__);
result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
if (result) if (result)
err("%s - failed submitting interrupt urb, error %d", dev_err(port->dev, "%s - failed submitting interrupt urb, error %d\n",
__FUNCTION__, result); __FUNCTION__, result);
} }
exit: exit:
return result; return result;
...@@ -363,7 +363,7 @@ static void visor_close (struct usb_serial_port *port, struct file * filp) ...@@ -363,7 +363,7 @@ static void visor_close (struct usb_serial_port *port, struct file * filp)
* device is still here */ * device is still here */
transfer_buffer = kmalloc (0x12, GFP_KERNEL); transfer_buffer = kmalloc (0x12, GFP_KERNEL);
if (!transfer_buffer) { if (!transfer_buffer) {
err("%s - kmalloc(%d) failed.", __FUNCTION__, 0x12); dev_err(port->dev, "%s - kmalloc(%d) failed.\n", __FUNCTION__, 0x12);
} else { } else {
/* send a shutdown message to the device */ /* send a shutdown message to the device */
usb_control_msg (serial->dev, usb_control_msg (serial->dev,
...@@ -380,7 +380,7 @@ static void visor_close (struct usb_serial_port *port, struct file * filp) ...@@ -380,7 +380,7 @@ static void visor_close (struct usb_serial_port *port, struct file * filp)
usb_unlink_urb (port->interrupt_in_urb); usb_unlink_urb (port->interrupt_in_urb);
} }
/* Uncomment the following line if you want to see some statistics in your syslog */ /* Uncomment the following line if you want to see some statistics in your syslog */
/* info ("Bytes In = %d Bytes Out = %d", bytes_in, bytes_out); */ /* dev_info (port->dev, "Bytes In = %d Bytes Out = %d\n", bytes_in, bytes_out); */
} }
...@@ -395,13 +395,13 @@ static int visor_write (struct usb_serial_port *port, int from_user, const unsig ...@@ -395,13 +395,13 @@ static int visor_write (struct usb_serial_port *port, int from_user, const unsig
buffer = kmalloc (count, GFP_ATOMIC); buffer = kmalloc (count, GFP_ATOMIC);
if (!buffer) { if (!buffer) {
err ("out of memory"); dev_err(port->dev, "out of memory\n");
return -ENOMEM; return -ENOMEM;
} }
urb = usb_alloc_urb(0, GFP_ATOMIC); urb = usb_alloc_urb(0, GFP_ATOMIC);
if (!urb) { if (!urb) {
err ("no more free urbs"); dev_err(port->dev, "no more free urbs\n");
kfree (buffer); kfree (buffer);
return -ENOMEM; return -ENOMEM;
} }
...@@ -427,8 +427,8 @@ static int visor_write (struct usb_serial_port *port, int from_user, const unsig ...@@ -427,8 +427,8 @@ static int visor_write (struct usb_serial_port *port, int from_user, const unsig
/* send it down the pipe */ /* send it down the pipe */
status = usb_submit_urb(urb, GFP_ATOMIC); status = usb_submit_urb(urb, GFP_ATOMIC);
if (status) { if (status) {
err("%s - usb_submit_urb(write bulk) failed with status = %d", dev_err(port->dev, "%s - usb_submit_urb(write bulk) failed with status = %d\n",
__FUNCTION__, status); __FUNCTION__, status);
count = status; count = status;
} else { } else {
bytes_out += count; bytes_out += count;
...@@ -539,7 +539,7 @@ static void visor_read_bulk_callback (struct urb *urb, struct pt_regs *regs) ...@@ -539,7 +539,7 @@ static void visor_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
visor_read_bulk_callback, port); visor_read_bulk_callback, port);
result = usb_submit_urb(port->read_urb, GFP_ATOMIC); result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
if (result) if (result)
err("%s - failed resubmitting read urb, error %d", __FUNCTION__, result); dev_err(port->dev, "%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result);
return; return;
} }
...@@ -577,8 +577,8 @@ static void visor_read_int_callback (struct urb *urb, struct pt_regs *regs) ...@@ -577,8 +577,8 @@ static void visor_read_int_callback (struct urb *urb, struct pt_regs *regs)
exit: exit:
result = usb_submit_urb (urb, GFP_ATOMIC); result = usb_submit_urb (urb, GFP_ATOMIC);
if (result) if (result)
err("%s - Error %d submitting interrupt urb", dev_err(urb->dev->dev, "%s - Error %d submitting interrupt urb\n",
__FUNCTION__, result); __FUNCTION__, result);
} }
static void visor_throttle (struct usb_serial_port *port) static void visor_throttle (struct usb_serial_port *port)
...@@ -597,18 +597,19 @@ static void visor_unthrottle (struct usb_serial_port *port) ...@@ -597,18 +597,19 @@ static void visor_unthrottle (struct usb_serial_port *port)
port->read_urb->dev = port->serial->dev; port->read_urb->dev = port->serial->dev;
result = usb_submit_urb(port->read_urb, GFP_ATOMIC); result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
if (result) if (result)
err("%s - failed submitting read urb, error %d", __FUNCTION__, result); dev_err(port->dev, "%s - failed submitting read urb, error %d\n", __FUNCTION__, result);
} }
static int visor_probe (struct usb_serial *serial) static int visor_probe (struct usb_serial *serial)
{ {
struct device *dev = &serial->dev->dev;
int response; int response;
int i; int i;
int num_ports; int num_ports;
unsigned char *transfer_buffer = kmalloc (256, GFP_KERNEL); unsigned char *transfer_buffer = kmalloc (256, GFP_KERNEL);
if (!transfer_buffer) { if (!transfer_buffer) {
err("%s - kmalloc(%d) failed.", __FUNCTION__, 256); dev_err(*dev, "%s - kmalloc(%d) failed.\n", __FUNCTION__, 256);
return -ENOMEM; return -ENOMEM;
} }
...@@ -621,14 +622,14 @@ static int visor_probe (struct usb_serial *serial) ...@@ -621,14 +622,14 @@ static int visor_probe (struct usb_serial *serial)
response = usb_control_msg (serial->dev, usb_rcvctrlpipe(serial->dev, 0), VISOR_GET_CONNECTION_INFORMATION, response = usb_control_msg (serial->dev, usb_rcvctrlpipe(serial->dev, 0), VISOR_GET_CONNECTION_INFORMATION,
0xc2, 0x0000, 0x0000, transfer_buffer, 0x12, 300); 0xc2, 0x0000, 0x0000, transfer_buffer, 0x12, 300);
if (response < 0) { if (response < 0) {
err("%s - error getting connection information", __FUNCTION__); dev_err(*dev, "%s - error getting connection information\n", __FUNCTION__);
} else { } else {
struct visor_connection_info *connection_info = (struct visor_connection_info *)transfer_buffer; struct visor_connection_info *connection_info = (struct visor_connection_info *)transfer_buffer;
char *string; char *string;
le16_to_cpus(&connection_info->num_ports); le16_to_cpus(&connection_info->num_ports);
num_ports = connection_info->num_ports; num_ports = connection_info->num_ports;
info("%s: Number of ports: %d", serial->type->name, connection_info->num_ports); dev_info(*dev, "%s: Number of ports: %d\n", serial->type->name, connection_info->num_ports);
for (i = 0; i < num_ports; ++i) { for (i = 0; i < num_ports; ++i) {
switch (connection_info->connections[i].port_function_id) { switch (connection_info->connections[i].port_function_id) {
case VISOR_FUNCTION_GENERIC: case VISOR_FUNCTION_GENERIC:
...@@ -650,8 +651,8 @@ static int visor_probe (struct usb_serial *serial) ...@@ -650,8 +651,8 @@ static int visor_probe (struct usb_serial *serial)
string = "unknown"; string = "unknown";
break; break;
} }
info("%s: port %d, is for %s use", serial->type->name, dev_info(*dev, "%s: port %d, is for %s use\n", serial->type->name,
connection_info->connections[i].port, string); connection_info->connections[i].port, string);
/* save off our num_ports info so that we can use it in the calc_num_ports call */ /* save off our num_ports info so that we can use it in the calc_num_ports call */
serial->private = (void *)(long)num_ports; serial->private = (void *)(long)num_ports;
} }
...@@ -666,7 +667,7 @@ static int visor_probe (struct usb_serial *serial) ...@@ -666,7 +667,7 @@ static int visor_probe (struct usb_serial *serial)
0xc2, 0x0000, 0x0000, transfer_buffer, 0xc2, 0x0000, 0x0000, transfer_buffer,
0x14, 300); 0x14, 300);
if (response < 0) { if (response < 0) {
err("%s - error getting first unknown palm command", __FUNCTION__); dev_err(*dev, "%s - error getting first unknown palm command\n", __FUNCTION__);
} else { } else {
usb_serial_debug_data (__FILE__, __FUNCTION__, 0x14, transfer_buffer); usb_serial_debug_data (__FILE__, __FUNCTION__, 0x14, transfer_buffer);
} }
...@@ -675,7 +676,7 @@ static int visor_probe (struct usb_serial *serial) ...@@ -675,7 +676,7 @@ static int visor_probe (struct usb_serial *serial)
0xc2, 0x0000, 0x0000, transfer_buffer, 0xc2, 0x0000, 0x0000, transfer_buffer,
0x14, 300); 0x14, 300);
if (response < 0) { if (response < 0) {
err("%s - error getting second unknown palm command", __FUNCTION__); dev_err(*dev, "%s - error getting second unknown palm command\n", __FUNCTION__);
} else { } else {
usb_serial_debug_data (__FILE__, __FUNCTION__, 0x14, transfer_buffer); usb_serial_debug_data (__FILE__, __FUNCTION__, 0x14, transfer_buffer);
} }
...@@ -685,7 +686,7 @@ static int visor_probe (struct usb_serial *serial) ...@@ -685,7 +686,7 @@ static int visor_probe (struct usb_serial *serial)
response = usb_control_msg (serial->dev, usb_rcvctrlpipe(serial->dev, 0), VISOR_REQUEST_BYTES_AVAILABLE, response = usb_control_msg (serial->dev, usb_rcvctrlpipe(serial->dev, 0), VISOR_REQUEST_BYTES_AVAILABLE,
0xc2, 0x0000, 0x0005, transfer_buffer, 0x02, 300); 0xc2, 0x0000, 0x0005, transfer_buffer, 0x02, 300);
if (response < 0) { if (response < 0) {
err("%s - error getting bytes available request", __FUNCTION__); dev_err(*dev, "%s - error getting bytes available request\n", __FUNCTION__);
} }
kfree (transfer_buffer); kfree (transfer_buffer);
...@@ -707,6 +708,7 @@ static int visor_calc_num_ports (struct usb_serial *serial) ...@@ -707,6 +708,7 @@ static int visor_calc_num_ports (struct usb_serial *serial)
static int clie_3_5_startup (struct usb_serial *serial) static int clie_3_5_startup (struct usb_serial *serial)
{ {
struct device *dev = &serial->dev->dev;
int result; int result;
u8 data; u8 data;
...@@ -721,11 +723,11 @@ static int clie_3_5_startup (struct usb_serial *serial) ...@@ -721,11 +723,11 @@ static int clie_3_5_startup (struct usb_serial *serial)
USB_REQ_GET_CONFIGURATION, USB_DIR_IN, USB_REQ_GET_CONFIGURATION, USB_DIR_IN,
0, 0, &data, 1, HZ * 3); 0, 0, &data, 1, HZ * 3);
if (result < 0) { if (result < 0) {
err("%s: get config number failed: %d", __FUNCTION__, result); dev_err(*dev, "%s: get config number failed: %d\n", __FUNCTION__, result);
return result; return result;
} }
if (result != 1) { if (result != 1) {
err("%s: get config number bad return length: %d", __FUNCTION__, result); dev_err(*dev, "%s: get config number bad return length: %d\n", __FUNCTION__, result);
return -EIO; return -EIO;
} }
...@@ -735,11 +737,11 @@ static int clie_3_5_startup (struct usb_serial *serial) ...@@ -735,11 +737,11 @@ static int clie_3_5_startup (struct usb_serial *serial)
USB_DIR_IN | USB_RECIP_INTERFACE, USB_DIR_IN | USB_RECIP_INTERFACE,
0, 0, &data, 1, HZ * 3); 0, 0, &data, 1, HZ * 3);
if (result < 0) { if (result < 0) {
err("%s: get interface number failed: %d", __FUNCTION__, result); dev_err(*dev, "%s: get interface number failed: %d\n", __FUNCTION__, result);
return result; return result;
} }
if (result != 1) { if (result != 1) {
err("%s: get interface number bad return length: %d", __FUNCTION__, result); dev_err(*dev, "%s: get interface number bad return length: %d\n", __FUNCTION__, result);
return -EIO; return -EIO;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7