netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 00/15] Fix warnings about non-const strings
@ 2009-02-26 20:19 Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 01/15] tulip: get rid of warning for non-const string literal Stephen Hemminger
                   ` (15 more replies)
  0 siblings, 16 replies; 17+ messages in thread
From: Stephen Hemminger @ 2009-02-26 20:19 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

Some of these maybe duplicates of other peoples patches.

-- 


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 01/15] tulip: get rid of warning for non-const string literal
  2009-02-26 20:19 [PATCH 00/15] Fix warnings about non-const strings Stephen Hemminger
@ 2009-02-26 20:19 ` Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 02/15] lapb: get rid of non-const printk warning Stephen Hemminger
                   ` (14 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Stephen Hemminger @ 2009-02-26 20:19 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

[-- Attachment #1: dmfe-string.patch --]
[-- Type: text/plain, Size: 2262 bytes --]

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

--- a/drivers/net/tulip/dmfe.c	2009-02-26 09:35:40.000000000 -0800
+++ b/drivers/net/tulip/dmfe.c	2009-02-26 09:36:21.000000000 -0800
@@ -288,7 +288,7 @@ enum dmfe_CR6_bits {
 
 /* Global variable declaration ----------------------------- */
 static int __devinitdata printed_version;
-static char version[] __devinitdata =
+static const char version[] __devinitconst =
 	KERN_INFO DRV_NAME ": Davicom DM9xxx net driver, version "
 	DRV_VERSION " (" DRV_RELDATE ")\n";
 
--- a/drivers/net/tulip/winbond-840.c	2009-02-26 09:37:40.000000000 -0800
+++ b/drivers/net/tulip/winbond-840.c	2009-02-26 09:39:38.000000000 -0800
@@ -139,9 +139,10 @@ static int full_duplex[MAX_UNITS] = {-1,
 #define PKT_BUF_SZ		1536	/* Size of each temporary Rx buffer.*/
 
 /* These identify the driver base version and may not be removed. */
-static const char version[] __initdata =
-KERN_INFO DRV_NAME ".c:v" DRV_VERSION " (2.4 port) " DRV_RELDATE "  Donald Becker <becker@scyld.com>\n"
-KERN_INFO "  http://www.scyld.com/network/drivers.html\n";
+static const char version[] __initconst =
+	KERN_INFO DRV_NAME ".c:v" DRV_VERSION " (2.4 port) "
+	DRV_RELDATE "  Donald Becker <becker@scyld.com>\n"
+	KERN_INFO "  http://www.scyld.com/network/drivers.html\n";
 
 MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
 MODULE_DESCRIPTION("Winbond W89c840 Ethernet driver");
--- a/drivers/net/tulip/de4x5.c	2009-02-26 09:40:54.000000000 -0800
+++ b/drivers/net/tulip/de4x5.c	2009-02-26 09:41:38.000000000 -0800
@@ -479,7 +479,7 @@
 
 #include "de4x5.h"
 
-static const char version[] __devinitdata =
+static const char version[] __devinitconst =
 	KERN_INFO "de4x5.c:V0.546 2001/02/22 davies@maniac.ultranet.com\n";
 
 #define c_char const char
--- a/drivers/net/tulip/uli526x.c	2009-02-26 09:41:52.000000000 -0800
+++ b/drivers/net/tulip/uli526x.c	2009-02-26 09:42:14.000000000 -0800
@@ -200,7 +200,7 @@ enum uli526x_CR6_bits {
 
 /* Global variable declaration ----------------------------- */
 static int __devinitdata printed_version;
-static char version[] __devinitdata =
+static const char version[] __devinitconst =
 	KERN_INFO DRV_NAME ": ULi M5261/M5263 net driver, version "
 	DRV_VERSION " (" DRV_RELDATE ")\n";
 

-- 


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 02/15] lapb: get rid of non-const printk warning
  2009-02-26 20:19 [PATCH 00/15] Fix warnings about non-const strings Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 01/15] tulip: get rid of warning for non-const string literal Stephen Hemminger
@ 2009-02-26 20:19 ` Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 03/15] 3c59x: get rid of non-const printk warnings Stephen Hemminger
                   ` (13 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Stephen Hemminger @ 2009-02-26 20:19 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

[-- Attachment #1: lapb-warn.patch --]
[-- Type: text/plain, Size: 493 bytes --]

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

--- a/drivers/net/wan/lapbether.c	2009-02-26 12:06:07.000000000 -0800
+++ b/drivers/net/wan/lapbether.c	2009-02-26 12:12:26.000000000 -0800
@@ -430,7 +430,7 @@ static struct notifier_block lapbeth_dev
 	.notifier_call = lapbeth_device_event,
 };
 
-static const char banner[] __initdata =
+static const char banner[] __initconst =
 	KERN_INFO "LAPB Ethernet driver version 0.02\n";
 
 static int __init lapbeth_init_driver(void)

-- 


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 03/15] 3c59x: get rid of non-const printk warnings
  2009-02-26 20:19 [PATCH 00/15] Fix warnings about non-const strings Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 01/15] tulip: get rid of warning for non-const string literal Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 02/15] lapb: get rid of non-const printk warning Stephen Hemminger
@ 2009-02-26 20:19 ` Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 04/15] ne2k-pci: fix non-constant " Stephen Hemminger
                   ` (12 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Stephen Hemminger @ 2009-02-26 20:19 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

[-- Attachment #1: 3c59x-warn.patch --]
[-- Type: text/plain, Size: 889 bytes --]

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

--- a/drivers/net/3c59x.c	2009-02-26 12:06:07.000000000 -0800
+++ b/drivers/net/3c59x.c	2009-02-26 12:12:27.000000000 -0800
@@ -102,8 +102,8 @@ static int vortex_debug = 1;
 #include <linux/delay.h>
 
 
-static char version[] __devinitdata =
-DRV_NAME ": Donald Becker and others.\n";
+static const char version[] __devinitconst =
+	DRV_NAME ": Donald Becker and others.\n";
 
 MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
 MODULE_DESCRIPTION("3Com 3c59x/3c9xx ethernet driver ");
@@ -2908,7 +2908,7 @@ static void vortex_get_drvinfo(struct ne
 		strcpy(info->bus_info, pci_name(VORTEX_PCI(vp)));
 	} else {
 		if (VORTEX_EISA(vp))
-			sprintf(info->bus_info, dev_name(vp->gendev));
+			strcpy(info->bus_info, dev_name(vp->gendev));
 		else
 			sprintf(info->bus_info, "EISA 0x%lx %d",
 					dev->base_addr, dev->irq);

-- 


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 04/15] ne2k-pci: fix non-constant printk warnings
  2009-02-26 20:19 [PATCH 00/15] Fix warnings about non-const strings Stephen Hemminger
                   ` (2 preceding siblings ...)
  2009-02-26 20:19 ` [PATCH 03/15] 3c59x: get rid of non-const printk warnings Stephen Hemminger
@ 2009-02-26 20:19 ` Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 05/15] sis900: " Stephen Hemminger
                   ` (11 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Stephen Hemminger @ 2009-02-26 20:19 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

[-- Attachment #1: ne2k-warn.patch --]
[-- Type: text/plain, Size: 664 bytes --]

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

--- a/drivers/net/ne2k-pci.c	2009-02-26 09:46:41.000000000 -0800
+++ b/drivers/net/ne2k-pci.c	2009-02-26 09:47:11.000000000 -0800
@@ -62,8 +62,9 @@ static int options[MAX_UNITS];
 #include "8390.h"
 
 /* These identify the driver base version and may not be removed. */
-static char version[] __devinitdata =
-KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " D. Becker/P. Gortmaker\n";
+static const char version[] __devinitconst =
+	KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE
+	" D. Becker/P. Gortmaker\n";
 
 #if defined(__powerpc__)
 #define inl_le(addr)  le32_to_cpu(inl(addr))

-- 


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 05/15] sis900: fix non-constant printk warnings
  2009-02-26 20:19 [PATCH 00/15] Fix warnings about non-const strings Stephen Hemminger
                   ` (3 preceding siblings ...)
  2009-02-26 20:19 ` [PATCH 04/15] ne2k-pci: fix non-constant " Stephen Hemminger
@ 2009-02-26 20:19 ` Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 06/15] yellowfin: " Stephen Hemminger
                   ` (10 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Stephen Hemminger @ 2009-02-26 20:19 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

[-- Attachment #1: sis190-warn.patch --]
[-- Type: text/plain, Size: 562 bytes --]

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/sis900.c	2009-02-26 12:06:05.000000000 -0800
+++ b/drivers/net/sis900.c	2009-02-26 12:13:03.000000000 -0800
@@ -80,8 +80,8 @@
 #define SIS900_MODULE_NAME "sis900"
 #define SIS900_DRV_VERSION "v1.08.10 Apr. 2 2006"
 
-static char version[] __devinitdata =
-KERN_INFO "sis900.c: " SIS900_DRV_VERSION "\n";
+static const char version[] __devinitconst =
+	KERN_INFO "sis900.c: " SIS900_DRV_VERSION "\n";
 
 static int max_interrupt_work = 40;
 static int multicast_filter_limit = 128;

-- 


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 06/15] yellowfin: fix non-constant printk warnings
  2009-02-26 20:19 [PATCH 00/15] Fix warnings about non-const strings Stephen Hemminger
                   ` (4 preceding siblings ...)
  2009-02-26 20:19 ` [PATCH 05/15] sis900: " Stephen Hemminger
@ 2009-02-26 20:19 ` Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 07/15] acenic: " Stephen Hemminger
                   ` (9 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Stephen Hemminger @ 2009-02-26 20:19 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

[-- Attachment #1: yellowfin-warn.patch --]
[-- Type: text/plain, Size: 879 bytes --]

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/yellowfin.c	2009-02-26 09:49:41.000000000 -0800
+++ b/drivers/net/yellowfin.c	2009-02-26 09:50:24.000000000 -0800
@@ -107,9 +107,9 @@ static int gx_fix;
 #include <asm/io.h>
 
 /* These identify the driver base version and may not be removed. */
-static char version[] __devinitdata =
-KERN_INFO DRV_NAME ".c:v1.05  1/09/2001  Written by Donald Becker <becker@scyld.com>\n"
-KERN_INFO "  (unofficial 2.4.x port, " DRV_VERSION ", " DRV_RELDATE ")\n";
+static const char version[] __devinitconst =
+  KERN_INFO DRV_NAME ".c:v1.05  1/09/2001  Written by Donald Becker <becker@scyld.com>\n"
+  KERN_INFO "  (unofficial 2.4.x port, " DRV_VERSION ", " DRV_RELDATE ")\n";
 
 MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
 MODULE_DESCRIPTION("Packet Engines Yellowfin G-NIC Gigabit Ethernet driver");

-- 


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 07/15] acenic: fix non-constant printk warnings
  2009-02-26 20:19 [PATCH 00/15] Fix warnings about non-const strings Stephen Hemminger
                   ` (5 preceding siblings ...)
  2009-02-26 20:19 ` [PATCH 06/15] yellowfin: " Stephen Hemminger
@ 2009-02-26 20:19 ` Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 08/15] natsemi: " Stephen Hemminger
                   ` (8 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Stephen Hemminger @ 2009-02-26 20:19 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

[-- Attachment #1: acenic-warn.patch --]
[-- Type: text/plain, Size: 603 bytes --]

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/acenic.c	2009-02-26 09:50:53.000000000 -0800
+++ b/drivers/net/acenic.c	2009-02-26 09:51:09.000000000 -0800
@@ -437,7 +437,7 @@ MODULE_PARM_DESC(max_rx_desc, "AceNIC/3C
 MODULE_PARM_DESC(tx_ratio, "AceNIC/3C985/GA620 ratio of NIC memory used for TX/RX descriptors (range 0-63)");
 
 
-static char version[] __devinitdata =
+static const char version[] __devinitconst =
   "acenic.c: v0.92 08/05/2002  Jes Sorensen, linux-acenic@SunSITE.dk\n"
   "                            http://home.cern.ch/~jes/gige/acenic.html\n";
 

-- 


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 08/15] natsemi: fix non-constant printk warnings
  2009-02-26 20:19 [PATCH 00/15] Fix warnings about non-const strings Stephen Hemminger
                   ` (6 preceding siblings ...)
  2009-02-26 20:19 ` [PATCH 07/15] acenic: " Stephen Hemminger
@ 2009-02-26 20:19 ` Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 09/15] fealnx: " Stephen Hemminger
                   ` (7 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Stephen Hemminger @ 2009-02-26 20:19 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

[-- Attachment #1: natsemi-warn.patch --]
[-- Type: text/plain, Size: 627 bytes --]

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/natsemi.c	2009-02-26 09:51:52.000000000 -0800
+++ b/drivers/net/natsemi.c	2009-02-26 09:52:05.000000000 -0800
@@ -127,7 +127,7 @@ static int full_duplex[MAX_UNITS];
 #define NATSEMI_RX_LIMIT	2046	/* maximum supported by hardware */
 
 /* These identify the driver base version and may not be removed. */
-static char version[] __devinitdata =
+static const char version[] __devinitconst =
   KERN_INFO DRV_NAME " dp8381x driver, version "
       DRV_VERSION ", " DRV_RELDATE "\n"
   KERN_INFO "  originally by Donald Becker <becker@scyld.com>\n"

-- 


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 09/15] fealnx: fix non-constant printk warnings
  2009-02-26 20:19 [PATCH 00/15] Fix warnings about non-const strings Stephen Hemminger
                   ` (7 preceding siblings ...)
  2009-02-26 20:19 ` [PATCH 08/15] natsemi: " Stephen Hemminger
@ 2009-02-26 20:19 ` Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 10/15] via-rhine: " Stephen Hemminger
                   ` (6 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Stephen Hemminger @ 2009-02-26 20:19 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

[-- Attachment #1: fealnx-warn.patch --]
[-- Type: text/plain, Size: 624 bytes --]

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/fealnx.c	2009-02-26 09:52:30.000000000 -0800
+++ b/drivers/net/fealnx.c	2009-02-26 09:53:42.000000000 -0800
@@ -93,8 +93,8 @@ static int full_duplex[MAX_UNITS] = { -1
 #include <asm/byteorder.h>
 
 /* These identify the driver base version and may not be removed. */
-static char version[] =
-KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE "\n";
+static const char version[] __devinitconst =
+	KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE "\n";
 
 
 /* This driver was written to use PCI memory space, however some x86 systems

-- 


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 10/15] via-rhine: fix non-constant printk warnings
  2009-02-26 20:19 [PATCH 00/15] Fix warnings about non-const strings Stephen Hemminger
                   ` (8 preceding siblings ...)
  2009-02-26 20:19 ` [PATCH 09/15] fealnx: " Stephen Hemminger
@ 2009-02-26 20:19 ` Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 11/15] starfire: " Stephen Hemminger
                   ` (5 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Stephen Hemminger @ 2009-02-26 20:19 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

[-- Attachment #1: via-rhine-warn.patch --]
[-- Type: text/plain, Size: 770 bytes --]

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/via-rhine.c	2009-02-26 09:54:22.000000000 -0800
+++ b/drivers/net/via-rhine.c	2009-02-26 09:54:48.000000000 -0800
@@ -109,8 +109,9 @@ static const int multicast_filter_limit 
 #include <linux/dmi.h>
 
 /* These identify the driver base version and may not be removed. */
-static char version[] __devinitdata =
-KERN_INFO DRV_NAME ".c:v1.10-LK" DRV_VERSION " " DRV_RELDATE " Written by Donald Becker\n";
+static const char version[] __devinitconst =
+	KERN_INFO DRV_NAME ".c:v1.10-LK" DRV_VERSION " " DRV_RELDATE
+	" Written by Donald Becker\n";
 
 /* This driver was written to use PCI memory space. Some early versions
    of the Rhine may only work correctly with I/O space accesses. */

-- 


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 11/15] starfire: fix non-constant printk warnings
  2009-02-26 20:19 [PATCH 00/15] Fix warnings about non-const strings Stephen Hemminger
                   ` (9 preceding siblings ...)
  2009-02-26 20:19 ` [PATCH 10/15] via-rhine: " Stephen Hemminger
@ 2009-02-26 20:19 ` Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 12/15] sundance: " Stephen Hemminger
                   ` (4 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Stephen Hemminger @ 2009-02-26 20:19 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

[-- Attachment #1: starfire-warn.patch --]
[-- Type: text/plain, Size: 625 bytes --]

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/starfire.c	2009-02-26 09:55:51.000000000 -0800
+++ b/drivers/net/starfire.c	2009-02-26 09:56:33.000000000 -0800
@@ -178,7 +178,7 @@ static int full_duplex[MAX_UNITS] = {0, 
 #define FIRMWARE_TX	"adaptec/starfire_tx.bin"
 
 /* These identify the driver base version and may not be removed. */
-static char version[] =
+static const char version[] __devinitconst =
 KERN_INFO "starfire.c:v1.03 7/26/2000  Written by Donald Becker <becker@scyld.com>\n"
 KERN_INFO " (unofficial 2.2/2.4 kernel port, version " DRV_VERSION ", " DRV_RELDATE ")\n";
 

-- 


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 12/15] sundance: fix non-constant printk warnings
  2009-02-26 20:19 [PATCH 00/15] Fix warnings about non-const strings Stephen Hemminger
                   ` (10 preceding siblings ...)
  2009-02-26 20:19 ` [PATCH 11/15] starfire: " Stephen Hemminger
@ 2009-02-26 20:19 ` Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 13/15] hamachi: " Stephen Hemminger
                   ` (3 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Stephen Hemminger @ 2009-02-26 20:19 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

[-- Attachment #1: sundance-warn.patch --]
[-- Type: text/plain, Size: 679 bytes --]

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/sundance.c	2009-02-26 09:56:36.000000000 -0800
+++ b/drivers/net/sundance.c	2009-02-26 09:57:08.000000000 -0800
@@ -109,8 +109,9 @@ static char *media[MAX_UNITS];
 #endif
 
 /* These identify the driver base version and may not be removed. */
-static char version[] =
-KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE "  Written by Donald Becker\n";
+static const char version[] __devinitconst =
+	KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE
+	" Written by Donald Becker\n";
 
 MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
 MODULE_DESCRIPTION("Sundance Alta Ethernet driver");

-- 


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 13/15] hamachi: fix non-constant printk warnings
  2009-02-26 20:19 [PATCH 00/15] Fix warnings about non-const strings Stephen Hemminger
                   ` (11 preceding siblings ...)
  2009-02-26 20:19 ` [PATCH 12/15] sundance: " Stephen Hemminger
@ 2009-02-26 20:19 ` Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 14/15] forcedeth: " Stephen Hemminger
                   ` (2 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Stephen Hemminger @ 2009-02-26 20:19 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

[-- Attachment #1: hamachi-warn.patch --]
[-- Type: text/plain, Size: 637 bytes --]

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/hamachi.c	2009-02-26 09:57:31.000000000 -0800
+++ b/drivers/net/hamachi.c	2009-02-26 09:57:46.000000000 -0800
@@ -171,7 +171,7 @@ static int tx_params[MAX_UNITS] = {-1, -
 #include <asm/unaligned.h>
 #include <asm/cache.h>
 
-static char version[] __devinitdata =
+static const char version[] __devinitconst =
 KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE "  Written by Donald Becker\n"
 KERN_INFO "   Some modifications by Eric kasten <kasten@nscl.msu.edu>\n"
 KERN_INFO "   Further modifications by Keith Underwood <keithu@parl.clemson.edu>\n";

-- 


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 14/15] forcedeth: fix non-constant printk warnings
  2009-02-26 20:19 [PATCH 00/15] Fix warnings about non-const strings Stephen Hemminger
                   ` (12 preceding siblings ...)
  2009-02-26 20:19 ` [PATCH 13/15] hamachi: " Stephen Hemminger
@ 2009-02-26 20:19 ` Stephen Hemminger
  2009-02-26 20:19 ` [PATCH 15/15] mdio: " Stephen Hemminger
  2009-02-27  6:23 ` [PATCH 00/15] Fix warnings about non-const strings David Miller
  15 siblings, 0 replies; 17+ messages in thread
