Explorar o código

3c59x: get rid of non-const printk warnings

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stephen Hemminger %!s(int64=16) %!d(string=hai) anos
pai
achega
86de79b6d0
Modificáronse 1 ficheiros con 3 adicións e 3 borrados
  1. 3 3
      drivers/net/3c59x.c

+ 3 - 3
drivers/net/3c59x.c

@@ -102,8 +102,8 @@ static int vortex_debug = 1;
 #include <linux/delay.h>
 #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_AUTHOR("Donald Becker <becker@scyld.com>");
 MODULE_DESCRIPTION("3Com 3c59x/3c9xx ethernet driver ");
 MODULE_DESCRIPTION("3Com 3c59x/3c9xx ethernet driver ");
@@ -2908,7 +2908,7 @@ static void vortex_get_drvinfo(struct net_device *dev,
 		strcpy(info->bus_info, pci_name(VORTEX_PCI(vp)));
 		strcpy(info->bus_info, pci_name(VORTEX_PCI(vp)));
 	} else {
 	} else {
 		if (VORTEX_EISA(vp))
 		if (VORTEX_EISA(vp))
-			sprintf(info->bus_info, dev_name(vp->gendev));
+			strcpy(info->bus_info, dev_name(vp->gendev));
 		else
 		else
 			sprintf(info->bus_info, "EISA 0x%lx %d",
 			sprintf(info->bus_info, "EISA 0x%lx %d",
 					dev->base_addr, dev->irq);
 					dev->base_addr, dev->irq);