aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia
diff options
context:
space:
mode:
authorAndy Gospodarek <andy@greyhouse.net>2006-09-11 17:39:18 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-12 11:45:19 -0400
commitd5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a (patch)
treea5fa98145b1d95b84357157856517de8d0e31edf /drivers/net/pcmcia
parent05ff0e291af086f4325bac76abad250690bbbd63 (diff)
[PATCH] Remove more unnecessary driver printk's
As I promised last week, here is the first pass at removing all unnecessary printk's that exist in network device drivers currently in promiscuous mode. The duplicate messages are not needed so they have been removed. Some of these drivers are quite old and might not need an update, but I did them all anyway. I am currently auditing the remaining conditional printk's and will send out a patch for those soon. Signed-off-by: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/pcmcia')
-rw-r--r--drivers/net/pcmcia/fmvj18x_cs.c4
-rw-r--r--drivers/net/pcmcia/smc91c92_cs.c5
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index ea93b8f18605..74211af0e0c9 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -29,7 +29,7 @@
29======================================================================*/ 29======================================================================*/
30 30
31#define DRV_NAME "fmvj18x_cs" 31#define DRV_NAME "fmvj18x_cs"
32#define DRV_VERSION "2.8" 32#define DRV_VERSION "2.9"
33 33
34#include <linux/module.h> 34#include <linux/module.h>
35#include <linux/kernel.h> 35#include <linux/kernel.h>
@@ -1193,8 +1193,6 @@ static void set_rx_mode(struct net_device *dev)
1193 outb(CONFIG0_RST_1, ioaddr + CONFIG_0); 1193 outb(CONFIG0_RST_1, ioaddr + CONFIG_0);
1194 1194
1195 if (dev->flags & IFF_PROMISC) { 1195 if (dev->flags & IFF_PROMISC) {
1196 /* Unconditionally log net taps. */
1197 printk("%s: Promiscuous mode enabled.\n", dev->name);
1198 memset(mc_filter, 0xff, sizeof(mc_filter)); 1196 memset(mc_filter, 0xff, sizeof(mc_filter));
1199 outb(3, ioaddr + RX_MODE); /* Enable promiscuous mode */ 1197 outb(3, ioaddr + RX_MODE); /* Enable promiscuous mode */
1200 } else if (dev->mc_count > MC_FILTERBREAK 1198 } else if (dev->mc_count > MC_FILTERBREAK
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index a73d54553030..3fb369f2e7ed 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -80,14 +80,14 @@ INT_MODULE_PARM(if_port, 0);
80#ifdef PCMCIA_DEBUG 80#ifdef PCMCIA_DEBUG
81INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG); 81INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG);
82static const char *version = 82static const char *version =
83"smc91c92_cs.c 0.09 1996/8/4 Donald Becker, becker@scyld.com.\n"; 83"smc91c92_cs.c 1.123 2006/11/09 Donald Becker, becker@scyld.com.\n";
84#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) 84#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
85#else 85#else
86#define DEBUG(n, args...) 86#define DEBUG(n, args...)
87#endif 87#endif
88 88
89#define DRV_NAME "smc91c92_cs" 89#define DRV_NAME "smc91c92_cs"
90#define DRV_VERSION "1.122" 90#define DRV_VERSION "1.123"
91 91
92/*====================================================================*/ 92/*====================================================================*/
93 93
@@ -1780,7 +1780,6 @@ static void set_rx_mode(struct net_device *dev)
1780 u_short rx_cfg_setting; 1780 u_short rx_cfg_setting;
1781 1781
1782 if (dev->flags & IFF_PROMISC) { 1782 if (dev->flags & IFF_PROMISC) {
1783 printk(KERN_NOTICE "%s: setting Rx mode to promiscuous.\n", dev->name);
1784 rx_cfg_setting = RxStripCRC | RxEnable | RxPromisc | RxAllMulti; 1783 rx_cfg_setting = RxStripCRC | RxEnable | RxPromisc | RxAllMulti;
1785 } else if (dev->flags & IFF_ALLMULTI) 1784 } else if (dev->flags & IFF_ALLMULTI)
1786 rx_cfg_setting = RxStripCRC | RxEnable | RxAllMulti; 1785 rx_cfg_setting = RxStripCRC | RxEnable | RxAllMulti;