diff options
Diffstat (limited to 'xpp/xpp_usb.c')
| -rw-r--r-- | xpp/xpp_usb.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/xpp/xpp_usb.c b/xpp/xpp_usb.c index 9ad8f27..b5ed7e3 100644 --- a/xpp/xpp_usb.c +++ b/xpp/xpp_usb.c @@ -272,8 +272,8 @@ static int xusb_xframe_send(xbus_t *xbus, xframe_t *xframe) static int rate_limit; if((rate_limit++ % 5000) == 0) - ERR("%s: USB device not present. Dropping packets (#%d).\n", - xbus->busname, rate_limit); + XBUS_ERR(xbus, "USB device not present. Dropping packets (#%d).\n", + rate_limit); ret = -ENODEV; goto freepack; } @@ -284,8 +284,8 @@ static int xusb_xframe_send(xbus_t *xbus, xframe_t *xframe) static int rate_limit; if((rate_limit++ % 5000) == 0) - ERR("%s: USB device is totaly stuck. Dropping packets (#%d).\n", - xbus->busname, rate_limit); + XBUS_ERR(xbus, "USB device is totaly stuck. Dropping packets (#%d).\n", + rate_limit); ret = -ENODEV; goto freepack; } @@ -592,7 +592,7 @@ static int xusb_probe(struct usb_interface *interface, const struct usb_device_i xusb->minor = interface->minor; /* let the user know what node this device is now attached to */ - INFO ("USB XPP device now attached to minor %d\n", xusb->minor); + INFO("USB XPP device now attached to minor %d\n", xusb->minor); /* Allocate high level structures */ xbus = xbus_new(&xusb_ops); @@ -631,7 +631,7 @@ static int xusb_probe(struct usb_interface *interface, const struct usb_device_i procsummary = create_proc_read_entry(PROC_USBXPP_SUMMARY, 0444, xbus->proc_xbus_dir, xusb_read_proc, xusb); if (!procsummary) { - ERR("Failed to create proc read entry for xbus %s\n", xbus->busname); + XBUS_ERR(xbus, "Failed to create proc file '%s'\n", PROC_USBXPP_SUMMARY); // FIXME: better error handling retval = -EIO; goto probe_failed; @@ -659,7 +659,7 @@ probe_failed: } if(xbus) { if(procsummary) { - DBG("Remove proc_entry: " PROC_USBXPP_SUMMARY "\n"); + XBUS_DBG(xbus, "Remove proc_entry: " PROC_USBXPP_SUMMARY "\n"); remove_proc_entry(PROC_USBXPP_SUMMARY, xbus->proc_xbus_dir); procsummary = NULL; } @@ -704,7 +704,7 @@ static void xusb_disconnect(struct usb_interface *interface) #ifdef CONFIG_PROC_FS if(xbus->proc_xbus_dir) { - DBG("Remove proc_entry: " PROC_USBXPP_SUMMARY "\n"); + XBUS_DBG(xbus, "Remove proc_entry: " PROC_USBXPP_SUMMARY "\n"); remove_proc_entry(PROC_USBXPP_SUMMARY, xbus->proc_xbus_dir); } #endif @@ -754,8 +754,8 @@ static void xpp_send_callback(USB_PASS_CB(urb)) static int rate_limit; if((rate_limit++ % 5003) == 0) - NOTICE("%s: Slagish USB. %ld usec to transmit a frame\n", - xbus->busname, usec_diff); + XBUS_NOTICE(xbus, "Slagish USB. %ld usec to transmit a frame\n", + usec_diff); } /* sync/async unlink faults aren't errors */ if (urb->status && !(urb->status == -ENOENT || urb->status == -ECONNRESET)) { @@ -820,7 +820,7 @@ static void xpp_receive_callback(USB_PASS_CB(urb)) static int rate_limit; if((rate_limit++ % 5003) == 0) - NOTICE("%s: Received a zero length URBs (%d)\n", xbus->busname, rate_limit); + XBUS_NOTICE(xbus, "Received a zero length URBs (%d)\n", rate_limit); XUSB_COUNTER(xusb, RCV_ZERO_LEN)++; goto end; } @@ -858,7 +858,7 @@ int __init xpp_usb_init(void) int result; //xusb_t *xusb; - INFO("%s revision %s\n", THIS_MODULE->name, XPP_VERSION); + INFO("revision %s\n", XPP_VERSION); /* register this driver with the USB subsystem */ result = usb_register(&xusb_driver); |