redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

USB: remove private debug macros from kaweth

Browse source 
this kills the private debug macros from the kaweth driver.

Signed-off-by: Oliver Neukum <oliver@neukum.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Oliver Neukum 2006-09-28 23:36:04 +02:00 committed by Greg Kroah-Hartman
parent 91a9c9214e
commit fbe2bafcb0
1 changed files with 56 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
drivers/usb/net/kaweth.c
View file

@ -65,16 +65,6 @@
#undef DEBUG #undef DEBUG
#ifdef DEBUG
#define kaweth_dbg(format, arg...) printk(KERN_DEBUG __FILE__ ": " format "\n" ,##arg)
#else
#define kaweth_dbg(format, arg...) do {} while (0)
#endif
#define kaweth_err(format, arg...) printk(KERN_ERR __FILE__ ": " format "\n" ,##arg)
#define kaweth_info(format, arg...) printk(KERN_INFO __FILE__ ": " format "\n" , ##arg)
#define kaweth_warn(format, arg...) printk(KERN_WARNING __FILE__ ": " format "\n" , ##arg)
#include "kawethfw.h" #include "kawethfw.h"
#define KAWETH_MTU 1514 #define KAWETH_MTU 1514
@ -265,17 +255,17 @@ static int kaweth_control(struct kaweth_device *kaweth,
{ {
struct usb_ctrlrequest *dr; struct usb_ctrlrequest *dr;
kaweth_dbg("kaweth_control()"); dbg("kaweth_control()");
if(in_interrupt()) { if(in_interrupt()) {
kaweth_dbg("in_interrupt()"); dbg("in_interrupt()");
return -EBUSY; return -EBUSY;
} }
dr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC); dr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC);
if (!dr) { if (!dr) {
kaweth_dbg("kmalloc() failed"); dbg("kmalloc() failed");
return -ENOMEM; return -ENOMEM;
} }
@ -300,7 +290,7 @@ static int kaweth_read_configuration(struct kaweth_device *kaweth)
{ {
int retval; int retval;
kaweth_dbg("Reading kaweth configuration"); dbg("Reading kaweth configuration");
retval = kaweth_control(kaweth, retval = kaweth_control(kaweth,
usb_rcvctrlpipe(kaweth->dev, 0), usb_rcvctrlpipe(kaweth->dev, 0),
@ -322,7 +312,7 @@ static int kaweth_set_urb_size(struct kaweth_device *kaweth, __u16 urb_size)
{ {
int retval; int retval;
kaweth_dbg("Setting URB size to %d", (unsigned)urb_size); dbg("Setting URB size to %d", (unsigned)urb_size);
retval = kaweth_control(kaweth, retval = kaweth_control(kaweth,
usb_sndctrlpipe(kaweth->dev, 0), usb_sndctrlpipe(kaweth->dev, 0),
@ -344,7 +334,7 @@ static int kaweth_set_sofs_wait(struct kaweth_device *kaweth, __u16 sofs_wait)
{ {
int retval; int retval;
kaweth_dbg("Set SOFS wait to %d", (unsigned)sofs_wait); dbg("Set SOFS wait to %d", (unsigned)sofs_wait);
retval = kaweth_control(kaweth, retval = kaweth_control(kaweth,
usb_sndctrlpipe(kaweth->dev, 0), usb_sndctrlpipe(kaweth->dev, 0),
@ -367,7 +357,7 @@ static int kaweth_set_receive_filter(struct kaweth_device *kaweth,
{ {
int retval; int retval;
kaweth_dbg("Set receive filter to %d", (unsigned)receive_filter); dbg("Set receive filter to %d", (unsigned)receive_filter);
retval = kaweth_control(kaweth, retval = kaweth_control(kaweth,
usb_sndctrlpipe(kaweth->dev, 0), usb_sndctrlpipe(kaweth->dev, 0),
@ -392,7 +382,7 @@ static int kaweth_download_firmware(struct kaweth_device *kaweth,
__u8 type) __u8 type)
{ {
if(data_len > KAWETH_FIRMWARE_BUF_SIZE) { if(data_len > KAWETH_FIRMWARE_BUF_SIZE) {
kaweth_err("Firmware too big: %d", data_len); err("Firmware too big: %d", data_len);
return -ENOSPC; return -ENOSPC;
} }
@ -403,13 +393,13 @@ static int kaweth_download_firmware(struct kaweth_device *kaweth,
kaweth->firmware_buf[4] = type; kaweth->firmware_buf[4] = type;
kaweth->firmware_buf[5] = interrupt; kaweth->firmware_buf[5] = interrupt;
kaweth_dbg("High: %i, Low:%i", kaweth->firmware_buf[3], dbg("High: %i, Low:%i", kaweth->firmware_buf[3],
kaweth->firmware_buf[2]); kaweth->firmware_buf[2]);
kaweth_dbg("Downloading firmware at %p to kaweth device at %p", dbg("Downloading firmware at %p to kaweth device at %p",
data, data,
kaweth); kaweth);
kaweth_dbg("Firmware length: %d", data_len); dbg("Firmware length: %d", data_len);
return kaweth_control(kaweth, return kaweth_control(kaweth,
usb_sndctrlpipe(kaweth->dev, 0), usb_sndctrlpipe(kaweth->dev, 0),
@ -437,7 +427,7 @@ static int kaweth_trigger_firmware(struct kaweth_device *kaweth,
kaweth->firmware_buf[6] = 0x00; kaweth->firmware_buf[6] = 0x00;
kaweth->firmware_buf[7] = 0x00; kaweth->firmware_buf[7] = 0x00;
kaweth_dbg("Triggering firmware"); dbg("Triggering firmware");
return kaweth_control(kaweth, return kaweth_control(kaweth,
usb_sndctrlpipe(kaweth->dev, 0), usb_sndctrlpipe(kaweth->dev, 0),
@ -457,7 +447,7 @@ static int kaweth_reset(struct kaweth_device *kaweth)
{ {
int result; int result;
kaweth_dbg("kaweth_reset(%p)", kaweth); dbg("kaweth_reset(%p)", kaweth);
result = kaweth_control(kaweth, result = kaweth_control(kaweth,
usb_sndctrlpipe(kaweth->dev, 0), usb_sndctrlpipe(kaweth->dev, 0),
USB_REQ_SET_CONFIGURATION, USB_REQ_SET_CONFIGURATION,
@ -470,7 +460,7 @@ static int kaweth_reset(struct kaweth_device *kaweth)
mdelay(10); mdelay(10);
kaweth_dbg("kaweth_reset() returns %d.",result); dbg("kaweth_reset() returns %d.",result);
return result; return result;
} }
@ -568,7 +558,7 @@ 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);
} }
kaweth_err("resubmitting rx_urb %d failed", result); err("resubmitting rx_urb %d failed", result);
} else { } else {
kaweth->suspend_lowmem_rx = 0; kaweth->suspend_lowmem_rx = 0;
} }
@ -605,7 +595,7 @@ static void kaweth_usb_receive(struct urb *urb)
return; return;
if(urb->status && urb->status != -EREMOTEIO && count != 1) { if(urb->status && urb->status != -EREMOTEIO && count != 1) {
kaweth_err("%s RX status: %d count: %d packet_len: %d", err("%s RX status: %d count: %d packet_len: %d",
net->name, net->name,
urb->status, urb->status,
count, count,
@ -616,9 +606,9 @@ static void kaweth_usb_receive(struct urb *urb)
if(kaweth->net && (count > 2)) { if(kaweth->net && (count > 2)) {
if(pkt_len > (count - 2)) { if(pkt_len > (count - 2)) {
kaweth_err("Packet length too long for USB frame (pkt_len: %x, count: %x)",pkt_len, count); err("Packet length too long for USB frame (pkt_len: %x, count: %x)",pkt_len, count);
kaweth_err("Packet len & 2047: %x", pkt_len & 2047); err("Packet len & 2047: %x", pkt_len & 2047);
kaweth_err("Count 2: %x", count2); err("Count 2: %x", count2);
kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC); kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC);
return; return;
} }
@ -655,7 +645,7 @@ static int kaweth_open(struct net_device *net)
struct kaweth_device *kaweth = netdev_priv(net); struct kaweth_device *kaweth = netdev_priv(net);
int res; int res;
kaweth_dbg("Opening network device."); dbg("Opening network device.");
res = kaweth_resubmit_rx_urb(kaweth, GFP_KERNEL); res = kaweth_resubmit_rx_urb(kaweth, GFP_KERNEL);
if (res) if (res)
@ -732,7 +722,7 @@ static void kaweth_usb_transmit_complete(struct urb *urb)
if (unlikely(urb->status != 0)) if (unlikely(urb->status != 0))
if (urb->status != -ENOENT) if (urb->status != -ENOENT)
kaweth_dbg("%s: TX status %d.", kaweth->net->name, urb->status); dbg("%s: TX status %d.", kaweth->net->name, urb->status);
netif_wake_queue(kaweth->net); netif_wake_queue(kaweth->net);
dev_kfree_skb_irq(skb); dev_kfree_skb_irq(skb);
@ -783,7 +773,7 @@ static int kaweth_start_xmit(struct sk_buff *skb, struct net_device *net)
if((res = usb_submit_urb(kaweth->tx_urb, GFP_ATOMIC))) if((res = usb_submit_urb(kaweth->tx_urb, GFP_ATOMIC)))
{ {
kaweth_warn("kaweth failed tx_urb %d", res); warn("kaweth failed tx_urb %d", res);
kaweth->stats.tx_errors++; kaweth->stats.tx_errors++;
netif_start_queue(net); netif_start_queue(net);
@ -812,7 +802,7 @@ static void kaweth_set_rx_mode(struct net_device *net)
KAWETH_PACKET_FILTER_BROADCAST | KAWETH_PACKET_FILTER_BROADCAST |
KAWETH_PACKET_FILTER_MULTICAST; KAWETH_PACKET_FILTER_MULTICAST;
kaweth_dbg("Setting Rx mode to %d", packet_filter_bitmap); dbg("Setting Rx mode to %d", packet_filter_bitmap);
netif_stop_queue(net); netif_stop_queue(net);
@ -850,10 +840,10 @@ static void kaweth_async_set_rx_mode(struct kaweth_device *kaweth)
KAWETH_CONTROL_TIMEOUT); KAWETH_CONTROL_TIMEOUT);
if(result < 0) { if(result < 0) {
kaweth_err("Failed to set Rx mode: %d", result); err("Failed to set Rx mode: %d", result);
} }
else { else {
kaweth_dbg("Set Rx mode to %d", packet_filter_bitmap); dbg("Set Rx mode to %d", packet_filter_bitmap);
} }
} }
} }
@ -874,7 +864,7 @@ static void kaweth_tx_timeout(struct net_device *net)
{ {
struct kaweth_device *kaweth = netdev_priv(net); struct kaweth_device *kaweth = netdev_priv(net);
kaweth_warn("%s: Tx timed out. Resetting.", net->name); warn("%s: Tx timed out. Resetting.", net->name);
kaweth->stats.tx_errors++; kaweth->stats.tx_errors++;
net->trans_start = jiffies; net->trans_start = jiffies;
@ -895,15 +885,15 @@ static int kaweth_probe(
const eth_addr_t bcast_addr = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; const eth_addr_t bcast_addr = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
int result = 0; int result = 0;
kaweth_dbg("Kawasaki Device Probe (Device number:%d): 0x%4.4x:0x%4.4x:0x%4.4x", dbg("Kawasaki Device Probe (Device number:%d): 0x%4.4x:0x%4.4x:0x%4.4x",
dev->devnum, dev->devnum,
le16_to_cpu(dev->descriptor.idVendor), le16_to_cpu(dev->descriptor.idVendor),
le16_to_cpu(dev->descriptor.idProduct), le16_to_cpu(dev->descriptor.idProduct),
le16_to_cpu(dev->descriptor.bcdDevice)); le16_to_cpu(dev->descriptor.bcdDevice));
kaweth_dbg("Device at %p", dev); dbg("Device at %p", dev);
kaweth_dbg("Descriptor length: %x type: %x", dbg("Descriptor length: %x type: %x",
(int)dev->descriptor.bLength, (int)dev->descriptor.bLength,
(int)dev->descriptor.bDescriptorType); (int)dev->descriptor.bDescriptorType);
@ -918,7 +908,7 @@ static int kaweth_probe(
spin_lock_init(&kaweth->device_lock); spin_lock_init(&kaweth->device_lock);
init_waitqueue_head(&kaweth->term_wait); init_waitqueue_head(&kaweth->term_wait);
kaweth_dbg("Resetting."); dbg("Resetting.");
kaweth_reset(kaweth); kaweth_reset(kaweth);
@ -928,17 +918,17 @@ static int kaweth_probe(
*/ */
if (le16_to_cpu(dev->descriptor.bcdDevice) >> 8) { if (le16_to_cpu(dev->descriptor.bcdDevice) >> 8) {
kaweth_info("Firmware present in device."); info("Firmware present in device.");
} else { } else {
/* Download the firmware */ /* Download the firmware */
kaweth_info("Downloading firmware..."); info("Downloading firmware...");
kaweth->firmware_buf = (__u8 *)__get_free_page(GFP_KERNEL); kaweth->firmware_buf = (__u8 *)__get_free_page(GFP_KERNEL);
if ((result = kaweth_download_firmware(kaweth, if ((result = kaweth_download_firmware(kaweth,
kaweth_new_code, kaweth_new_code,
len_kaweth_new_code, len_kaweth_new_code,
100, 100,
2)) < 0) { 2)) < 0) {
kaweth_err("Error downloading firmware (%d)", result); err("Error downloading firmware (%d)", result);
goto err_fw; goto err_fw;
} }
@ -947,7 +937,7 @@ static int kaweth_probe(
len_kaweth_new_code_fix, len_kaweth_new_code_fix,
100, 100,
3)) < 0) { 3)) < 0) {
kaweth_err("Error downloading firmware fix (%d)", result); err("Error downloading firmware fix (%d)", result);
goto err_fw; goto err_fw;
} }
@ -956,7 +946,7 @@ static int kaweth_probe(
len_kaweth_trigger_code, len_kaweth_trigger_code,
126, 126,
2)) < 0) { 2)) < 0) {
kaweth_err("Error downloading trigger code (%d)", result); err("Error downloading trigger code (%d)", result);
goto err_fw; goto err_fw;
} }
@ -966,18 +956,18 @@ static int kaweth_probe(
len_kaweth_trigger_code_fix, len_kaweth_trigger_code_fix,
126, 126,
3)) < 0) { 3)) < 0) {
kaweth_err("Error downloading trigger code fix (%d)", result); err("Error downloading trigger code fix (%d)", result);
goto err_fw; goto err_fw;
} }
if ((result = kaweth_trigger_firmware(kaweth, 126)) < 0) { if ((result = kaweth_trigger_firmware(kaweth, 126)) < 0) {
kaweth_err("Error triggering firmware (%d)", result); err("Error triggering firmware (%d)", result);
goto err_fw; goto err_fw;
} }
/* Device will now disappear for a moment... */ /* Device will now disappear for a moment... */
kaweth_info("Firmware loaded. I'll be back..."); info("Firmware loaded. I'll be back...");
err_fw: err_fw:
free_page((unsigned long)kaweth->firmware_buf); free_page((unsigned long)kaweth->firmware_buf);
free_netdev(netdev); free_netdev(netdev);
@ -987,14 +977,14 @@ err_fw:
result = kaweth_read_configuration(kaweth); result = kaweth_read_configuration(kaweth);
if(result < 0) { if(result < 0) {
kaweth_err("Error reading configuration (%d), no net device created", result); err("Error reading configuration (%d), no net device created", result);
goto err_free_netdev; goto err_free_netdev;
} }
kaweth_info("Statistics collection: %x", kaweth->configuration.statistics_mask); info("Statistics collection: %x", kaweth->configuration.statistics_mask);
kaweth_info("Multicast filter limit: %x", kaweth->configuration.max_multicast_filters & ((1 << 15) - 1)); info("Multicast filter limit: %x", kaweth->configuration.max_multicast_filters & ((1 << 15) - 1));
kaweth_info("MTU: %d", le16_to_cpu(kaweth->configuration.segment_size)); info("MTU: %d", le16_to_cpu(kaweth->configuration.segment_size));
kaweth_info("Read MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x", info("Read MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x",
(int)kaweth->configuration.hw_addr[0], (int)kaweth->configuration.hw_addr[0],
(int)kaweth->configuration.hw_addr[1], (int)kaweth->configuration.hw_addr[1],
(int)kaweth->configuration.hw_addr[2], (int)kaweth->configuration.hw_addr[2],
@ -1005,17 +995,17 @@ err_fw:
if(!memcmp(&kaweth->configuration.hw_addr, if(!memcmp(&kaweth->configuration.hw_addr,
&bcast_addr, &bcast_addr,
sizeof(bcast_addr))) { sizeof(bcast_addr))) {
kaweth_err("Firmware not functioning properly, no net device created"); err("Firmware not functioning properly, no net device created");
goto err_free_netdev; goto err_free_netdev;
} }
if(kaweth_set_urb_size(kaweth, KAWETH_BUF_SIZE) < 0) { if(kaweth_set_urb_size(kaweth, KAWETH_BUF_SIZE) < 0) {
kaweth_dbg("Error setting URB size"); dbg("Error setting URB size");
goto err_free_netdev; goto err_free_netdev;
} }
if(kaweth_set_sofs_wait(kaweth, KAWETH_SOFS_TO_WAIT) < 0) { if(kaweth_set_sofs_wait(kaweth, KAWETH_SOFS_TO_WAIT) < 0) {
kaweth_err("Error setting SOFS wait"); err("Error setting SOFS wait");
goto err_free_netdev; goto err_free_netdev;
} }
@ -1025,11 +1015,11 @@ err_fw:
KAWETH_PACKET_FILTER_MULTICAST); KAWETH_PACKET_FILTER_MULTICAST);
if(result < 0) { if(result < 0) {
kaweth_err("Error setting receive filter"); err("Error setting receive filter");
goto err_free_netdev; goto err_free_netdev;
} }
kaweth_dbg("Initializing net device."); dbg("Initializing net device.");
kaweth->tx_urb = usb_alloc_urb(0, GFP_KERNEL); kaweth->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!kaweth->tx_urb) if (!kaweth->tx_urb)
@ -1086,13 +1076,13 @@ err_fw:
SET_NETDEV_DEV(netdev, &intf->dev); SET_NETDEV_DEV(netdev, &intf->dev);
if (register_netdev(netdev) != 0) { if (register_netdev(netdev) != 0) {
kaweth_err("Error registering netdev."); err("Error registering netdev.");
goto err_intfdata; goto err_intfdata;
} }
kaweth_info("kaweth interface created at %s", kaweth->net->name); info("kaweth interface created at %s", kaweth->net->name);
kaweth_dbg("Kaweth probe returning."); dbg("Kaweth probe returning.");
return 0; return 0;
@ -1121,16 +1111,16 @@ static void kaweth_disconnect(struct usb_interface *intf)
struct kaweth_device *kaweth = usb_get_intfdata(intf); struct kaweth_device *kaweth = usb_get_intfdata(intf);
struct net_device *netdev; struct net_device *netdev;
kaweth_info("Unregistering"); info("Unregistering");
usb_set_intfdata(intf, NULL); usb_set_intfdata(intf, NULL);
if (!kaweth) { if (!kaweth) {
kaweth_warn("unregistering non-existant device"); warn("unregistering non-existant device");
return; return;
} }
netdev = kaweth->net; netdev = kaweth->net;
kaweth_dbg("Unregistering net device"); dbg("Unregistering net device");
unregister_netdev(netdev); unregister_netdev(netdev);
usb_free_urb(kaweth->rx_urb); usb_free_urb(kaweth->rx_urb);
@ -1185,7 +1175,7 @@ static int usb_start_wait_urb(struct urb *urb, int timeout, int* actual_length)
if (!wait_event_timeout(awd.wqh, awd.done, timeout)) { if (!wait_event_timeout(awd.wqh, awd.done, timeout)) {
// timeout // timeout
kaweth_warn("usb_control/bulk_msg: timeout"); warn("usb_control/bulk_msg: timeout");
usb_kill_urb(urb); // remove urb safely usb_kill_urb(urb); // remove urb safely
status = -ETIMEDOUT; status = -ETIMEDOUT;
} }
@ -1234,7 +1224,7 @@ static int kaweth_internal_control_msg(struct usb_device *usb_dev,
****************************************************************/ ****************************************************************/
static int __init kaweth_init(void) static int __init kaweth_init(void)
{ {
kaweth_dbg("Driver loading"); dbg("Driver loading");
return usb_register(&kaweth_driver); return usb_register(&kaweth_driver);
} }