diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2018-02-18 21:39:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-21 14:14:04 -0500 |
| commit | 646fe03b0d5fb678f0901e25eb184ae8860744fa (patch) | |
| tree | 18f8bb2053912c4743b226d55672c9568704ebdf /drivers/net/ethernet/8390/mac8390.c | |
| parent | 73219de29486637c82925e963380bda020e4edfb (diff) | |
net/8390: Fix msg_enable patch snafu
The lib8390 module parameter 'msg_enable' doesn't do anything useful:
it causes an ancient version string to be logged.
Remove redundant code that logs the same string.
In ne.c and wd.c, the value of ei_local->msg_enable is used before
being assigned. Use ne_msg_enable and wd_msg_enable, respectively.
Most of the other 8390 drivers never assign ei_local->msg_enable.
Use the 'msg_enable' module parameter from lib8390 as the default
value.
Eliminate the pointless static and local variables.
Clean up an indentation mistake.
All of these issues originated from the same patch.
Cc: Russell King <linux@armlinux.org.uk>
Fixes: c45f812f0280 ("8390 : Replace ei_debug with msg_enable/NETIF_MSG_* feature")
Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/8390/mac8390.c')
| -rw-r--r-- | drivers/net/ethernet/8390/mac8390.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c index 2f91ce8dc614..abe50338b9f7 100644 --- a/drivers/net/ethernet/8390/mac8390.c +++ b/drivers/net/ethernet/8390/mac8390.c @@ -168,7 +168,6 @@ static void slow_sane_block_output(struct net_device *dev, int count, const unsigned char *buf, int start_page); static void word_memcpy_tocard(unsigned long tp, const void *fp, int count); static void word_memcpy_fromcard(void *tp, unsigned long fp, int count); -static u32 mac8390_msg_enable; static enum mac8390_type __init mac8390_ident(struct nubus_rsrc *fres) { @@ -299,8 +298,6 @@ static bool __init mac8390_init(struct net_device *dev, int offset; volatile unsigned short *i; - printk_once(KERN_INFO pr_fmt("%s"), version); - dev->irq = SLOT2IRQ(ndev->board->slot); /* This is getting to be a habit */ dev->base_addr = (ndev->board->slot_addr | @@ -398,8 +395,6 @@ struct net_device * __init mac8390_probe(int unit) struct net_device *dev; struct nubus_rsrc *ndev = NULL; int err = -ENODEV; - struct ei_device *ei_local; - static unsigned int slots; enum mac8390_type cardtype; @@ -441,9 +436,6 @@ struct net_device * __init mac8390_probe(int unit) if (!ndev) goto out; - ei_local = netdev_priv(dev); - ei_local->msg_enable = mac8390_msg_enable; - err = register_netdev(dev); if (err) goto out; |