usbatm cxacru.c,1.10,1.11

[kagan at infradead.org]

Update of /home/cvs/usbatm
In directory phoenix.infradead.org:/tmp/cvs-serv21063

Modified Files:
	cxacru.c 
Log Message:
cxacru_upload_firmware:
	produce device-tagged error messages rather than sourcefile-tagged
	(use dev_err instead of err)


Index: cxacru.c
===================================================================
RCS file: /home/cvs/usbatm/cxacru.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cxacru.c	8 Feb 2005 12:47:48 -0000	1.10
+++ cxacru.c	8 Feb 2005 12:52:41 -0000	1.11
@@ -514,6 +514,7 @@
 	int ret;
 	int off;
 	struct usb_device *usb_dev = instance->usbatm->usb_dev;
+	struct device *dev = &usb_dev->dev;
 	const u32 vid = usb_dev->descriptor.idVendor;
 	const u32 pid = usb_dev->descriptor.idProduct;
 	u32 val;
@@ -524,7 +525,7 @@
 	val = bp ? PLLFCLK_OLD : PLLFCLK_NEW;
 	ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, PLLFCLK_ADDR, (u8 *) &val, 4);
 	if (ret) {
-		err("FirmwarePllFClkValue failed: %d", ret);
+		dev_err(dev, "FirmwarePllFClkValue failed: %d\n", ret);
 		return;
 	}
 
@@ -532,7 +533,7 @@
 	val = bp ? PLLBCLK_OLD : PLLBCLK_NEW;
 	ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, PLLBCLK_ADDR, (u8 *) &val, 4);
 	if (ret) {
-		err("FirmwarePllBClkValue failed: %d", ret);
+		dev_err(dev, "FirmwarePllBClkValue failed: %d\n", ret);
 		return;
 	}
 
@@ -540,14 +541,14 @@
 	val = SDRAM_ENA;
 	ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, SDRAMEN_ADDR, (u8 *) &val, 4);
 	if (ret) {
-		err("Enable SDRAM failed: %d", ret);
+		dev_err(dev, "Enable SDRAM failed: %d\n", ret);
 		return;
 	}
 
 	/* Firmware */
 	ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, FW_ADDR, fw->data, fw->size);
 	if (ret) {
-		err("Firmware upload failed: %d", ret);
+		dev_err(dev, "Firmware upload failed: %d\n", ret);
 		return;
 	}
 
@@ -555,7 +556,7 @@
 	if (bp) {
 		ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, BR_ADDR, bp->data, bp->size);
 		if (ret) {
-			err("Boot ROM patching failed: %d", ret);
+			dev_err(dev, "Boot ROM patching failed: %d\n", ret);
 			return;
 		}
 	}
@@ -564,7 +565,7 @@
 	val = (pid << 16) | (vid & 0xffff);
 	ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, SIG_ADDR, (u8 *) &val, 4);
 	if (ret) {
-		err("Signature storing failed: %d", ret);
+		dev_err(dev, "Signature storing failed: %d\n", ret);
 		return;
 	}
 
@@ -576,7 +577,7 @@
 		ret = cxacru_fw(usb_dev, FW_GOTO_MEM, 0x0, 0x0, FW_ADDR, NULL, 0);
 	}
 	if (ret) {
-		err("Passing control to firmware failed: %d", ret);
+		dev_err(dev, "Passing control to firmware failed: %d\n", ret);
 		return;
 	}
 
@@ -590,7 +591,7 @@
 
 	ret = cxacru_cm(instance, CM_REQUEST_CARD_GET_STATUS, NULL, 0, NULL, 0);
 	if (ret < 0) {
-		err("modem failed to initialize: %d", ret);
+		dev_err(dev, "modem failed to initialize: %d\n", ret);
 		return;
 	}
 	
@@ -607,7 +608,7 @@
 			ret = cxacru_cm(instance, CM_REQUEST_CARD_DATA_SET,
 					(u8 *) buf, len, NULL, 0);
 			if (ret < 0) {
-				err("load config data failed: %d", ret);
+				dev_err(dev, "load config data failed: %d\n", ret);
 				return;
 			}
 		}