Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b166cfba authored by Andrew Morton's avatar Andrew Morton Committed by Jeff Garzik
Browse files

pcnet32: fix warning 



pci_name() will be changed to return `const char *':

drivers/net/pcnet32.c: In function 'pcnet32_probe1':
drivers/net/pcnet32.c:1884: warning: passing argument 2 of 'pcnet32_alloc_ring' discards qualifiers from pointer target type

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 5bceeda3

drivers/net/pcnet32.c

+2 −2
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static int pcnet32_get_regs_len(struct net_device *dev); 
static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,

			     void *ptr);

static void pcnet32_purge_tx_ring(struct net_device *dev);

static int pcnet32_alloc_ring(struct net_device *dev, char *name);

static int pcnet32_alloc_ring(struct net_device *dev, const char *name);

static void pcnet32_free_ring(struct net_device *dev);

static void pcnet32_check_media(struct net_device *dev, int verbose);
@@ -1983,7 +1983,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) 
}



/* if any allocation fails, caller must also call pcnet32_free_ring */

static int pcnet32_alloc_ring(struct net_device *dev, char *name)

static int pcnet32_alloc_ring(struct net_device *dev, const char *name)

{

	struct pcnet32_private *lp = netdev_priv(dev);