usbatm cxacru.c,1.9,1.10

[kagan at infradead.org]

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

Modified Files:
	cxacru.c 
Log Message:
Make variable names slightly more consistent throughout the file.


Index: cxacru.c
===================================================================
RCS file: /home/cvs/usbatm/cxacru.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cxacru.c	8 Feb 2005 12:42:27 -0000	1.9
+++ cxacru.c	8 Feb 2005 12:47:48 -0000	1.10
@@ -508,7 +508,7 @@
 
 static void cxacru_upload_firmware(struct cxacru_data *instance,
 				   const struct firmware *fw,
-				   const struct firmware *br,
+				   const struct firmware *bp,
 				   const struct firmware *cf)
 {
 	int ret;
@@ -521,7 +521,7 @@
 	dbg("cxacru_upload_firmware");
 
 	/* FirmwarePllFClkValue */
-	val = br ? PLLFCLK_OLD : PLLFCLK_NEW;
+	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);
@@ -529,7 +529,7 @@
 	}
 
 	/* FirmwarePllBClkValue */
-	val = br ? PLLBCLK_OLD : PLLBCLK_NEW;
+	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);
@@ -552,8 +552,8 @@
 	}
 
 	/* Boot ROM patch */
-	if (br) {
-		ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, BR_ADDR, br->data, br->size);
+	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);
 			return;
@@ -568,7 +568,7 @@
 		return;
 	}
 
-	if (br) {
+	if (bp) {
 		val = BR_ADDR;
 		ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, BR_STACK_ADDR, (u8 *) &val, 4);
 	}