提交 dcfc5d78 编写于 作者: S stephen hemminger 提交者: David S. Miller

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: NStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 adea1ac7
...@@ -73,7 +73,7 @@ static int reset_cyc2x(void __iomem *addr); ...@@ -73,7 +73,7 @@ static int reset_cyc2x(void __iomem *addr);
static int detect_cyc2x(void __iomem *addr); static int detect_cyc2x(void __iomem *addr);
/* Miscellaneous functions */ /* Miscellaneous functions */
static int get_option_index(long *optlist, long optval); static int get_option_index(const long *optlist, long optval);
static u16 checksum(u8 *buf, u32 len); static u16 checksum(u8 *buf, u32 len);
#define wait_cyc(addr) cycx_exec(addr + CMD_OFFSET) #define wait_cyc(addr) cycx_exec(addr + CMD_OFFSET)
...@@ -81,23 +81,23 @@ static u16 checksum(u8 *buf, u32 len); ...@@ -81,23 +81,23 @@ static u16 checksum(u8 *buf, u32 len);
/* Global Data */ /* Global Data */
/* private data */ /* private data */
static char modname[] = "cycx_drv"; static const char modname[] = "cycx_drv";
static char fullname[] = "Cyclom 2X Support Module"; static const char fullname[] = "Cyclom 2X Support Module";
static char copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo " static const char copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo "
"<acme@conectiva.com.br>"; "<acme@conectiva.com.br>";
/* Hardware configuration options. /* Hardware configuration options.
* These are arrays of configuration options used by verification routines. * These are arrays of configuration options used by verification routines.
* The first element of each array is its size (i.e. number of options). * The first element of each array is its size (i.e. number of options).
*/ */
static long cyc2x_dpmbase_options[] = { static const long cyc2x_dpmbase_options[] = {
20, 20,
0xA0000, 0xA4000, 0xA8000, 0xAC000, 0xB0000, 0xB4000, 0xB8000, 0xA0000, 0xA4000, 0xA8000, 0xAC000, 0xB0000, 0xB4000, 0xB8000,
0xBC000, 0xC0000, 0xC4000, 0xC8000, 0xCC000, 0xD0000, 0xD4000, 0xBC000, 0xC0000, 0xC4000, 0xC8000, 0xCC000, 0xD0000, 0xD4000,
0xD8000, 0xDC000, 0xE0000, 0xE4000, 0xE8000, 0xEC000 0xD8000, 0xDC000, 0xE0000, 0xE4000, 0xE8000, 0xEC000
}; };
static long cycx_2x_irq_options[] = { 7, 3, 5, 9, 10, 11, 12, 15 }; static const long cycx_2x_irq_options[] = { 7, 3, 5, 9, 10, 11, 12, 15 };
/* Kernel Loadable Module Entry Points */ /* Kernel Loadable Module Entry Points */
/* Module 'insert' entry point. /* Module 'insert' entry point.
...@@ -529,7 +529,7 @@ static int detect_cyc2x(void __iomem *addr) ...@@ -529,7 +529,7 @@ static int detect_cyc2x(void __iomem *addr)
/* Miscellaneous */ /* Miscellaneous */
/* Get option's index into the options list. /* Get option's index into the options list.
* Return option's index (1 .. N) or zero if option is invalid. */ * Return option's index (1 .. N) or zero if option is invalid. */
static int get_option_index(long *optlist, long optval) static int get_option_index(const long *optlist, long optval)
{ {
int i = 1; int i = 1;
......
...@@ -81,9 +81,9 @@ static irqreturn_t cycx_isr(int irq, void *dev_id); ...@@ -81,9 +81,9 @@ static irqreturn_t cycx_isr(int irq, void *dev_id);
*/ */
/* private data */ /* private data */
static char cycx_drvname[] = "cyclomx"; static const char cycx_drvname[] = "cyclomx";
static char cycx_fullname[] = "CYCLOM 2X(tm) Sync Card Driver"; static const char cycx_fullname[] = "CYCLOM 2X(tm) Sync Card Driver";
static char cycx_copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo " static const char cycx_copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo "
"<acme@conectiva.com.br>"; "<acme@conectiva.com.br>";
static int cycx_ncards = CONFIG_CYCX_CARDS; static int cycx_ncards = CONFIG_CYCX_CARDS;
static struct cycx_device *cycx_card_array; /* adapter data space */ static struct cycx_device *cycx_card_array; /* adapter data space */
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <net/x25device.h> #include <net/x25device.h>
static char bcast_addr[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; static const u8 bcast_addr[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
/* If this number is made larger, check that the temporary string buffer /* If this number is made larger, check that the temporary string buffer
* in lapbeth_new_device is large enough to store the probe device name.*/ * in lapbeth_new_device is large enough to store the probe device name.*/
......
#define USE_PCI_CLOCK #define USE_PCI_CLOCK
static char rcsid[] = static const char rcsid[] =
"Revision: 3.4.5 Date: 2002/03/07 "; "Revision: 3.4.5 Date: 2002/03/07 ";
/* /*
......
...@@ -766,7 +766,7 @@ irqreturn_t z8530_interrupt(int irq, void *dev_id) ...@@ -766,7 +766,7 @@ irqreturn_t z8530_interrupt(int irq, void *dev_id)
EXPORT_SYMBOL(z8530_interrupt); EXPORT_SYMBOL(z8530_interrupt);
static char reg_init[16]= static const u8 reg_init[16]=
{ {
0,0,0,0, 0,0,0,0,
0,0,0,0, 0,0,0,0,
...@@ -1206,7 +1206,7 @@ EXPORT_SYMBOL(z8530_sync_txdma_close); ...@@ -1206,7 +1206,7 @@ EXPORT_SYMBOL(z8530_sync_txdma_close);
* it exists... * it exists...
*/ */
static char *z8530_type_name[]={ static const char *z8530_type_name[]={
"Z8530", "Z8530",
"Z85C30", "Z85C30",
"Z85230" "Z85230"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册