diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-12-28 21:11:15 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-29 00:46:38 -0500 |
| commit | 4ffa8fcd1732b5bb8cf961aa0e678953e637303d (patch) | |
| tree | d0c3ba09120d7428d8c344a5216342286630bb0e /drivers | |
| parent | a8ab77a83a6e5641182ad0fbf7906671cb4228b7 (diff) | |
net/7990: Make lance_private.name const
This allows to drop a few casts.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/amd/7990.h | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/hplance.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/mvme147.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/amd/7990.h b/drivers/net/ethernet/amd/7990.h index 6cf566c3d249..e9e0be313804 100644 --- a/drivers/net/ethernet/amd/7990.h +++ b/drivers/net/ethernet/amd/7990.h @@ -98,7 +98,7 @@ struct lance_init_block { * drivers to add things... */ struct lance_private { - char *name; + const char *name; unsigned long base; volatile struct lance_init_block *init_block; /* CPU address of RAM */ volatile struct lance_init_block *lance_init_block; /* LANCE address of RAM */ diff --git a/drivers/net/ethernet/amd/hplance.c b/drivers/net/ethernet/amd/hplance.c index 88a81a18374d..47ce57c2c893 100644 --- a/drivers/net/ethernet/amd/hplance.c +++ b/drivers/net/ethernet/amd/hplance.c @@ -149,7 +149,7 @@ static void hplance_init(struct net_device *dev, struct dio_dev *d) } lp = netdev_priv(dev); - lp->lance.name = (char *)d->name; /* discards const, shut up gcc */ + lp->lance.name = d->name; lp->lance.base = va; lp->lance.init_block = (struct lance_init_block *)(va + HPLANCE_MEMOFF); /* CPU addr */ lp->lance.lance_init_block = NULL; /* LANCE addr of same RAM */ diff --git a/drivers/net/ethernet/amd/mvme147.c b/drivers/net/ethernet/amd/mvme147.c index 15a5e366af29..0e8399dec054 100644 --- a/drivers/net/ethernet/amd/mvme147.c +++ b/drivers/net/ethernet/amd/mvme147.c @@ -118,7 +118,7 @@ struct net_device * __init mvme147lance_probe(int unit) return ERR_PTR(-ENOMEM); } - lp->lance.name = (char *)name; /* discards const, shut up gcc */ + lp->lance.name = name; lp->lance.base = dev->base_addr; lp->lance.init_block = (struct lance_init_block *)(lp->ram); /* CPU addr */ lp->lance.lance_init_block = (struct lance_init_block *)(lp->ram); /* LANCE addr of same RAM */ |