rt2x00 update: Use static const for the vals arrays
Subsystems (3)
PATCH 3/6 rt2x00 update: Use static const for the vals arrays
From: Ivo van Doorn <[email protected]>
Make the vals arrays static const.
Signed-off-by Ivo van Doorn <[email protected]>
drivers/net/wireless/d80211/rt2x00/rt2400pci.c +1 -1
@@ -2229,7 +2229,7 @@ rt2400pci_init_hw_channels(struct rt2x00 {int counter;u16 eeprom; -static u32 vals[] = { +static const u32 vals[] = {0x000c1fda ,0x000c1fee ,0x000c2002 ,0x000c2016 ,0x000c202a ,0x000c203e ,0x000c2052 ,0x000c2066 ,0x000c207a ,0x000c208e ,0x000c20a2 ,0x000c20b6 ,
drivers/net/wireless/d80211/rt2x00/rt2500pci.c +5 -5
@@ -2347,7 +2347,7 @@ rt2500pci_init_hw_channels(struct rt2x00int counter;u32 rf2_base;u16 eeprom; -static struct { +static const struct {unsigned int chip;u32 val[3 ]; } rf[] = {
@@ -2404,7 +2404,7 @@ rt2500pci_init_hw_channels(struct rt2x00 rf2_base =0x00080000 ;if (rt2x00_rf (&rt2x00pci->chip,RF2522 )) { -static u32 vals[] = { +static const u32 vals[] = {0x000c1fda ,0x000c1fee ,0x000c2002 ,0x000c2016 ,0x000c202a ,0x000c203e ,0x000c2052 ,0x000c2066 ,0x000c207a ,0x000c208e ,0x000c20a2 ,0x000c20b6 ,
@@ -2416,7 +2416,7 @@ rt2500pci_init_hw_channels(struct rt2x00 }else if (rt2x00_rf (&rt2x00pci->chip,RF2523 ) ||rt2x00_rf (&rt2x00pci->chip,RF2524 ) ||rt2x00_rf (&rt2x00pci->chip,RF2525 )) { -static u32 vals[] = { +static const u32 vals[] = {0x00000c9e ,0x00000ca2 ,0x00000ca6 ,0x00000caa ,0x00000cae ,0x00000cb2 ,0x00000cb6 ,0x00000cba , 0x00000cbe, 0x00000d02, 0x00000d06, 0x00000d0a,
@@ -2428,7 +2428,7 @@ rt2500pci_init_hw_channels(struct rt2x00cpu_to_le32 (vals[counter] | rf2_base); }else if (rt2x00_rf (&rt2x00pci->chip,RF2525E ) ||rt2x00_rf (&rt2x00pci->chip,RF5222 )) { -static u32 vals[] = { +static const u32 vals[] = {0x00001136 ,0x0000113a ,0x0000113e ,0x00001182 ,0x00001186 ,0x0000118a ,0x0000118e ,0x00001192 , 0x00001196, 0x0000119a, 0x0000119e, 0x000011a2,
@@ -2440,7 +2440,7 @@ rt2500pci_init_hw_channels(struct rt2x00cpu_to_le32 (vals[counter] | rf2_base); }if (rt2x00_rf (&rt2x00pci->chip,RF5222 )) { -static u32 vals[] = { +static const u32 vals[] = {0x00018896 ,0x0001889a ,0x0001889e ,0x000188a2 ,0x000188a6 ,0x000188aa ,0x000188ae ,0x000188b2 ,0x00008802 ,0x00008806 ,0x0000880a ,0x0000880e ,
drivers/net/wireless/d80211/rt2x00/rt2500usb.c +5 -5
@@ -1968,7 +1968,7 @@ rt2500usb_init_hw_channels(struct rt2x00int counter;u32 rf2_base;u16 eeprom; -static struct { +static const struct {unsigned int chip;u32 val[3 ]; } rf[] = {
@@ -2024,7 +2024,7 @@ rt2500usb_init_hw_channels(struct rt2x00 rf2_base =0x00080000 ;if (rt2x00_rf (&rt2x00usb->chip,RF2522 )) { -static u32 vals[] = { +static const u32 vals[] = {0x000c1fda ,0x000c1fee ,0x000c2002 ,0x000c2016 ,0x000c202a ,0x000c203e ,0x000c2052 ,0x000c2066 ,0x000c207a ,0x000c208e ,0x000c20a2 ,0x000c20b6 ,
@@ -2036,7 +2036,7 @@ rt2500usb_init_hw_channels(struct rt2x00 }else if (rt2x00_rf (&rt2x00usb->chip,RF2523 ) ||rt2x00_rf (&rt2x00usb->chip,RF2524 ) ||rt2x00_rf (&rt2x00usb->chip,RF2525 )) { -static u32 vals[] = { +static const u32 vals[] = {0x00000c9e ,0x00000ca2 ,0x00000ca6 ,0x00000caa ,0x00000cae ,0x00000cb2 ,0x00000cb6 ,0x00000cba , 0x00000cbe, 0x00000d02, 0x00000d06, 0x00000d0a,
@@ -2046,7 +2046,7 @@ rt2500usb_init_hw_channels(struct rt2x00for (counter =0 ; counter <ARRAY_SIZE (vals); counter++) channels[counter].val = vals[counter] | rf2_base; }else if (rt2x00_rf (&rt2x00usb->chip,RF2525E )) { -static u32 vals[] = { +static const u32 vals[] = {0x0000089a ,0x0000089e ,0x0000089e ,0x000008a2 ,0x000008a2 ,0x000008a6 ,0x000008a6 ,0x000008aa , 0x000008aa, 0x000008ae, 0x000008ae, 0x000008b2,
@@ -2056,7 +2056,7 @@ rt2500usb_init_hw_channels(struct rt2x00for (counter =0 ; counter <ARRAY_SIZE (vals); counter++) channels[counter].val = vals[counter]; }else if (rt2x00_rf (&rt2x00usb->chip,RF5222 )) { -static u32 vals[] = { +static const u32 vals[] = {0x00001136 ,0x0000113a ,0x0000113e ,0x00001182 ,0x00001186 ,0x0000118a ,0x0000118e ,0x00001192 , 0x00001196, 0x0000119a, 0x0000119e, 0x000011a2,