1 files changed, 17 insertions, 17 deletions

diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index 98b89fe19867..b7eb86ad6bf2 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -674,7 +674,7 @@ static int cxacru_cm(struct cxacru_data *instance, enum cxacru_cm_request cm,
         }
 
         ret = offd;
-        dbg("cm %#x", cm);
+        usb_dbg(instance->usbatm, "cm %#x\n", cm);
 fail:
         mutex_unlock(&instance->cm_serialize);
 err:
@@ -733,7 +733,7 @@ static int cxacru_card_status(struct cxacru_data *instance)
 {
         int ret = cxacru_cm(instance, CM_REQUEST_CARD_GET_STATUS, NULL, 0, NULL, 0);
         if (ret < 0) {          /* firmware not loaded */
-                dbg("cxacru_adsl_start: CARD_GET_STATUS returned %d", ret);
+                usb_dbg(instance->usbatm, "cxacru_adsl_start: CARD_GET_STATUS returned %d\n", ret);
                 return ret;
         }
         return 0;
@@ -758,7 +758,7 @@ static int cxacru_atm_start(struct usbatm_data *usbatm_instance,
         int ret;
         int start_polling = 1;
 
-        dbg("cxacru_atm_start");
+        dev_dbg(&intf->dev, "%s\n", __func__);
 
         /* Read MAC address */
         ret = cxacru_cm(instance, CM_REQUEST_CARD_GET_MAC_ADDRESS, NULL, 0,
@@ -962,13 +962,13 @@ static int cxacru_fw(struct usb_device *usb_dev, enum cxacru_fw_request fw,
                         ret = usb_bulk_msg(usb_dev, usb_sndbulkpipe(usb_dev, CXACRU_EP_CMD),
                                            buf, offb, NULL, CMD_TIMEOUT);
                         if (ret < 0) {
-                                dbg("sending fw %#x failed", fw);
+                                dev_dbg(&usb_dev->dev, "sending fw %#x failed\n", fw);
                                 goto cleanup;
                         }
                         offb = 0;
                 }
         } while (offd < size);
-        dbg("sent fw %#x", fw);
+        dev_dbg(&usb_dev->dev, "sent fw %#x\n", fw);
 
         ret = 0;
 
@@ -988,7 +988,7 @@ static void cxacru_upload_firmware(struct cxacru_data *instance,
                                usb_dev->descriptor.idProduct };
         __le32 val;
 
-        dbg("cxacru_upload_firmware");
+        usb_dbg(usbatm, "%s\n", __func__);
 
         /* FirmwarePllFClkValue */
         val = cpu_to_le32(instance->modem_type->pll_f_clk);
@@ -1074,7 +1074,7 @@ static int cxacru_find_firmware(struct cxacru_data *instance,
         char buf[16];
 
         sprintf(buf, "cxacru-%s.bin", phase);
-        dbg("cxacru_find_firmware: looking for %s", buf);
+        usb_dbg(usbatm, "cxacru_find_firmware: looking for %s\n", buf);
 
         if (request_firmware(fw_p, buf, dev)) {
                 usb_dbg(usbatm, "no stage %s firmware found\n", phase);
@@ -1115,9 +1115,9 @@ static int cxacru_heavy_init(struct usbatm_data *usbatm_instance,
 
         ret = cxacru_card_status(instance);
         if (ret)
-                dbg("modem initialisation failed");
+                usb_dbg(usbatm_instance, "modem initialisation failed\n");
         else
-                dbg("done setting up the modem");
+                usb_dbg(usbatm_instance, "done setting up the modem\n");
 
         return ret;
 }
@@ -1133,7 +1133,7 @@ static int cxacru_bind(struct usbatm_data *usbatm_instance,
         /* instance init */
         instance = kzalloc(sizeof(*instance), GFP_KERNEL);
         if (!instance) {
-                dbg("cxacru_bind: no memory for instance data");
+                usb_dbg(usbatm_instance, "cxacru_bind: no memory for instance data\n");
                 return -ENOMEM;
         }
 
@@ -1149,31 +1149,31 @@ static int cxacru_bind(struct usbatm_data *usbatm_instance,
 
         instance->rcv_buf = (u8 *) __get_free_page(GFP_KERNEL);
         if (!instance->rcv_buf) {
-                dbg("cxacru_bind: no memory for rcv_buf");
+                usb_dbg(usbatm_instance, "cxacru_bind: no memory for rcv_buf\n");
                 ret = -ENOMEM;
                 goto fail;
         }
         instance->snd_buf = (u8 *) __get_free_page(GFP_KERNEL);
         if (!instance->snd_buf) {
-                dbg("cxacru_bind: no memory for snd_buf");
+                usb_dbg(usbatm_instance, "cxacru_bind: no memory for snd_buf\n");
                 ret = -ENOMEM;
                 goto fail;
         }
         instance->rcv_urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!instance->rcv_urb) {
-                dbg("cxacru_bind: no memory for rcv_urb");
+                usb_dbg(usbatm_instance, "cxacru_bind: no memory for rcv_urb\n");
                 ret = -ENOMEM;
                 goto fail;
         }
         instance->snd_urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!instance->snd_urb) {
-                dbg("cxacru_bind: no memory for snd_urb");
+                usb_dbg(usbatm_instance, "cxacru_bind: no memory for snd_urb\n");
                 ret = -ENOMEM;
                 goto fail;
         }
 
         if (!cmd_ep) {
-                dbg("cxacru_bind: no command endpoint");
+                usb_dbg(usbatm_instance, "cxacru_bind: no command endpoint\n");
                 ret = -ENODEV;
                 goto fail;
         }
@@ -1227,10 +1227,10 @@ static void cxacru_unbind(struct usbatm_data *usbatm_instance,
         struct cxacru_data *instance = usbatm_instance->driver_data;
         int is_polling = 1;
 
-        dbg("cxacru_unbind entered");
+        usb_dbg(usbatm_instance, "cxacru_unbind entered\n");
 
         if (!instance) {
-                dbg("cxacru_unbind: NULL instance!");
+                usb_dbg(usbatm_instance, "cxacru_unbind: NULL instance!\n");
                 return;
         }