Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit dcfc5d787a24b9a20be3e18e3dbbab5280d35e38

Authored by stephen hemminger
Committed by David S. Miller
1 parent adea1ac7ef
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 5 changed files with 14 additions and 14 deletions Side-by-side Diff

drivers/net/wan/cycx_drv.c
Diff comments   View file @ dcfc5d7
... ... @@ -73,7 +73,7 @@
73 73 static int detect_cyc2x(void __iomem *addr);
74 74  
75 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 77 static u16 checksum(u8 *buf, u32 len);
78 78  
79 79 #define wait_cyc(addr) cycx_exec(addr + CMD_OFFSET)
80 80  
81 81  
... ... @@ -81,23 +81,23 @@
81 81 /* Global Data */
82 82  
83 83 /* private data */
84   -static char modname[] = "cycx_drv";
85   -static char fullname[] = "Cyclom 2X Support Module";
86   -static char copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo "
  84 +static const char modname[] = "cycx_drv";
  85 +static const char fullname[] = "Cyclom 2X Support Module";
  86 +static const char copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo "
87 87 "<acme@conectiva.com.br>";
88 88  
89 89 /* Hardware configuration options.
90 90 * These are arrays of configuration options used by verification routines.
91 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 94 20,
95 95 0xA0000, 0xA4000, 0xA8000, 0xAC000, 0xB0000, 0xB4000, 0xB8000,
96 96 0xBC000, 0xC0000, 0xC4000, 0xC8000, 0xCC000, 0xD0000, 0xD4000,
97 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 102 /* Kernel Loadable Module Entry Points */
103 103 /* Module 'insert' entry point.
... ... @@ -529,7 +529,7 @@
529 529 /* Miscellaneous */
530 530 /* Get option's index into the options list.
531 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 534 int i = 1;
535 535  
drivers/net/wan/cycx_main.c
Diff comments   View file @ dcfc5d7
... ... @@ -81,9 +81,9 @@
81 81 */
82 82  
83 83 /* private data */
84   -static char cycx_drvname[] = "cyclomx";
85   -static char cycx_fullname[] = "CYCLOM 2X(tm) Sync Card Driver";
86   -static char cycx_copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo "
  84 +static const char cycx_drvname[] = "cyclomx";
  85 +static const char cycx_fullname[] = "CYCLOM 2X(tm) Sync Card Driver";
  86 +static const char cycx_copyright[] = "(c) 1998-2003 Arnaldo Carvalho de Melo "
87 87 "<acme@conectiva.com.br>";
88 88 static int cycx_ncards = CONFIG_CYCX_CARDS;
89 89 static struct cycx_device *cycx_card_array; /* adapter data space */
drivers/net/wan/lapbether.c
Diff comments   View file @ dcfc5d7
... ... @@ -46,7 +46,7 @@
46 46  
47 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 51 /* If this number is made larger, check that the temporary string buffer
52 52 * in lapbeth_new_device is large enough to store the probe device name.*/
drivers/net/wan/pc300_drv.c
Diff comments   View file @ dcfc5d7
1 1 #define USE_PCI_CLOCK
2   -static char rcsid[] =
  2 +static const char rcsid[] =
3 3 "Revision: 3.4.5 Date: 2002/03/07 ";
4 4  
5 5 /*
drivers/net/wan/z85230.c
Diff comments   View file @ dcfc5d7
... ... @@ -766,7 +766,7 @@
766 766  
767 767 EXPORT_SYMBOL(z8530_interrupt);
768 768  
769   -static char reg_init[16]=
  769 +static const u8 reg_init[16]=
770 770 {
771 771 0,0,0,0,
772 772 0,0,0,0,
... ... @@ -1206,7 +1206,7 @@
1206 1206 * it exists...
1207 1207 */
1208 1208  
1209   -static char *z8530_type_name[]={
  1209 +static const char *z8530_type_name[]={
1210 1210 "Z8530",
1211 1211 "Z85C30",
1212 1212 "Z85230"