zd1211rw: rename CR* macros to ZD_CR*

With compat-wireless CR* macros in zd_usb.h conflict with CR macros in
include/asm-generic/termbits.h. So rename CR* macros to ZD_CR*.

Conversion was done with using sed and then 'over 80 character line'
checkpatch.pl warnings and comment indents were fixed.

Reported-by: Walter Goldens <goldenstranger@yahoo.com>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 120 insertions, 120 deletions

diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c b/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
index 65095d661e6b..385c670d1293 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
@@ -68,19 +68,19 @@ static const u32 rv_init2[] = {
 };
 
 static const struct zd_ioreq16 ioreqs_sw[] = {
-        { CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
-        { CR38,  0x38 }, { CR136, 0xdf },
+        { ZD_CR128, 0x14 }, { ZD_CR129, 0x12 }, { ZD_CR130, 0x10 },
+        { ZD_CR38,  0x38 }, { ZD_CR136, 0xdf },
 };
 
 static int zd1211b_al7230b_finalize(struct zd_chip *chip)
 {
         int r;
         static const struct zd_ioreq16 ioreqs[] = {
-                { CR80,  0x30 }, { CR81,  0x30 }, { CR79,  0x58 },
-                { CR12,  0xf0 }, { CR77,  0x1b }, { CR78,  0x58 },
-                { CR203, 0x04 },
+                { ZD_CR80,  0x30 }, { ZD_CR81,  0x30 }, { ZD_CR79,  0x58 },
+                { ZD_CR12,  0xf0 }, { ZD_CR77,  0x1b }, { ZD_CR78,  0x58 },
+                { ZD_CR203, 0x04 },
                 { },
-                { CR240, 0x80 },
+                { ZD_CR240, 0x80 },
         };
 
         r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
@@ -89,12 +89,12 @@ static int zd1211b_al7230b_finalize(struct zd_chip *chip)
 
         if (chip->new_phy_layout) {
                 /* antenna selection? */
-                r = zd_iowrite16_locked(chip, 0xe5, CR9);
+                r = zd_iowrite16_locked(chip, 0xe5, ZD_CR9);
                 if (r)
                         return r;
         }
 
-        return zd_iowrite16_locked(chip, 0x04, CR203);
+        return zd_iowrite16_locked(chip, 0x04, ZD_CR203);
 }
 
 static int zd1211_al7230b_init_hw(struct zd_rf *rf)
@@ -106,66 +106,66 @@ static int zd1211_al7230b_init_hw(struct zd_rf *rf)
          * specified */
         static const struct zd_ioreq16 ioreqs_1[] = {
                 /* This one is 7230-specific, and happens before the rest */
-                { CR240,  0x57 },
+                { ZD_CR240,  0x57 },
                 { },
 
-                { CR15,   0x20 }, { CR23,   0x40 }, { CR24,  0x20 },
-                { CR26,   0x11 }, { CR28,   0x3e }, { CR29,  0x00 },
-                { CR44,   0x33 },
+                { ZD_CR15,   0x20 }, { ZD_CR23,   0x40 }, { ZD_CR24,  0x20 },
+                { ZD_CR26,   0x11 }, { ZD_CR28,   0x3e }, { ZD_CR29,  0x00 },
+                { ZD_CR44,   0x33 },
                 /* This value is different for 7230 (was: 0x2a) */
-                { CR106,  0x22 },
-                { CR107,  0x1a }, { CR109,  0x09 }, { CR110,  0x27 },
-                { CR111,  0x2b }, { CR112,  0x2b }, { CR119,  0x0a },
+                { ZD_CR106,  0x22 },
+                { ZD_CR107,  0x1a }, { ZD_CR109,  0x09 }, { ZD_CR110,  0x27 },
+                { ZD_CR111,  0x2b }, { ZD_CR112,  0x2b }, { ZD_CR119,  0x0a },
                 /* This happened further down in AL2230,
                  * and the value changed (was: 0xe0) */
-                { CR122,  0xfc },
-                { CR10,   0x89 },
+                { ZD_CR122,  0xfc },
+                { ZD_CR10,   0x89 },
                 /* for newest (3rd cut) AL2300 */
-                { CR17,   0x28 },
-                { CR26,   0x93 }, { CR34,   0x30 },
+                { ZD_CR17,   0x28 },
+                { ZD_CR26,   0x93 }, { ZD_CR34,   0x30 },
                 /* for newest (3rd cut) AL2300 */
-                { CR35,   0x3e },
-                { CR41,   0x24 }, { CR44,   0x32 },
+                { ZD_CR35,   0x3e },
+                { ZD_CR41,   0x24 }, { ZD_CR44,   0x32 },
                 /* for newest (3rd cut) AL2300 */
-                { CR46,   0x96 },
-                { CR47,   0x1e }, { CR79,   0x58 }, { CR80,  0x30 },
-                { CR81,   0x30 }, { CR87,   0x0a }, { CR89,  0x04 },
-                { CR92,   0x0a }, { CR99,   0x28 },
+                { ZD_CR46,   0x96 },
+                { ZD_CR47,   0x1e }, { ZD_CR79,   0x58 }, { ZD_CR80,  0x30 },
+                { ZD_CR81,   0x30 }, { ZD_CR87,   0x0a }, { ZD_CR89,  0x04 },
+                { ZD_CR92,   0x0a }, { ZD_CR99,   0x28 },
                 /* This value is different for 7230 (was: 0x00) */
-                { CR100,  0x02 },
-                { CR101,  0x13 }, { CR102,  0x27 },
+                { ZD_CR100,  0x02 },
+                { ZD_CR101,  0x13 }, { ZD_CR102,  0x27 },
                 /* This value is different for 7230 (was: 0x24) */
-                { CR106,  0x22 },
+                { ZD_CR106,  0x22 },
                 /* This value is different for 7230 (was: 0x2a) */
-                { CR107,  0x3f },
-                { CR109,  0x09 },
+                { ZD_CR107,  0x3f },
+                { ZD_CR109,  0x09 },
                 /* This value is different for 7230 (was: 0x13) */
-                { CR110,  0x1f },
-                { CR111,  0x1f }, { CR112,  0x1f }, { CR113, 0x27 },
-                { CR114,  0x27 },
+                { ZD_CR110,  0x1f },
+                { ZD_CR111,  0x1f }, { ZD_CR112,  0x1f }, { ZD_CR113, 0x27 },
+                { ZD_CR114,  0x27 },
                 /* for newest (3rd cut) AL2300 */
-                { CR115,  0x24 },
+                { ZD_CR115,  0x24 },
                 /* This value is different for 7230 (was: 0x24) */
-                { CR116,  0x3f },
+                { ZD_CR116,  0x3f },
                 /* This value is different for 7230 (was: 0xf4) */
-                { CR117,  0xfa },
-                { CR118,  0xfc }, { CR119,  0x10 }, { CR120, 0x4f },
-                { CR121,  0x77 }, { CR137,  0x88 },
+                { ZD_CR117,  0xfa },
+                { ZD_CR118,  0xfc }, { ZD_CR119,  0x10 }, { ZD_CR120, 0x4f },
+                { ZD_CR121,  0x77 }, { ZD_CR137,  0x88 },
                 /* This one is 7230-specific */
-                { CR138,  0xa8 },
+                { ZD_CR138,  0xa8 },
                 /* This value is different for 7230 (was: 0xff) */
-                { CR252,  0x34 },
+                { ZD_CR252,  0x34 },
                 /* This value is different for 7230 (was: 0xff) */
-                { CR253,  0x34 },
+                { ZD_CR253,  0x34 },
 
                 /* PLL_OFF */
-                { CR251, 0x2f },
+                { ZD_CR251, 0x2f },
         };
 
         static const struct zd_ioreq16 ioreqs_2[] = {
-                { CR251, 0x3f }, /* PLL_ON */
-                { CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
-                { CR38,  0x38 }, { CR136, 0xdf },
+                { ZD_CR251, 0x3f }, /* PLL_ON */
+                { ZD_CR128, 0x14 }, { ZD_CR129, 0x12 }, { ZD_CR130, 0x10 },
+                { ZD_CR38,  0x38 }, { ZD_CR136, 0xdf },
         };
 
         r = zd_iowrite16a_locked(chip, ioreqs_1, ARRAY_SIZE(ioreqs_1));
@@ -192,10 +192,10 @@ static int zd1211_al7230b_init_hw(struct zd_rf *rf)
         if (r)
                 return r;
 
-        r = zd_iowrite16_locked(chip, 0x06, CR203);
+        r = zd_iowrite16_locked(chip, 0x06, ZD_CR203);
         if (r)
                 return r;
-        r = zd_iowrite16_locked(chip, 0x80, CR240);
+        r = zd_iowrite16_locked(chip, 0x80, ZD_CR240);
         if (r)
                 return r;
 
@@ -208,79 +208,79 @@ static int zd1211b_al7230b_init_hw(struct zd_rf *rf)
         struct zd_chip *chip = zd_rf_to_chip(rf);
 
         static const struct zd_ioreq16 ioreqs_1[] = {
-                { CR240, 0x57 }, { CR9,   0x9 },
+                { ZD_CR240, 0x57 }, { ZD_CR9,   0x9 },
                 { },
-                { CR10,  0x8b }, { CR15,  0x20 },
-                { CR17,  0x2B }, /* for newest (3rd cut) AL2230 */
-                { CR20,  0x10 }, /* 4N25->Stone Request */
-                { CR23,  0x40 }, { CR24,  0x20 }, { CR26,  0x93 },
-                { CR28,  0x3e }, { CR29,  0x00 },
-                { CR33,  0x28 }, /* 5613 */
-                { CR34,  0x30 },
-                { CR35,  0x3e }, /* for newest (3rd cut) AL2230 */
-                { CR41,  0x24 }, { CR44,  0x32 },
-                { CR46,  0x99 }, /* for newest (3rd cut) AL2230 */
-                { CR47,  0x1e },
+                { ZD_CR10,  0x8b }, { ZD_CR15,  0x20 },
+                { ZD_CR17,  0x2B }, /* for newest (3rd cut) AL2230 */
+                { ZD_CR20,  0x10 }, /* 4N25->Stone Request */
+                { ZD_CR23,  0x40 }, { ZD_CR24,  0x20 }, { ZD_CR26,  0x93 },
+                { ZD_CR28,  0x3e }, { ZD_CR29,  0x00 },
+                { ZD_CR33,  0x28 }, /* 5613 */
+                { ZD_CR34,  0x30 },
+                { ZD_CR35,  0x3e }, /* for newest (3rd cut) AL2230 */
+                { ZD_CR41,  0x24 }, { ZD_CR44,  0x32 },
+                { ZD_CR46,  0x99 }, /* for newest (3rd cut) AL2230 */
+                { ZD_CR47,  0x1e },
 
                 /* ZD1215 5610 */
-                { CR48,  0x00 }, { CR49,  0x00 }, { CR51,  0x01 },
-                { CR52,  0x80 }, { CR53,  0x7e }, { CR65,  0x00 },
-                { CR66,  0x00 }, { CR67,  0x00 }, { CR68,  0x00 },
-                { CR69,  0x28 },
-
-                { CR79,  0x58 }, { CR80,  0x30 }, { CR81,  0x30 },
-                { CR87,  0x0A }, { CR89,  0x04 },
-                { CR90,  0x58 }, /* 5112 */
-                { CR91,  0x00 }, /* 5613 */
-                { CR92,  0x0a },
-                { CR98,  0x8d }, /* 4804, for 1212 new algorithm */
-                { CR99,  0x00 }, { CR100, 0x02 }, { CR101, 0x13 },
-                { CR102, 0x27 },
-                { CR106, 0x20 }, /* change to 0x24 for AL7230B */
-                { CR109, 0x13 }, /* 4804, for 1212 new algorithm */
-                { CR112, 0x1f },
+                { ZD_CR48,  0x00 }, { ZD_CR49,  0x00 }, { ZD_CR51,  0x01 },
+                { ZD_CR52,  0x80 }, { ZD_CR53,  0x7e }, { ZD_CR65,  0x00 },
+                { ZD_CR66,  0x00 }, { ZD_CR67,  0x00 }, { ZD_CR68,  0x00 },
+                { ZD_CR69,  0x28 },
+
+                { ZD_CR79,  0x58 }, { ZD_CR80,  0x30 }, { ZD_CR81,  0x30 },
+                { ZD_CR87,  0x0A }, { ZD_CR89,  0x04 },
+                { ZD_CR90,  0x58 }, /* 5112 */
+                { ZD_CR91,  0x00 }, /* 5613 */
+                { ZD_CR92,  0x0a },
+                { ZD_CR98,  0x8d }, /* 4804, for 1212 new algorithm */
+                { ZD_CR99,  0x00 }, { ZD_CR100, 0x02 }, { ZD_CR101, 0x13 },
+                { ZD_CR102, 0x27 },
+                { ZD_CR106, 0x20 }, /* change to 0x24 for AL7230B */
+                { ZD_CR109, 0x13 }, /* 4804, for 1212 new algorithm */
+                { ZD_CR112, 0x1f },
         };
 
         static const struct zd_ioreq16 ioreqs_new_phy[] = {
-                { CR107, 0x28 },
-                { CR110, 0x1f }, /* 5127, 0x13->0x1f */
-                { CR111, 0x1f }, /* 0x13 to 0x1f for AL7230B */
-                { CR116, 0x2a }, { CR118, 0xfa }, { CR119, 0x12 },
-                { CR121, 0x6c }, /* 5613 */
+                { ZD_CR107, 0x28 },
+                { ZD_CR110, 0x1f }, /* 5127, 0x13->0x1f */
+                { ZD_CR111, 0x1f }, /* 0x13 to 0x1f for AL7230B */
+                { ZD_CR116, 0x2a }, { ZD_CR118, 0xfa }, { ZD_CR119, 0x12 },
+                { ZD_CR121, 0x6c }, /* 5613 */
         };
 
         static const struct zd_ioreq16 ioreqs_old_phy[] = {
-                { CR107, 0x24 },
-                { CR110, 0x13 }, /* 5127, 0x13->0x1f */
-                { CR111, 0x13 }, /* 0x13 to 0x1f for AL7230B */
-                { CR116, 0x24 }, { CR118, 0xfc }, { CR119, 0x11 },
-                { CR121, 0x6a }, /* 5613 */
+                { ZD_CR107, 0x24 },
+                { ZD_CR110, 0x13 }, /* 5127, 0x13->0x1f */
+                { ZD_CR111, 0x13 }, /* 0x13 to 0x1f for AL7230B */
+                { ZD_CR116, 0x24 }, { ZD_CR118, 0xfc }, { ZD_CR119, 0x11 },
+                { ZD_CR121, 0x6a }, /* 5613 */
         };
 
         static const struct zd_ioreq16 ioreqs_2[] = {
-                { CR113, 0x27 }, { CR114, 0x27 }, { CR115, 0x24 },
-                { CR117, 0xfa }, { CR120, 0x4f },
-                { CR122, 0xfc }, /* E0->FCh at 4901 */
-                { CR123, 0x57 }, /* 5613 */
-                { CR125, 0xad }, /* 4804, for 1212 new algorithm */
-                { CR126, 0x6c }, /* 5613 */
-                { CR127, 0x03 }, /* 4804, for 1212 new algorithm */
-                { CR130, 0x10 },
-                { CR131, 0x00 }, /* 5112 */
-                { CR137, 0x50 }, /* 5613 */
-                { CR138, 0xa8 }, /* 5112 */
-                { CR144, 0xac }, /* 5613 */
-                { CR148, 0x40 }, /* 5112 */
-                { CR149, 0x40 }, /* 4O07, 50->40 */
-                { CR150, 0x1a }, /* 5112, 0C->1A */
-                { CR252, 0x34 }, { CR253, 0x34 },
-                { CR251, 0x2f }, /* PLL_OFF */
+                { ZD_CR113, 0x27 }, { ZD_CR114, 0x27 }, { ZD_CR115, 0x24 },
+                { ZD_CR117, 0xfa }, { ZD_CR120, 0x4f },
+                { ZD_CR122, 0xfc }, /* E0->FCh at 4901 */
+                { ZD_CR123, 0x57 }, /* 5613 */
+                { ZD_CR125, 0xad }, /* 4804, for 1212 new algorithm */
+                { ZD_CR126, 0x6c }, /* 5613 */
+                { ZD_CR127, 0x03 }, /* 4804, for 1212 new algorithm */
+                { ZD_CR130, 0x10 },
+                { ZD_CR131, 0x00 }, /* 5112 */
+                { ZD_CR137, 0x50 }, /* 5613 */
+                { ZD_CR138, 0xa8 }, /* 5112 */
+                { ZD_CR144, 0xac }, /* 5613 */
+                { ZD_CR148, 0x40 }, /* 5112 */
+                { ZD_CR149, 0x40 }, /* 4O07, 50->40 */
+                { ZD_CR150, 0x1a }, /* 5112, 0C->1A */
+                { ZD_CR252, 0x34 }, { ZD_CR253, 0x34 },
+                { ZD_CR251, 0x2f }, /* PLL_OFF */
         };
 
         static const struct zd_ioreq16 ioreqs_3[] = {
-                { CR251, 0x7f }, /* PLL_ON */
-                { CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
-                { CR38,  0x38 }, { CR136, 0xdf },
+                { ZD_CR251, 0x7f }, /* PLL_ON */
+                { ZD_CR128, 0x14 }, { ZD_CR129, 0x12 }, { ZD_CR130, 0x10 },
+                { ZD_CR38,  0x38 }, { ZD_CR136, 0xdf },
         };
 
         r = zd_iowrite16a_locked(chip, ioreqs_1, ARRAY_SIZE(ioreqs_1));
@@ -331,16 +331,16 @@ static int zd1211_al7230b_set_channel(struct zd_rf *rf, u8 channel)
 
         static const struct zd_ioreq16 ioreqs[] = {
                 /* PLL_ON */
-                { CR251, 0x3f },
-                { CR203, 0x06 }, { CR240, 0x08 },
+                { ZD_CR251, 0x3f },
+                { ZD_CR203, 0x06 }, { ZD_CR240, 0x08 },
         };
 
-        r = zd_iowrite16_locked(chip, 0x57, CR240);
+        r = zd_iowrite16_locked(chip, 0x57, ZD_CR240);
         if (r)
                 return r;
 
         /* PLL_OFF */
-        r = zd_iowrite16_locked(chip, 0x2f, CR251);
+        r = zd_iowrite16_locked(chip, 0x2f, ZD_CR251);
         if (r)
                 return r;
 
@@ -376,15 +376,15 @@ static int zd1211b_al7230b_set_channel(struct zd_rf *rf, u8 channel)
         const u32 *rv = chan_rv[channel-1];
         struct zd_chip *chip = zd_rf_to_chip(rf);
 
-        r = zd_iowrite16_locked(chip, 0x57, CR240);
+        r = zd_iowrite16_locked(chip, 0x57, ZD_CR240);
         if (r)
                 return r;
-        r = zd_iowrite16_locked(chip, 0xe4, CR9);
+        r = zd_iowrite16_locked(chip, 0xe4, ZD_CR9);
         if (r)
                 return r;
 
         /* PLL_OFF */
-        r = zd_iowrite16_locked(chip, 0x2f, CR251);
+        r = zd_iowrite16_locked(chip, 0x2f, ZD_CR251);
         if (r)
                 return r;
         r = zd_rfwritev_cr_locked(chip, std_rv, ARRAY_SIZE(std_rv));
@@ -410,7 +410,7 @@ static int zd1211b_al7230b_set_channel(struct zd_rf *rf, u8 channel)
         if (r)
                 return r;
 
-        r = zd_iowrite16_locked(chip, 0x7f, CR251);
+        r = zd_iowrite16_locked(chip, 0x7f, ZD_CR251);
         if (r)
                 return r;
 
@@ -421,8 +421,8 @@ static int zd1211_al7230b_switch_radio_on(struct zd_rf *rf)
 {
         struct zd_chip *chip = zd_rf_to_chip(rf);
         static const struct zd_ioreq16 ioreqs[] = {
-                { CR11,  0x00 },
-                { CR251, 0x3f },
+                { ZD_CR11,  0x00 },
+                { ZD_CR251, 0x3f },
         };
 
         return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
@@ -432,8 +432,8 @@ static int zd1211b_al7230b_switch_radio_on(struct zd_rf *rf)
 {
         struct zd_chip *chip = zd_rf_to_chip(rf);
         static const struct zd_ioreq16 ioreqs[] = {
-                { CR11,  0x00 },
-                { CR251, 0x7f },
+                { ZD_CR11,  0x00 },
+                { ZD_CR251, 0x7f },
         };
 
         return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
@@ -443,8 +443,8 @@ static int al7230b_switch_radio_off(struct zd_rf *rf)
 {
         struct zd_chip *chip = zd_rf_to_chip(rf);
         static const struct zd_ioreq16 ioreqs[] = {
-                { CR11,  0x04 },
-                { CR251, 0x2f },
+                { ZD_CR11,  0x04 },
+                { ZD_CR251, 0x2f },
         };
 
         return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
@@ -456,7 +456,7 @@ static int zd1211b_al7230b_patch_6m(struct zd_rf *rf, u8 channel)
 {
         struct zd_chip *chip = zd_rf_to_chip(rf);
         struct zd_ioreq16 ioreqs[] = {
-                { CR128, 0x14 }, { CR129, 0x12 },
+                { ZD_CR128, 0x14 }, { ZD_CR129, 0x12 },
         };
 
         /* FIXME: Channel 11 is not the edge for all regulatory domains. */