diff options
author | stephen hemminger <shemminger@vyatta.com> | 2010-09-02 10:29:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-06 16:32:20 -0400 |
commit | dcfc5d787a24b9a20be3e18e3dbbab5280d35e38 (patch) | |
tree | da976087c2112809566f4b9e5736e0ed354554a5 /drivers/net/wan | |
parent | adea1ac7effbddbe60a9de6d63462bfe79289e59 (diff) |
wan: make read-only data const
Change several wan drivers to make strings and other initialize
only parameters const.
Compile tested only (with no new warnings)
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan')
-rw-r--r-- | drivers/net/wan/cycx_drv.c | 14 | ||||
-rw-r--r-- | drivers/net/wan/cycx_main.c | 6 | ||||
-rw-r--r-- | drivers/net/wan/lapbether.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/pc300_drv.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/z85230.c | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/wan/cycx_drv.c b/drivers/net/wan/cycx_drv.c index a5ddc6c8963e..164c3624ba89 100644 --- a/drivers/net/wan/cycx_drv.c +++ b/drivers/net/wan/cycx_drv.c | |||
@@ -73,7 +73,7 @@ static int reset_cyc2x(void __iomem *addr); | |||
73 | static int detect_cyc2x(void __iomem *addr); | 73 | static int detect_cyc2x(void __iomem *addr); |
74 | 74 | ||
75 | /* Miscellaneous functions */ | 75 | /* Miscellaneous functions */ |
76 | static int get_option_index(long *optlist, long optval); | 76 | static int get_option_index(const long *optlist, long optval); |
77 | static u16 checksum(u8 *buf, u32 len); | 77 | static u16 checksum(u8 *buf, u32 len); |
78 | 78 | ||
79 | #define wait_cyc(addr) cycx_exec(addr + CMD_OFFSET) | 79 | #define wait_cyc(addr) cycx_exec(addr + CMD_OFFSET) |
@@ -81,23 +81,23 @@ static u16 checksum(u8 *buf, u32 len); | |||
81 | /* Global Data */ | 81 | /* Global Data */ |
82 | 82 | ||
83 | /* private data */ | 83 | /* private data */ |
84 | static char modname[] = "cycx_drv"; | 84 | static const char modname[] = "cycx_drv"; |
85 | static char fullname[] = "Cyclom 2X Support Module"; | 85 | static const char fullname[] = "Cyclom 2X Support Module"; |
86 | static char copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo " | 86 | static const char copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo " |
87 | "<acme@conectiva.com.br>"; | 87 | "<acme@conectiva.com.br>"; |
88 | 88 | ||
89 | /* Hardware configuration options. | 89 | /* Hardware configuration options. |
90 | * These are arrays of configuration options used by verification routines. | 90 | * These are arrays of configuration options used by verification routines. |
91 | * The first element of each array is its size (i.e. number of options). | 91 | * The first element of each array is its size (i.e. number of options). |
92 | */ | 92 | */ |
93 | static long cyc2x_dpmbase_options[] = { | 93 | static const long cyc2x_dpmbase_options[] = { |
94 | 20, | 94 | 20, |
95 | 0xA0000, 0xA4000, 0xA8000, 0xAC000, 0xB0000, 0xB4000, 0xB8000, | 95 | 0xA0000, 0xA4000, 0xA8000, 0xAC000, 0xB0000, 0xB4000, 0xB8000, |
96 | 0xBC000, 0xC0000, 0xC4000, 0xC8000, 0xCC000, 0xD0000, 0xD4000, | 96 | 0xBC000, 0xC0000, 0xC4000, 0xC8000, 0xCC000, 0xD0000, 0xD4000, |
97 | 0xD8000, 0xDC000, 0xE0000, 0xE4000, 0xE8000, 0xEC000 | 97 | 0xD8000, 0xDC000, 0xE0000, 0xE4000, 0xE8000, 0xEC000 |
98 | }; | 98 | }; |
99 | 99 | ||
100 | static long cycx_2x_irq_options[] = { 7, 3, 5, 9, 10, 11, 12, 15 }; | 100 | static const long cycx_2x_irq_options[] = { 7, 3, 5, 9, 10, 11, 12, 15 }; |
101 | 101 | ||
102 | /* Kernel Loadable Module Entry Points */ | 102 | /* Kernel Loadable Module Entry Points */ |
103 | /* Module 'insert' entry point. | 103 | /* Module 'insert' entry point. |
@@ -529,7 +529,7 @@ static int detect_cyc2x(void __iomem *addr) | |||
529 | /* Miscellaneous */ | 529 | /* Miscellaneous */ |
530 | /* Get option's index into the options list. | 530 | /* Get option's index into the options list. |
531 | * Return option's index (1 .. N) or zero if option is invalid. */ | 531 | * Return option's index (1 .. N) or zero if option is invalid. */ |
532 | static int get_option_index(long *optlist, long optval) | 532 | static int get_option_index(const long *optlist, long optval) |
533 | { | 533 | { |
534 | int i = 1; | 534 | int i = 1; |
535 | 535 | ||
diff --git a/drivers/net/wan/cycx_main.c b/drivers/net/wan/cycx_main.c index a0e8611ad8e8..859dba9b972e 100644 --- a/drivers/net/wan/cycx_main.c +++ b/drivers/net/wan/cycx_main.c | |||
@@ -81,9 +81,9 @@ static irqreturn_t cycx_isr(int irq, void *dev_id); | |||
81 | */ | 81 | */ |
82 | 82 | ||
83 | /* private data */ | 83 | /* private data */ |
84 | static char cycx_drvname[] = "cyclomx"; | 84 | static const char cycx_drvname[] = "cyclomx"; |
85 | static char cycx_fullname[] = "CYCLOM 2X(tm) Sync Card Driver"; | 85 | static const char cycx_fullname[] = "CYCLOM 2X(tm) Sync Card Driver"; |
86 | static char cycx_copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo " | 86 | static const char cycx_copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo " |
87 | "<acme@conectiva.com.br>"; | 87 | "<acme@conectiva.com.br>"; |
88 | static int cycx_ncards = CONFIG_CYCX_CARDS; | 88 | static int cycx_ncards = CONFIG_CYCX_CARDS; |
89 | static struct cycx_device *cycx_card_array; /* adapter data space */ | 89 | static struct cycx_device *cycx_card_array; /* adapter data space */ |
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c index 4d4dc38c7290..7f5bb913c8b9 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c | |||
@@ -46,7 +46,7 @@ | |||
46 | 46 | ||
47 | #include <net/x25device.h> | 47 | #include <net/x25device.h> |
48 | 48 | ||
49 | static char bcast_addr[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; | 49 | static const u8 bcast_addr[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; |
50 | 50 | ||
51 | /* If this number is made larger, check that the temporary string buffer | 51 | /* If this number is made larger, check that the temporary string buffer |
52 | * in lapbeth_new_device is large enough to store the probe device name.*/ | 52 | * in lapbeth_new_device is large enough to store the probe device name.*/ |
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index c6aa66e5b52f..fbf1175a07f1 100644 --- a/drivers/net/wan/pc300_drv.c +++ b/drivers/net/wan/pc300_drv.c | |||
@@ -1,5 +1,5 @@ | |||
1 | #define USE_PCI_CLOCK | 1 | #define USE_PCI_CLOCK |
2 | static char rcsid[] = | 2 | static const char rcsid[] = |
3 | "Revision: 3.4.5 Date: 2002/03/07 "; | 3 | "Revision: 3.4.5 Date: 2002/03/07 "; |
4 | 4 | ||
5 | /* | 5 | /* |
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c index fbf5e843d48c..93956861ea21 100644 --- a/drivers/net/wan/z85230.c +++ b/drivers/net/wan/z85230.c | |||
@@ -766,7 +766,7 @@ irqreturn_t z8530_interrupt(int irq, void *dev_id) | |||
766 | 766 | ||
767 | EXPORT_SYMBOL(z8530_interrupt); | 767 | EXPORT_SYMBOL(z8530_interrupt); |
768 | 768 | ||
769 | static char reg_init[16]= | 769 | static const u8 reg_init[16]= |
770 | { | 770 | { |
771 | 0,0,0,0, | 771 | 0,0,0,0, |
772 | 0,0,0,0, | 772 | 0,0,0,0, |
@@ -1206,7 +1206,7 @@ EXPORT_SYMBOL(z8530_sync_txdma_close); | |||
1206 | * it exists... | 1206 | * it exists... |
1207 | */ | 1207 | */ |
1208 | 1208 | ||
1209 | static char *z8530_type_name[]={ | 1209 | static const char *z8530_type_name[]={ |
1210 | "Z8530", | 1210 | "Z8530", |
1211 | "Z85C30", | 1211 | "Z85C30", |
1212 | "Z85230" | 1212 | "Z85230" |