diff options
author | Joe Perches <joe@perches.com> | 2011-05-03 22:29:01 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2011-05-06 01:46:22 -0400 |
commit | 25f8f54f6e178acfd503a95441b0ea05c525f751 (patch) | |
tree | 47837e1b55600602d129afb373670104f8012c60 /drivers/net/pcmcia | |
parent | e9fb13bfec7e017130ddc5c1b5466340470f4900 (diff) |
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>
Diffstat (limited to 'drivers/net/pcmcia')
-rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/pcmcia/3c589_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/pcmcia/com20020_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/pcmcia/fmvj18x_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/pcmcia/ibmtr_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/pcmcia/nmclan_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/pcmcia/pcnet_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/pcmcia/smc91c92_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index 81ac330f931d..34c5e1cbf65d 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
@@ -1150,7 +1150,7 @@ static int el3_close(struct net_device *dev) | |||
1150 | return 0; | 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 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0574), | 1154 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0574), |
1155 | PCMCIA_MFC_DEVICE_CIS_MANF_CARD(0, 0x0101, 0x0556, "cis/3CCFEM556.cis"), | 1155 | PCMCIA_MFC_DEVICE_CIS_MANF_CARD(0, 0x0101, 0x0556, "cis/3CCFEM556.cis"), |
1156 | PCMCIA_DEVICE_NULL, | 1156 | PCMCIA_DEVICE_NULL, |
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c index 79b9ca0dbdb4..4a1a35809807 100644 --- a/drivers/net/pcmcia/3c589_cs.c +++ b/drivers/net/pcmcia/3c589_cs.c | |||
@@ -908,7 +908,7 @@ static int el3_close(struct net_device *dev) | |||
908 | return 0; | 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 | PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0101, 0x0562), | 912 | PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0101, 0x0562), |
913 | PCMCIA_MFC_DEVICE_PROD_ID1(0, "Motorola MARQUIS", 0xf03e4e77), | 913 | PCMCIA_MFC_DEVICE_PROD_ID1(0, "Motorola MARQUIS", 0xf03e4e77), |
914 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0589), | 914 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0589), |
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 3077d72e8222..9953db711969 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -687,7 +687,7 @@ static void block_output(struct net_device *dev, int count, | |||
687 | outsw(nic_base + AXNET_DATAPORT, buf, count>>1); | 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 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x016c, 0x0081), | 691 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x016c, 0x0081), |
692 | PCMCIA_DEVICE_MANF_CARD(0x018a, 0x0301), | 692 | PCMCIA_DEVICE_MANF_CARD(0x018a, 0x0301), |
693 | PCMCIA_DEVICE_MANF_CARD(0x01bf, 0x2328), | 693 | PCMCIA_DEVICE_MANF_CARD(0x01bf, 0x2328), |
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c index 27bfad76fc40..980e65c14936 100644 --- a/drivers/net/pcmcia/com20020_cs.c +++ b/drivers/net/pcmcia/com20020_cs.c | |||
@@ -316,7 +316,7 @@ static int com20020_resume(struct pcmcia_device *link) | |||
316 | return 0; | 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 | PCMCIA_DEVICE_PROD_ID12("Contemporary Control Systems, Inc.", | 320 | PCMCIA_DEVICE_PROD_ID12("Contemporary Control Systems, Inc.", |
321 | "PCM20 Arcnet Adapter", 0x59991666, 0x95dfffaf), | 321 | "PCM20 Arcnet Adapter", 0x59991666, 0x95dfffaf), |
322 | PCMCIA_DEVICE_PROD_ID12("SoHard AG", | 322 | PCMCIA_DEVICE_PROD_ID12("SoHard AG", |
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 530ab5a10bd3..723815e7a997 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
@@ -667,7 +667,7 @@ static int fmvj18x_resume(struct pcmcia_device *link) | |||
667 | 667 | ||
668 | /*====================================================================*/ | 668 | /*====================================================================*/ |
669 | 669 | ||
670 | static struct pcmcia_device_id fmvj18x_ids[] = { | 670 | static const struct pcmcia_device_id fmvj18x_ids[] = { |
671 | PCMCIA_DEVICE_MANF_CARD(0x0004, 0x0004), | 671 | PCMCIA_DEVICE_MANF_CARD(0x0004, 0x0004), |
672 | PCMCIA_DEVICE_PROD_ID12("EAGLE Technology", "NE200 ETHERNET LAN MBH10302 04", 0x528c88c4, 0x74f91e59), | 672 | PCMCIA_DEVICE_PROD_ID12("EAGLE Technology", "NE200 ETHERNET LAN MBH10302 04", 0x528c88c4, 0x74f91e59), |
673 | PCMCIA_DEVICE_PROD_ID12("Eiger Labs,Inc", "EPX-10BT PC Card Ethernet 10BT", 0x53af556e, 0x877f9922), | 673 | PCMCIA_DEVICE_PROD_ID12("Eiger Labs,Inc", "EPX-10BT PC Card Ethernet 10BT", 0x53af556e, 0x877f9922), |
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c index 15d57f5b6f29..6006d5488fbe 100644 --- a/drivers/net/pcmcia/ibmtr_cs.c +++ b/drivers/net/pcmcia/ibmtr_cs.c | |||
@@ -340,7 +340,7 @@ static void ibmtr_hw_setup(struct net_device *dev, u_int mmiobase) | |||
340 | outb(0x40, dev->base_addr); | 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 | PCMCIA_DEVICE_PROD_ID12("3Com", "TokenLink Velocity PC Card", 0x41240e5b, 0x82c3734e), | 344 | PCMCIA_DEVICE_PROD_ID12("3Com", "TokenLink Velocity PC Card", 0x41240e5b, 0x82c3734e), |
345 | PCMCIA_DEVICE_PROD_ID12("IBM", "TOKEN RING", 0xb569a6e5, 0xbf8eed47), | 345 | PCMCIA_DEVICE_PROD_ID12("IBM", "TOKEN RING", 0xb569a6e5, 0xbf8eed47), |
346 | PCMCIA_DEVICE_NULL, | 346 | PCMCIA_DEVICE_NULL, |
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index 76683d97d83b..9d70b6595220 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c | |||
@@ -1494,7 +1494,7 @@ static void set_multicast_list(struct net_device *dev) | |||
1494 | 1494 | ||
1495 | } /* set_multicast_list */ | 1495 | } /* set_multicast_list */ |
1496 | 1496 | ||
1497 | static struct pcmcia_device_id nmclan_ids[] = { | 1497 | static const struct pcmcia_device_id nmclan_ids[] = { |
1498 | PCMCIA_DEVICE_PROD_ID12("New Media Corporation", "Ethernet", 0x085a850b, 0x00b2e941), | 1498 | PCMCIA_DEVICE_PROD_ID12("New Media Corporation", "Ethernet", 0x085a850b, 0x00b2e941), |
1499 | PCMCIA_DEVICE_PROD_ID12("Portable Add-ons", "Ethernet+", 0xebf1d60, 0xad673aaf), | 1499 | PCMCIA_DEVICE_PROD_ID12("Portable Add-ons", "Ethernet+", 0xebf1d60, 0xad673aaf), |
1500 | PCMCIA_DEVICE_NULL, | 1500 | PCMCIA_DEVICE_NULL, |
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index e953793a33ff..b4fd7c3ed077 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
@@ -1463,7 +1463,7 @@ failed: | |||
1463 | 1463 | ||
1464 | /*====================================================================*/ | 1464 | /*====================================================================*/ |
1465 | 1465 | ||
1466 | static struct pcmcia_device_id pcnet_ids[] = { | 1466 | static const struct pcmcia_device_id pcnet_ids[] = { |
1467 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0057, 0x0021), | 1467 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0057, 0x0021), |
1468 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0104, 0x000a), | 1468 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0104, 0x000a), |
1469 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0xea15), | 1469 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0xea15), |
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c index 108591756440..d817369c468f 100644 --- a/drivers/net/pcmcia/smc91c92_cs.c +++ b/drivers/net/pcmcia/smc91c92_cs.c | |||
@@ -2014,7 +2014,7 @@ static int smc_ioctl (struct net_device *dev, struct ifreq *rq, int cmd) | |||
2014 | return rc; | 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 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0109, 0x0501), | 2018 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0109, 0x0501), |
2019 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0140, 0x000a), | 2019 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0140, 0x000a), |
2020 | PCMCIA_PFC_DEVICE_PROD_ID123(0, "MEGAHERTZ", "CC/XJEM3288", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x04cd2988, 0x46a52d63), | 2020 | PCMCIA_PFC_DEVICE_PROD_ID123(0, "MEGAHERTZ", "CC/XJEM3288", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x04cd2988, 0x46a52d63), |
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index a46b7fd6c0f5..e33b190d716f 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -1738,7 +1738,7 @@ do_stop(struct net_device *dev) | |||
1738 | return 0; | 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 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0089, 0x110a), | 1742 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0089, 0x110a), |
1743 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0138, 0x110a), | 1743 | PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0138, 0x110a), |
1744 | PCMCIA_PFC_DEVICE_PROD_ID13(0, "Xircom", "CEM28", 0x2e3ee845, 0x0ea978ea), | 1744 | PCMCIA_PFC_DEVICE_PROD_ID13(0, "Xircom", "CEM28", 0x2e3ee845, 0x0ea978ea), |