From: Stephen Hemminger @ 2009-02-26 20:19 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

[-- Attachment #1: forcedeth-warn.patch --]
[-- Type: text/plain, Size: 428 bytes --]

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/forcedeth.c	2009-02-26 09:57:47.000000000 -0800
+++ b/drivers/net/forcedeth.c	2009-02-26 09:59:00.000000000 -0800
@@ -940,7 +940,7 @@ static int reg_delay(struct net_device *
 		delaymax -= delay;
 		if (delaymax < 0) {
 			if (msg)
-				printk(msg);
+				printk("%s", msg);
 			return 1;
 		}
 	} while ((readl(base + offset) & mask) != target);

-- 


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 15/15] mdio: fix non-constant printk warnings
  2009-02-26 20:19 [PATCH 00/15] Fix warnings about non-const strings Stephen Hemminger
                   ` (13 preceding siblings ...)
  2009-02-26 20:19 ` [PATCH 14/15] forcedeth: " Stephen Hemminger
@ 2009-02-26 20:19 ` Stephen Hemminger
  2009-02-27  6:23 ` [PATCH 00/15] Fix warnings about non-const strings David Miller
  15 siblings, 0 replies; 17+ messages in thread
From: Stephen Hemminger @ 2009-02-26 20:19 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

[-- Attachment #1: mdio-warn.patch --]
[-- Type: text/plain, Size: 484 bytes --]

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/phy/mdio_bus.c	2009-02-26 12:03:59.000000000 -0800
+++ b/drivers/net/phy/mdio_bus.c	2009-02-26 12:04:14.000000000 -0800
@@ -99,7 +99,7 @@ int mdiobus_register(struct mii_bus *bus
 	bus->dev.parent = bus->parent;
 	bus->dev.class = &mdio_bus_class;
 	bus->dev.groups = NULL;
-	dev_set_name(&bus->dev, bus->id);
+	dev_set_name(&bus->dev, "%s", bus->id);
 
 	err = device_register(&bus->dev);
 	if (err) {

-- 


^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 00/15] Fix warnings about non-const strings
  2009-02-26 20:19 [PATCH 00/15] Fix warnings about non-const strings Stephen Hemminger
                   ` (14 preceding siblings ...)
  2009-02-26 20:19 ` [PATCH 15/15] mdio: " Stephen Hemminger
@ 2009-02-27  6:23 ` David Miller
  15 siblings, 0 replies; 17+ messages in thread
From: David Miller @ 2009-02-27  6:23 UTC (permalink / raw)
  To: shemminger; +Cc: netdev

From: Stephen Hemminger <shemminger@vyatta.com>
Date: Thu, 26 Feb 2009 12:19:21 -0800

> Some of these maybe duplicates of other peoples patches.

All applied to net-next-2.6, thanks Stephen.

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2009-02-27  6:23 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-26 20:19 [PATCH 00/15] Fix warnings about non-const strings Stephen Hemminger
2009-02-26 20:19 ` [PATCH 01/15] tulip: get rid of warning for non-const string literal Stephen Hemminger
2009-02-26 20:19 ` [PATCH 02/15] lapb: get rid of non-const printk warning Stephen Hemminger
2009-02-26 20:19 ` [PATCH 03/15] 3c59x: get rid of non-const printk warnings Stephen Hemminger
2009-02-26 20:19 ` [PATCH 04/15] ne2k-pci: fix non-constant " Stephen Hemminger
2009-02-26 20:19 ` [PATCH 05/15] sis900: " Stephen Hemminger
2009-02-26 20:19 ` [PATCH 06/15] yellowfin: " Stephen Hemminger
2009-02-26 20:19 ` [PATCH 07/15] acenic: " Stephen Hemminger
2009-02-26 20:19 ` [PATCH 08/15] natsemi: " Stephen Hemminger
2009-02-26 20:19 ` [PATCH 09/15] fealnx: " Stephen Hemminger
2009-02-26 20:19 ` [PATCH 10/15] via-rhine: " Stephen Hemminger
2009-02-26 20:19 ` [PATCH 11/15] starfire: " Stephen Hemminger
2009-02-26 20:19 ` [PATCH 12/15] sundance: " Stephen Hemminger
2009-02-26 20:19 ` [PATCH 13/15] hamachi: " Stephen Hemminger
2009-02-26 20:19 ` [PATCH 14/15] forcedeth: " Stephen Hemminger
2009-02-26 20:19 ` [PATCH 15/15] mdio: " Stephen Hemminger
2009-02-27  6:23 ` [PATCH 00/15] Fix warnings about non-const strings David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).