Commit 25f8f54f6e178acfd503a95441b0ea05c525f751
Committed by
Dominik Brodowski
1 parent
e9fb13bfec
Exists in
master
and in
4 other branches
pcmcia: Convert pcmcia_device_id declarations to const
Saves about 50KB of data. Old/new size of all objects: text data bss dec hex filename 563015 80096 130684 773795 bcea3 (TOTALS) 610916 32256 130632 773804 bceac (TOTALS) Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Kurt Van Dijck <kurt.van.dijck@eia.be> (for drivers/net/can/softing/softing_cs.c) Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Showing 46 changed files with 47 additions and 47 deletions Side-by-side Diff
- drivers/ata/pata_pcmcia.c
- drivers/bluetooth/bluecard_cs.c
- drivers/bluetooth/bt3c_cs.c
- drivers/bluetooth/btuart_cs.c
- drivers/bluetooth/dtl1_cs.c
- drivers/char/pcmcia/cm4000_cs.c
- drivers/char/pcmcia/cm4040_cs.c
- drivers/char/pcmcia/synclink_cs.c
- drivers/ide/ide-cs.c
- drivers/isdn/hardware/avm/avm_cs.c
- drivers/isdn/hisax/avma1_cs.c
- drivers/isdn/hisax/elsa_cs.c
- drivers/isdn/hisax/sedlbauer_cs.c
- drivers/isdn/hisax/teles_cs.c
- drivers/mmc/host/sdricoh_cs.c
- drivers/mtd/maps/pcmciamtd.c
- drivers/net/can/softing/softing_cs.c
- drivers/net/pcmcia/3c574_cs.c
- drivers/net/pcmcia/3c589_cs.c
- drivers/net/pcmcia/axnet_cs.c
- drivers/net/pcmcia/com20020_cs.c
- drivers/net/pcmcia/fmvj18x_cs.c
- drivers/net/pcmcia/ibmtr_cs.c
- drivers/net/pcmcia/nmclan_cs.c
- drivers/net/pcmcia/pcnet_cs.c
- drivers/net/pcmcia/smc91c92_cs.c
- drivers/net/pcmcia/xirc2ps_cs.c
- drivers/net/wireless/airo_cs.c
- drivers/net/wireless/atmel_cs.c
- drivers/net/wireless/b43/pcmcia.c
- drivers/net/wireless/hostap/hostap_cs.c
- drivers/net/wireless/libertas/if_cs.c
- drivers/net/wireless/orinoco/orinoco_cs.c
- drivers/net/wireless/orinoco/spectrum_cs.c
- drivers/net/wireless/ray_cs.c
- drivers/net/wireless/wl3501_cs.c
- drivers/parport/parport_cs.c
- drivers/scsi/pcmcia/aha152x_stub.c
- drivers/scsi/pcmcia/fdomain_stub.c
- drivers/scsi/pcmcia/nsp_cs.c
- drivers/scsi/pcmcia/qlogic_stub.c
- drivers/scsi/pcmcia/sym53c500_cs.c
- drivers/telephony/ixj_pcmcia.c
- drivers/tty/ipwireless/main.c
- drivers/tty/serial/serial_cs.c
- drivers/usb/host/sl811_cs.c
drivers/ata/pata_pcmcia.c
... | ... | @@ -309,7 +309,7 @@ |
309 | 309 | pcmcia_disable_device(pdev); |
310 | 310 | } |
311 | 311 | |
312 | -static struct pcmcia_device_id pcmcia_devices[] = { | |
312 | +static const struct pcmcia_device_id pcmcia_devices[] = { | |
313 | 313 | PCMCIA_DEVICE_FUNC_ID(4), |
314 | 314 | PCMCIA_DEVICE_MANF_CARD(0x0000, 0x0000), /* Corsair */ |
315 | 315 | PCMCIA_DEVICE_MANF_CARD(0x0007, 0x0000), /* Hitachi */ |
drivers/bluetooth/bluecard_cs.c
... | ... | @@ -930,7 +930,7 @@ |
930 | 930 | pcmcia_disable_device(link); |
931 | 931 | } |
932 | 932 | |
933 | -static struct pcmcia_device_id bluecard_ids[] = { | |
933 | +static const struct pcmcia_device_id bluecard_ids[] = { | |
934 | 934 | PCMCIA_DEVICE_PROD_ID12("BlueCard", "LSE041", 0xbaf16fbf, 0x657cc15e), |
935 | 935 | PCMCIA_DEVICE_PROD_ID12("BTCFCARD", "LSE139", 0xe3987764, 0x2524b59c), |
936 | 936 | PCMCIA_DEVICE_PROD_ID12("WSS", "LSE039", 0x0a0736ec, 0x24e6dfab), |
drivers/bluetooth/bt3c_cs.c
drivers/bluetooth/btuart_cs.c
... | ... | @@ -689,7 +689,7 @@ |
689 | 689 | pcmcia_disable_device(link); |
690 | 690 | } |
691 | 691 | |
692 | -static struct pcmcia_device_id btuart_ids[] = { | |
692 | +static const struct pcmcia_device_id btuart_ids[] = { | |
693 | 693 | /* don't use this driver. Use serial_cs + hci_uart instead */ |
694 | 694 | PCMCIA_DEVICE_NULL |
695 | 695 | }; |
drivers/bluetooth/dtl1_cs.c
... | ... | @@ -636,7 +636,7 @@ |
636 | 636 | } |
637 | 637 | |
638 | 638 | |
639 | -static struct pcmcia_device_id dtl1_ids[] = { | |
639 | +static const struct pcmcia_device_id dtl1_ids[] = { | |
640 | 640 | PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-1", 0xe1bfdd64, 0xe168480d), |
641 | 641 | PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-4", 0xe1bfdd64, 0x9102bc82), |
642 | 642 | PCMCIA_DEVICE_PROD_ID12("Socket", "CF", 0xb38bcc2e, 0x44ebf863), |
drivers/char/pcmcia/cm4000_cs.c
... | ... | @@ -1869,7 +1869,7 @@ |
1869 | 1869 | .llseek = no_llseek, |
1870 | 1870 | }; |
1871 | 1871 | |
1872 | -static struct pcmcia_device_id cm4000_ids[] = { | |
1872 | +static const struct pcmcia_device_id cm4000_ids[] = { | |
1873 | 1873 | PCMCIA_DEVICE_MANF_CARD(0x0223, 0x0002), |
1874 | 1874 | PCMCIA_DEVICE_PROD_ID12("CardMan", "4000", 0x2FB368CA, 0xA2BD8C39), |
1875 | 1875 | PCMCIA_DEVICE_NULL, |
drivers/char/pcmcia/cm4040_cs.c
... | ... | @@ -633,7 +633,7 @@ |
633 | 633 | .llseek = no_llseek, |
634 | 634 | }; |
635 | 635 | |
636 | -static struct pcmcia_device_id cm4040_ids[] = { | |
636 | +static const struct pcmcia_device_id cm4040_ids[] = { | |
637 | 637 | PCMCIA_DEVICE_MANF_CARD(0x0223, 0x0200), |
638 | 638 | PCMCIA_DEVICE_PROD_ID12("OMNIKEY", "CardMan 4040", |
639 | 639 | 0xE32CDD8C, 0x8F23318B), |
drivers/char/pcmcia/synclink_cs.c
drivers/ide/ide-cs.c
... | ... | @@ -272,7 +272,7 @@ |
272 | 272 | } /* ide_release */ |
273 | 273 | |
274 | 274 | |
275 | -static struct pcmcia_device_id ide_ids[] = { | |
275 | +static const struct pcmcia_device_id ide_ids[] = { | |
276 | 276 | PCMCIA_DEVICE_FUNC_ID(4), |
277 | 277 | PCMCIA_DEVICE_MANF_CARD(0x0000, 0x0000), /* Corsair */ |
278 | 278 | PCMCIA_DEVICE_MANF_CARD(0x0007, 0x0000), /* Hitachi */ |
drivers/isdn/hardware/avm/avm_cs.c
... | ... | @@ -149,7 +149,7 @@ |
149 | 149 | } /* avmcs_release */ |
150 | 150 | |
151 | 151 | |
152 | -static struct pcmcia_device_id avmcs_ids[] = { | |
152 | +static const struct pcmcia_device_id avmcs_ids[] = { | |
153 | 153 | PCMCIA_DEVICE_PROD_ID12("AVM", "ISDN-Controller B1", 0x95d42008, 0x845dc335), |
154 | 154 | PCMCIA_DEVICE_PROD_ID12("AVM", "Mobile ISDN-Controller M1", 0x95d42008, 0x81e10430), |
155 | 155 | PCMCIA_DEVICE_PROD_ID12("AVM", "Mobile ISDN-Controller M2", 0x95d42008, 0x18e8558a), |
drivers/isdn/hisax/avma1_cs.c
... | ... | @@ -146,7 +146,7 @@ |
146 | 146 | pcmcia_disable_device(link); |
147 | 147 | } /* avma1cs_release */ |
148 | 148 | |
149 | -static struct pcmcia_device_id avma1cs_ids[] = { | |
149 | +static const struct pcmcia_device_id avma1cs_ids[] = { | |
150 | 150 | PCMCIA_DEVICE_PROD_ID12("AVM", "ISDN A", 0x95d42008, 0xadc9d4bb), |
151 | 151 | PCMCIA_DEVICE_PROD_ID12("ISDN", "CARD", 0x8d9761c8, 0x01c5aa7b), |
152 | 152 | PCMCIA_DEVICE_NULL |
drivers/isdn/hisax/elsa_cs.c
... | ... | @@ -202,7 +202,7 @@ |
202 | 202 | return 0; |
203 | 203 | } |
204 | 204 | |
205 | -static struct pcmcia_device_id elsa_ids[] = { | |
205 | +static const struct pcmcia_device_id elsa_ids[] = { | |
206 | 206 | PCMCIA_DEVICE_PROD_ID12("ELSA AG (Aachen, Germany)", "MicroLink ISDN/MC ", 0x983de2c4, 0x333ba257), |
207 | 207 | PCMCIA_DEVICE_PROD_ID12("ELSA GmbH, Aachen", "MicroLink ISDN/MC ", 0x639e5718, 0x333ba257), |
208 | 208 | PCMCIA_DEVICE_NULL |
drivers/isdn/hisax/sedlbauer_cs.c
... | ... | @@ -186,7 +186,7 @@ |
186 | 186 | } |
187 | 187 | |
188 | 188 | |
189 | -static struct pcmcia_device_id sedlbauer_ids[] = { | |
189 | +static const struct pcmcia_device_id sedlbauer_ids[] = { | |
190 | 190 | PCMCIA_DEVICE_PROD_ID123("SEDLBAUER", "speed star II", "V 3.1", 0x81fb79f5, 0xf3612e1d, 0x6b95c78a), |
191 | 191 | PCMCIA_DEVICE_PROD_ID123("SEDLBAUER", "ISDN-Adapter", "4D67", 0x81fb79f5, 0xe4e9bc12, 0x397b7e90), |
192 | 192 | PCMCIA_DEVICE_PROD_ID123("SEDLBAUER", "ISDN-Adapter", "4D98", 0x81fb79f5, 0xe4e9bc12, 0x2e5c7fce), |
drivers/isdn/hisax/teles_cs.c
drivers/mmc/host/sdricoh_cs.c
... | ... | @@ -76,7 +76,7 @@ |
76 | 76 | #define BUSY_TIMEOUT 32767 |
77 | 77 | |
78 | 78 | /* list of supported pcmcia devices */ |
79 | -static struct pcmcia_device_id pcmcia_ids[] = { | |
79 | +static const struct pcmcia_device_id pcmcia_ids[] = { | |
80 | 80 | /* vendor and device strings followed by their crc32 hashes */ |
81 | 81 | PCMCIA_DEVICE_PROD_ID12("RICOH", "Bay1Controller", 0xd9f522ed, |
82 | 82 | 0xc3901202), |
drivers/mtd/maps/pcmciamtd.c
... | ... | @@ -694,7 +694,7 @@ |
694 | 694 | return pcmciamtd_config(link); |
695 | 695 | } |
696 | 696 | |
697 | -static struct pcmcia_device_id pcmciamtd_ids[] = { | |
697 | +static const struct pcmcia_device_id pcmciamtd_ids[] = { | |
698 | 698 | PCMCIA_DEVICE_FUNC_ID(1), |
699 | 699 | PCMCIA_DEVICE_PROD_ID123("IO DATA", "PCS-2M", "2MB SRAM", 0x547e66dc, 0x1fed36cd, 0x36eadd21), |
700 | 700 | PCMCIA_DEVICE_PROD_ID12("IBM", "2MB SRAM", 0xb569a6e5, 0x36eadd21), |
drivers/net/can/softing/softing_cs.c
... | ... | @@ -315,7 +315,7 @@ |
315 | 315 | return ret ?: -ENODEV; |
316 | 316 | } |
317 | 317 | |
318 | -static /*const*/ struct pcmcia_device_id softingcs_ids[] = { | |
318 | +static const struct pcmcia_device_id softingcs_ids[] = { | |
319 | 319 | /* softing */ |
320 | 320 | PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0001), |
321 | 321 | PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0002), |
drivers/net/pcmcia/3c574_cs.c
... | ... | @@ -1150,7 +1150,7 @@ |
1150 | 1150 | return 0; |
1151 | 1151 | } |
1152 | 1152 | |
1153 | -static struct pcmcia_device_id tc574_ids[] = { | |
1153 | +static const struct pcmcia_device_id tc574_ids[] = { | |
1154 | 1154 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0574), |
1155 | 1155 | PCMCIA_MFC_DEVICE_CIS_MANF_CARD(0, 0x0101, 0x0556, "cis/3CCFEM556.cis"), |
1156 | 1156 | PCMCIA_DEVICE_NULL, |
drivers/net/pcmcia/3c589_cs.c
... | ... | @@ -908,7 +908,7 @@ |
908 | 908 | return 0; |
909 | 909 | } |
910 | 910 | |
911 | -static struct pcmcia_device_id tc589_ids[] = { | |
911 | +static const struct pcmcia_device_id tc589_ids[] = { | |
912 | 912 | PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0101, 0x0562), |
913 | 913 | PCMCIA_MFC_DEVICE_PROD_ID1(0, "Motorola MARQUIS", 0xf03e4e77), |
914 | 914 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0589), |
drivers/net/pcmcia/axnet_cs.c
... | ... | @@ -687,7 +687,7 @@ |
687 | 687 | outsw(nic_base + AXNET_DATAPORT, buf, count>>1); |
688 | 688 | } |
689 | 689 | |
690 | -static struct pcmcia_device_id axnet_ids[] = { | |
690 | +static const struct pcmcia_device_id axnet_ids[] = { | |
691 | 691 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x016c, 0x0081), |
692 | 692 | PCMCIA_DEVICE_MANF_CARD(0x018a, 0x0301), |
693 | 693 | PCMCIA_DEVICE_MANF_CARD(0x01bf, 0x2328), |
drivers/net/pcmcia/com20020_cs.c
... | ... | @@ -316,7 +316,7 @@ |
316 | 316 | return 0; |
317 | 317 | } |
318 | 318 | |
319 | -static struct pcmcia_device_id com20020_ids[] = { | |
319 | +static const struct pcmcia_device_id com20020_ids[] = { | |
320 | 320 | PCMCIA_DEVICE_PROD_ID12("Contemporary Control Systems, Inc.", |
321 | 321 | "PCM20 Arcnet Adapter", 0x59991666, 0x95dfffaf), |
322 | 322 | PCMCIA_DEVICE_PROD_ID12("SoHard AG", |
drivers/net/pcmcia/fmvj18x_cs.c
... | ... | @@ -667,7 +667,7 @@ |
667 | 667 | |
668 | 668 | /*====================================================================*/ |
669 | 669 | |
670 | -static struct pcmcia_device_id fmvj18x_ids[] = { | |
670 | +static const struct pcmcia_device_id fmvj18x_ids[] = { | |
671 | 671 | PCMCIA_DEVICE_MANF_CARD(0x0004, 0x0004), |
672 | 672 | PCMCIA_DEVICE_PROD_ID12("EAGLE Technology", "NE200 ETHERNET LAN MBH10302 04", 0x528c88c4, 0x74f91e59), |
673 | 673 | PCMCIA_DEVICE_PROD_ID12("Eiger Labs,Inc", "EPX-10BT PC Card Ethernet 10BT", 0x53af556e, 0x877f9922), |
drivers/net/pcmcia/ibmtr_cs.c
... | ... | @@ -340,7 +340,7 @@ |
340 | 340 | outb(0x40, dev->base_addr); |
341 | 341 | } |
342 | 342 | |
343 | -static struct pcmcia_device_id ibmtr_ids[] = { | |
343 | +static const struct pcmcia_device_id ibmtr_ids[] = { | |
344 | 344 | PCMCIA_DEVICE_PROD_ID12("3Com", "TokenLink Velocity PC Card", 0x41240e5b, 0x82c3734e), |
345 | 345 | PCMCIA_DEVICE_PROD_ID12("IBM", "TOKEN RING", 0xb569a6e5, 0xbf8eed47), |
346 | 346 | PCMCIA_DEVICE_NULL, |
drivers/net/pcmcia/nmclan_cs.c
... | ... | @@ -1494,7 +1494,7 @@ |
1494 | 1494 | |
1495 | 1495 | } /* set_multicast_list */ |
1496 | 1496 | |
1497 | -static struct pcmcia_device_id nmclan_ids[] = { | |
1497 | +static const struct pcmcia_device_id nmclan_ids[] = { | |
1498 | 1498 | PCMCIA_DEVICE_PROD_ID12("New Media Corporation", "Ethernet", 0x085a850b, 0x00b2e941), |
1499 | 1499 | PCMCIA_DEVICE_PROD_ID12("Portable Add-ons", "Ethernet+", 0xebf1d60, 0xad673aaf), |
1500 | 1500 | PCMCIA_DEVICE_NULL, |
drivers/net/pcmcia/pcnet_cs.c
... | ... | @@ -1463,7 +1463,7 @@ |
1463 | 1463 | |
1464 | 1464 | /*====================================================================*/ |
1465 | 1465 | |
1466 | -static struct pcmcia_device_id pcnet_ids[] = { | |
1466 | +static const struct pcmcia_device_id pcnet_ids[] = { | |
1467 | 1467 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0057, 0x0021), |
1468 | 1468 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0104, 0x000a), |
1469 | 1469 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0xea15), |
drivers/net/pcmcia/smc91c92_cs.c
... | ... | @@ -2014,7 +2014,7 @@ |
2014 | 2014 | return rc; |
2015 | 2015 | } |
2016 | 2016 | |
2017 | -static struct pcmcia_device_id smc91c92_ids[] = { | |
2017 | +static const struct pcmcia_device_id smc91c92_ids[] = { | |
2018 | 2018 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0109, 0x0501), |
2019 | 2019 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0140, 0x000a), |
2020 | 2020 | PCMCIA_PFC_DEVICE_PROD_ID123(0, "MEGAHERTZ", "CC/XJEM3288", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x04cd2988, 0x46a52d63), |
drivers/net/pcmcia/xirc2ps_cs.c
... | ... | @@ -1738,7 +1738,7 @@ |
1738 | 1738 | return 0; |
1739 | 1739 | } |
1740 | 1740 | |
1741 | -static struct pcmcia_device_id xirc2ps_ids[] = { | |
1741 | +static const struct pcmcia_device_id xirc2ps_ids[] = { | |
1742 | 1742 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0089, 0x110a), |
1743 | 1743 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0138, 0x110a), |
1744 | 1744 | PCMCIA_PFC_DEVICE_PROD_ID13(0, "Xircom", "CEM28", 0x2e3ee845, 0x0ea978ea), |
drivers/net/wireless/airo_cs.c
... | ... | @@ -164,7 +164,7 @@ |
164 | 164 | return 0; |
165 | 165 | } |
166 | 166 | |
167 | -static struct pcmcia_device_id airo_ids[] = { | |
167 | +static const struct pcmcia_device_id airo_ids[] = { | |
168 | 168 | PCMCIA_DEVICE_MANF_CARD(0x015f, 0x000a), |
169 | 169 | PCMCIA_DEVICE_MANF_CARD(0x015f, 0x0005), |
170 | 170 | PCMCIA_DEVICE_MANF_CARD(0x015f, 0x0007), |
drivers/net/wireless/atmel_cs.c
... | ... | @@ -122,7 +122,7 @@ |
122 | 122 | { |
123 | 123 | local_info_t *dev; |
124 | 124 | int ret; |
125 | - struct pcmcia_device_id *did; | |
125 | + const struct pcmcia_device_id *did; | |
126 | 126 | |
127 | 127 | dev = link->priv; |
128 | 128 | did = dev_get_drvdata(&link->dev); |
... | ... | @@ -211,7 +211,7 @@ |
211 | 211 | .prod_id_hash = { (vh1), (vh2), 0, 0 }, \ |
212 | 212 | .driver_info = (kernel_ulong_t)(info), } |
213 | 213 | |
214 | -static struct pcmcia_device_id atmel_ids[] = { | |
214 | +static const struct pcmcia_device_id atmel_ids[] = { | |
215 | 215 | PCMCIA_DEVICE_MANF_CARD_INFO(0x0101, 0x0620, ATMEL_FW_TYPE_502_3COM), |
216 | 216 | PCMCIA_DEVICE_MANF_CARD_INFO(0x0101, 0x0696, ATMEL_FW_TYPE_502_3COM), |
217 | 217 | PCMCIA_DEVICE_MANF_CARD_INFO(0x01bf, 0x3302, ATMEL_FW_TYPE_502E), |
drivers/net/wireless/b43/pcmcia.c
... | ... | @@ -32,7 +32,7 @@ |
32 | 32 | #include <pcmcia/cisreg.h> |
33 | 33 | |
34 | 34 | |
35 | -static /*const */ struct pcmcia_device_id b43_pcmcia_tbl[] = { | |
35 | +static const struct pcmcia_device_id b43_pcmcia_tbl[] = { | |
36 | 36 | PCMCIA_DEVICE_MANF_CARD(0x2D0, 0x448), |
37 | 37 | PCMCIA_DEVICE_MANF_CARD(0x2D0, 0x476), |
38 | 38 | PCMCIA_DEVICE_NULL, |
drivers/net/wireless/hostap/hostap_cs.c
... | ... | @@ -620,7 +620,7 @@ |
620 | 620 | return 0; |
621 | 621 | } |
622 | 622 | |
623 | -static struct pcmcia_device_id hostap_cs_ids[] = { | |
623 | +static const struct pcmcia_device_id hostap_cs_ids[] = { | |
624 | 624 | PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100), |
625 | 625 | PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300), |
626 | 626 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), |
drivers/net/wireless/libertas/if_cs.c
... | ... | @@ -965,7 +965,7 @@ |
965 | 965 | /* Module initialization */ |
966 | 966 | /********************************************************************/ |
967 | 967 | |
968 | -static struct pcmcia_device_id if_cs_ids[] = { | |
968 | +static const struct pcmcia_device_id if_cs_ids[] = { | |
969 | 969 | PCMCIA_DEVICE_MANF_CARD(CF8305_MANFID, CF8305_CARDID), |
970 | 970 | PCMCIA_DEVICE_MANF_CARD(CF8381_MANFID, CF8381_CARDID), |
971 | 971 | PCMCIA_DEVICE_MANF_CARD(CF8385_MANFID, CF8385_CARDID), |
drivers/net/wireless/orinoco/orinoco_cs.c
... | ... | @@ -237,7 +237,7 @@ |
237 | 237 | /* Module initialization */ |
238 | 238 | /********************************************************************/ |
239 | 239 | |
240 | -static struct pcmcia_device_id orinoco_cs_ids[] = { | |
240 | +static const struct pcmcia_device_id orinoco_cs_ids[] = { | |
241 | 241 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), /* 3Com AirConnect PCI 777A */ |
242 | 242 | PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), /* Lucent Orinoco and old Intersil */ |
243 | 243 | PCMCIA_DEVICE_MANF_CARD(0x016b, 0x0001), /* Ericsson WLAN Card C11 */ |
drivers/net/wireless/orinoco/spectrum_cs.c
... | ... | @@ -301,7 +301,7 @@ |
301 | 301 | /* Module initialization */ |
302 | 302 | /********************************************************************/ |
303 | 303 | |
304 | -static struct pcmcia_device_id spectrum_cs_ids[] = { | |
304 | +static const struct pcmcia_device_id spectrum_cs_ids[] = { | |
305 | 305 | PCMCIA_DEVICE_MANF_CARD(0x026c, 0x0001), /* Symbol Spectrum24 LA4137 */ |
306 | 306 | PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0001), /* Socket Communications CF */ |
307 | 307 | PCMCIA_DEVICE_PROD_ID12("Intel", "PRO/Wireless LAN PC Card", 0x816cc815, 0x6fbf459a), /* 2011B, not 2011 */ |
drivers/net/wireless/ray_cs.c
drivers/net/wireless/wl3501_cs.c
drivers/parport/parport_cs.c
... | ... | @@ -178,7 +178,7 @@ |
178 | 178 | } /* parport_cs_release */ |
179 | 179 | |
180 | 180 | |
181 | -static struct pcmcia_device_id parport_ids[] = { | |
181 | +static const struct pcmcia_device_id parport_ids[] = { | |
182 | 182 | PCMCIA_DEVICE_FUNC_ID(3), |
183 | 183 | PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial+Parallel Port: SP230",0x3beb8cf2,0xdb9e58bc), |
184 | 184 | PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0003), |
drivers/scsi/pcmcia/aha152x_stub.c
... | ... | @@ -202,7 +202,7 @@ |
202 | 202 | return 0; |
203 | 203 | } |
204 | 204 | |
205 | -static struct pcmcia_device_id aha152x_ids[] = { | |
205 | +static const struct pcmcia_device_id aha152x_ids[] = { | |
206 | 206 | PCMCIA_DEVICE_PROD_ID123("New Media", "SCSI", "Bus Toaster", 0xcdf7e4cc, 0x35f26476, 0xa8851d6e), |
207 | 207 | PCMCIA_DEVICE_PROD_ID123("NOTEWORTHY", "SCSI", "Bus Toaster", 0xad89c6e8, 0x35f26476, 0xa8851d6e), |
208 | 208 | PCMCIA_DEVICE_PROD_ID12("Adaptec, Inc.", "APA-1460 SCSI Host Adapter", 0x24ba9738, 0x3a3c3d20), |
drivers/scsi/pcmcia/fdomain_stub.c
... | ... | @@ -178,7 +178,7 @@ |
178 | 178 | return 0; |
179 | 179 | } |
180 | 180 | |
181 | -static struct pcmcia_device_id fdomain_ids[] = { | |
181 | +static const struct pcmcia_device_id fdomain_ids[] = { | |
182 | 182 | PCMCIA_DEVICE_PROD_ID12("IBM Corp.", "SCSI PCMCIA Card", 0xe3736c88, 0x859cad20), |
183 | 183 | PCMCIA_DEVICE_PROD_ID1("SCSI PCMCIA Adapter Card", 0x8dacb57e), |
184 | 184 | PCMCIA_DEVICE_PROD_ID12(" SIMPLE TECHNOLOGY Corporation", "SCSI PCMCIA Credit Card Controller", 0x182bdafe, 0xc80d106f), |
drivers/scsi/pcmcia/nsp_cs.c
... | ... | @@ -1752,7 +1752,7 @@ |
1752 | 1752 | /*======================================================================* |
1753 | 1753 | * module entry point |
1754 | 1754 | *====================================================================*/ |
1755 | -static struct pcmcia_device_id nsp_cs_ids[] = { | |
1755 | +static const struct pcmcia_device_id nsp_cs_ids[] = { | |
1756 | 1756 | PCMCIA_DEVICE_PROD_ID123("IO DATA", "CBSC16 ", "1", 0x547e66dc, 0x0d63a3fd, 0x51de003a), |
1757 | 1757 | PCMCIA_DEVICE_PROD_ID123("KME ", "SCSI-CARD-001", "1", 0x534c02bc, 0x52008408, 0x51de003a), |
1758 | 1758 | PCMCIA_DEVICE_PROD_ID123("KME ", "SCSI-CARD-002", "1", 0x534c02bc, 0xcb09d5b2, 0x51de003a), |
drivers/scsi/pcmcia/qlogic_stub.c
... | ... | @@ -270,7 +270,7 @@ |
270 | 270 | return 0; |
271 | 271 | } |
272 | 272 | |
273 | -static struct pcmcia_device_id qlogic_ids[] = { | |
273 | +static const struct pcmcia_device_id qlogic_ids[] = { | |
274 | 274 | PCMCIA_DEVICE_PROD_ID12("EIger Labs", "PCMCIA-to-SCSI Adapter", 0x88395fa7, 0x33b7a5e6), |
275 | 275 | PCMCIA_DEVICE_PROD_ID12("EPSON", "SCSI-2 PC Card SC200", 0xd361772f, 0x299d1751), |
276 | 276 | PCMCIA_DEVICE_PROD_ID12("MACNICA", "MIRACLE SCSI-II mPS110", 0x20841b68, 0xab3c3b6d), |
drivers/scsi/pcmcia/sym53c500_cs.c
... | ... | @@ -865,7 +865,7 @@ |
865 | 865 | MODULE_DESCRIPTION("SYM53C500 PCMCIA SCSI driver"); |
866 | 866 | MODULE_LICENSE("GPL"); |
867 | 867 | |
868 | -static struct pcmcia_device_id sym53c500_ids[] = { | |
868 | +static const struct pcmcia_device_id sym53c500_ids[] = { | |
869 | 869 | PCMCIA_DEVICE_PROD_ID12("BASICS by New Media Corporation", "SCSI Sym53C500", 0x23c78a9d, 0x0099e7f7), |
870 | 870 | PCMCIA_DEVICE_PROD_ID12("New Media Corporation", "SCSI Bus Toaster Sym53C500", 0x085a850b, 0x45432eb8), |
871 | 871 | PCMCIA_DEVICE_PROD_ID2("SCSI9000", 0x21648f44), |
drivers/telephony/ixj_pcmcia.c
drivers/tty/ipwireless/main.c
... | ... | @@ -33,7 +33,7 @@ |
33 | 33 | #include <pcmcia/ss.h> |
34 | 34 | #include <pcmcia/ds.h> |
35 | 35 | |
36 | -static struct pcmcia_device_id ipw_ids[] = { | |
36 | +static const struct pcmcia_device_id ipw_ids[] = { | |
37 | 37 | PCMCIA_DEVICE_MANF_CARD(0x02f2, 0x0100), |
38 | 38 | PCMCIA_DEVICE_MANF_CARD(0x02f2, 0x0200), |
39 | 39 | PCMCIA_DEVICE_NULL |
drivers/tty/serial/serial_cs.c
... | ... | @@ -670,7 +670,7 @@ |
670 | 670 | return -ENODEV; |
671 | 671 | } |
672 | 672 | |
673 | -static struct pcmcia_device_id serial_ids[] = { | |
673 | +static const struct pcmcia_device_id serial_ids[] = { | |
674 | 674 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0057, 0x0021), |
675 | 675 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0089, 0x110a), |
676 | 676 | PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0104, 0x000a), |
drivers/usb/host/sl811_cs.c
... | ... | @@ -187,7 +187,7 @@ |
187 | 187 | return sl811_cs_config(link); |
188 | 188 | } |
189 | 189 | |
190 | -static struct pcmcia_device_id sl811_ids[] = { | |
190 | +static const struct pcmcia_device_id sl811_ids[] = { | |
191 | 191 | PCMCIA_DEVICE_MANF_CARD(0xc015, 0x0001), /* RATOC USB HOST CF+ Card */ |
192 | 192 | PCMCIA_DEVICE_NULL, |
193 | 193 | }; |