openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: kaweth.c: remove err() usage 

err() was a very old USB-specific macro that I thought had
gone away.  This patch removes it from being used in the
driver and uses dev_err() instead.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-04-25 12:37:48 -07:00
parent 495f71e2b9
commit db6b22196c
1 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
drivers/net/usb/kaweth.c
View File

@ -400,12 +400,13 @@ static int kaweth_download_firmware(struct kaweth_device *kaweth,
ret = request_firmware(&fw, fwname, &kaweth->dev->dev); ret = request_firmware(&fw, fwname, &kaweth->dev->dev);
if (ret) { if (ret) {
err("Firmware request failed\n"); dev_err(&kaweth->intf->dev, "Firmware request failed\n");
return ret; return ret;
} }
if (fw->size > KAWETH_FIRMWARE_BUF_SIZE) { if (fw->size > KAWETH_FIRMWARE_BUF_SIZE) {
err("Firmware too big: %zu", fw->size); dev_err(&kaweth->intf->dev, "Firmware too big: %zu\n",
fw->size);
release_firmware(fw); release_firmware(fw);
return -ENOSPC; return -ENOSPC;
} }
@ -501,7 +502,8 @@ static void kaweth_resubmit_int_urb(struct kaweth_device *kaweth, gfp_t mf)
} }
if (status) if (status)
err ("can't resubmit intr, %s-%s, status %d", dev_err(&kaweth->intf->dev,
"can't resubmit intr, %s-%s, status %d\n",
kaweth->dev->bus->bus_name, kaweth->dev->bus->bus_name,
kaweth->dev->devpath, status); kaweth->dev->devpath, status);
} }
@ -576,7 +578,8 @@ static int kaweth_resubmit_rx_urb(struct kaweth_device *kaweth,
kaweth->suspend_lowmem_rx = 1; kaweth->suspend_lowmem_rx = 1;
schedule_delayed_work(&kaweth->lowmem_work, HZ/4); schedule_delayed_work(&kaweth->lowmem_work, HZ/4);
} }
err("resubmitting rx_urb %d failed", result); dev_err(&kaweth->intf->dev, "resubmitting rx_urb %d failed\n",
result);
} else { } else {
kaweth->suspend_lowmem_rx = 0; kaweth->suspend_lowmem_rx = 0;
} }
@ -634,20 +637,21 @@ static void kaweth_usb_receive(struct urb *urb)
spin_unlock(&kaweth->device_lock); spin_unlock(&kaweth->device_lock);
if(status && status != -EREMOTEIO && count != 1) { if(status && status != -EREMOTEIO && count != 1) {
err("%s RX status: %d count: %d packet_len: %d", dev_err(&kaweth->intf->dev,
net->name, "%s RX status: %d count: %d packet_len: %d\n",
status, net->name, status, count, (int)pkt_len);
count,
(int)pkt_len);
kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC); kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC);
return; return;
} }
if(kaweth->net && (count > 2)) { if(kaweth->net && (count > 2)) {
if(pkt_len > (count - 2)) { if(pkt_len > (count - 2)) {
err("Packet length too long for USB frame (pkt_len: %x, count: %x)",pkt_len, count); dev_err(&kaweth->intf->dev,
err("Packet len & 2047: %x", pkt_len & 2047); "Packet length too long for USB frame (pkt_len: %x, count: %x)\n",
err("Count 2: %x", count2); pkt_len, count);
dev_err(&kaweth->intf->dev, "Packet len & 2047: %x\n",
pkt_len & 2047);
dev_err(&kaweth->intf->dev, "Count 2: %x\n", count2);
kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC); kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC);
return; return;
} }
@ -686,7 +690,7 @@ static int kaweth_open(struct net_device *net)
res = usb_autopm_get_interface(kaweth->intf); res = usb_autopm_get_interface(kaweth->intf);
if (res) { if (res) {
err("Interface cannot be resumed."); dev_err(&kaweth->intf->dev, "Interface cannot be resumed.\n");
return -EIO; return -EIO;
} }
res = kaweth_resubmit_rx_urb(kaweth, GFP_KERNEL); res = kaweth_resubmit_rx_urb(kaweth, GFP_KERNEL);
@ -907,7 +911,8 @@ static void kaweth_async_set_rx_mode(struct kaweth_device *kaweth)
KAWETH_CONTROL_TIMEOUT); KAWETH_CONTROL_TIMEOUT);
if(result < 0) { if(result < 0) {
err("Failed to set Rx mode: %d", result); dev_err(&kaweth->intf->dev, "Failed to set Rx mode: %d\n",
result);
} }
else { else {
dbg("Set Rx mode to %d", packet_filter_bitmap); dbg("Set Rx mode to %d", packet_filter_bitmap);
@ -1045,7 +1050,8 @@ static int kaweth_probe(
"kaweth/new_code.bin", "kaweth/new_code.bin",
100, 100,
2)) < 0) { 2)) < 0) {
err("Error downloading firmware (%d)", result); dev_err(&intf->dev, "Error downloading firmware (%d)\n",
result);
goto err_fw; goto err_fw;
} }
@ -1053,7 +1059,9 @@ static int kaweth_probe(
"kaweth/new_code_fix.bin", "kaweth/new_code_fix.bin",
100, 100,
3)) < 0) { 3)) < 0) {
err("Error downloading firmware fix (%d)", result); dev_err(&intf->dev,
"Error downloading firmware fix (%d)\n",
result);
goto err_fw; goto err_fw;
} }
@ -1061,7 +1069,9 @@ static int kaweth_probe(
"kaweth/trigger_code.bin", "kaweth/trigger_code.bin",
126, 126,
2)) < 0) { 2)) < 0) {
err("Error downloading trigger code (%d)", result); dev_err(&intf->dev,
"Error downloading trigger code (%d)\n",
result);
goto err_fw; goto err_fw;
} }
@ -1070,13 +1080,14 @@ static int kaweth_probe(
"kaweth/trigger_code_fix.bin", "kaweth/trigger_code_fix.bin",
126, 126,
3)) < 0) { 3)) < 0) {
err("Error downloading trigger code fix (%d)", result); dev_err(&intf->dev, "Error downloading trigger code fix (%d)\n", result);
goto err_fw; goto err_fw;
} }
if ((result = kaweth_trigger_firmware(kaweth, 126)) < 0) { if ((result = kaweth_trigger_firmware(kaweth, 126)) < 0) {
err("Error triggering firmware (%d)", result); dev_err(&intf->dev, "Error triggering firmware (%d)\n",
result);
goto err_fw; goto err_fw;
} }
@ -1091,7 +1102,7 @@ static int kaweth_probe(
result = kaweth_read_configuration(kaweth); result = kaweth_read_configuration(kaweth);
if(result < 0) { if(result < 0) {
err("Error reading configuration (%d), no net device created", result); dev_err(&intf->dev, "Error reading configuration (%d), no net device created\n", result);
goto err_free_netdev; goto err_free_netdev;
} }
@ -1103,7 +1114,7 @@ static int kaweth_probe(
if(!memcmp(&kaweth->configuration.hw_addr, if(!memcmp(&kaweth->configuration.hw_addr,
&bcast_addr, &bcast_addr,
sizeof(bcast_addr))) { sizeof(bcast_addr))) {
err("Firmware not functioning properly, no net device created"); dev_err(&intf->dev, "Firmware not functioning properly, no net device created\n");
goto err_free_netdev; goto err_free_netdev;
} }
@ -1113,7 +1124,7 @@ static int kaweth_probe(
} }
if(kaweth_set_sofs_wait(kaweth, KAWETH_SOFS_TO_WAIT) < 0) { if(kaweth_set_sofs_wait(kaweth, KAWETH_SOFS_TO_WAIT) < 0) {
err("Error setting SOFS wait"); dev_err(&intf->dev, "Error setting SOFS wait\n");
goto err_free_netdev; goto err_free_netdev;
} }
@ -1123,7 +1134,7 @@ static int kaweth_probe(
KAWETH_PACKET_FILTER_MULTICAST); KAWETH_PACKET_FILTER_MULTICAST);
if(result < 0) { if(result < 0) {
err("Error setting receive filter"); dev_err(&intf->dev, "Error setting receive filter\n");
goto err_free_netdev; goto err_free_netdev;
} }
@ -1175,7 +1186,7 @@ static int kaweth_probe(
SET_NETDEV_DEV(netdev, &intf->dev); SET_NETDEV_DEV(netdev, &intf->dev);
if (register_netdev(netdev) != 0) { if (register_netdev(netdev) != 0) {
err("Error registering netdev."); dev_err(&intf->dev, "Error registering netdev.\n");
goto err_intfdata; goto err_intfdata;
} }