Hi,
The attached patch:
* cleans up the parameter passing (module_param() instead of MODULE_PARM()
* makes debugging work (PCMCIA_DEBUG does not exist anymore, make the
Makefile test for CONFIG_PCMCIA_DEBUG and activate DEBUG in CFLAGS)
and use the same debugging macros for every driver through code
reuse.
I've tested this with the pcnet_cs driver, the others are not tested
but compile cleanly.
Please apply.
Thanks,
Stelian.
===================================================================
Signed-off-by: Stelian Pop <stelian@popies.net>
===================================================================
drivers/net/pcmcia/Makefile | 4
===================================================================
===== drivers/net/pcmcia/Makefile 1.15 vs edited =====
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/net/pcmcia/3c574_cs.c | 91 ++++++-------
25-akpm/drivers/net/pcmcia/3c589_cs.c | 81 +++++-------
25-akpm/drivers/net/pcmcia/Makefile | 4
25-akpm/drivers/net/pcmcia/axnet_cs.c | 38 ++---
25-akpm/drivers/net/pcmcia/com20020_cs.c | 85 +++++-------
25-akpm/drivers/net/pcmcia/common.h | 16 ++
25-akpm/drivers/net/pcmcia/fmvj18x_cs.c | 71 +++++-----
25-akpm/drivers/net/pcmcia/ibmtr_cs.c | 40 ++----
25-akpm/drivers/net/pcmcia/nmclan_cs.c | 203 ++++++++++++++-----------------
25-akpm/drivers/net/pcmcia/pcnet_cs.c | 83 +++++++-----
25-akpm/drivers/net/pcmcia/smc91c92_cs.c | 101 +++++++--------
25-akpm/drivers/net/pcmcia/xirc2ps_cs.c | 126 +++++++++----------
12 files changed, 467 insertions(+), 472 deletions(-)
diff -puN drivers/net/pcmcia/3c574_cs.c~pcmcia-network-drivers-cleanup drivers/net/pcmcia/3c574_cs.c
--- 25/drivers/net/pcmcia/3c574_cs.c~pcmcia-network-drivers-cleanup Thu Nov 4 15:04:58 2004
+++ 25-akpm/drivers/net/pcmcia/3c574_cs.c Thu Nov 4 15:04:58 2004
@@ -98,6 +98,7 @@ earlier 3Com products.
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/system.h>
+#include "common.h"
/*====================================================================*/
@@ -107,29 +108,27 @@ MODULE_AUTHOR("David Hinds <dahinds@user
MODULE_DESCRIPTION("3Com 3c574 series PCMCIA ethernet driver");
MODULE_LICENSE("GPL");
-#define INT_MODULE_PARM(n, v) static int n = v; MODULE_PARM(n, "i")
-
-/* Now-standard PC card module parameters. */
-INT_MODULE_PARM(irq_mask, 0xdeb8);
+/* Bit map of interrupts to choose from */
+static int irq_mask = 0xdeb8;
+module_param(irq_mask, int, 0444);
static int irq_list[4] = { -1 };
-MODULE_PARM(irq_list, "1-4i");
+module_param_array(irq_list, int, NULL, 0444);
/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
-INT_MODULE_PARM(max_interrupt_work, 32);
+static int max_interrupt_work = 32;
+module_param(max_interrupt_work, int, 0444);
/* Force full duplex modes? */
-INT_MODULE_PARM(full_duplex, 0);
+static int full_duplex; /* = 0 */
+module_param(full_duplex, int, 0444);
/* Autodetect link polarity reversal? */
-INT_MODULE_PARM(auto_polarity, 1);
+static int auto_polarity = 1;
+module_param(auto_polarity, int, 0444);
-#ifdef PCMCIA_DEBUG
-INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG);
-#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
-static char *version =
+#ifdef DEBUG
+static char __attribute((unused)) *version =
"3c574_cs.c 1.65ac1 2003/04/07 Donald Becker/David Hinds, becker@scyld.com.\n";
-#else
-#define DEBUG(n, args...)
#endif
/*====================================================================*/
@@ -277,7 +276,7 @@ static dev_link_t *tc574_attach(void)
struct net_device *dev;
int i, ret;
- DEBUG(0, "3c574_attach()\n");
+ pn_dbg(0, "3c574_attach()\n");
/* Create the PC card device object. */
dev = alloc_etherdev(sizeof(struct el3_private));
@@ -354,7 +353,7 @@ static void tc574_detach(dev_link_t *lin
struct net_device *dev = link->priv;
dev_link_t **linkp;
- DEBUG(0, "3c574_detach(0x%p)\n", link);
+ pn_dbg(0, "3c574_detach(0x%p)\n", link);
/* Locate device structure */
for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
@@ -403,7 +402,7 @@ static void tc574_config(dev_link_t *lin
phys_addr = (u16 *)dev->dev_addr;
- DEBUG(0, "3c574_config(0x%p)\n", link);
+ pn_dbg(0, "3c574_config(0x%p)\n", link);
tuple.Attributes = 0;
tuple.DesiredTuple = CISTPL_CONFIG;
@@ -496,8 +495,8 @@ static void tc574_config(dev_link_t *lin
mii_status = mdio_read(ioaddr, phy & 0x1f, 1);
if (mii_status != 0xffff) {
lp->phys = phy & 0x1f;
- DEBUG(0, " MII transceiver at index %d, status %x.\n",
- phy, mii_status);
+ pn_dbg(0, " MII transceiver at index %d, status %x.\n",
+ phy, mii_status);
if ((mii_status & 0x0040) == 0)
mii_preamble_required = 1;
break;
@@ -555,7 +554,7 @@ failed:
static void tc574_release(dev_link_t *link)
{
- DEBUG(0, "3c574_release(0x%p)\n", link);
+ pn_dbg(0, "3c574_release(0x%p)\n", link);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
@@ -577,7 +576,7 @@ static int tc574_event(event_t event, in
dev_link_t *link = args->client_data;
struct net_device *dev = link->priv;
- DEBUG(1, "3c574_event(0x%06x)\n", event);
+ pn_dbg(1, "3c574_event(0x%06x)\n", event);
switch (event) {
case CS_EVENT_CARD_REMOVAL:
@@ -833,8 +832,8 @@ static int el3_open(struct net_device *d
lp->media.expires = jiffies + HZ;
add_timer(&lp->media);
- DEBUG(2, "%s: opened, status %4.4x.\n",
- dev->name, inw(dev->base_addr + EL3_STATUS));
+ pn_dbg(2, "%s: opened, status %4.4x.\n",
+ dev->name, inw(dev->base_addr + EL3_STATUS));
return 0;
}
@@ -869,8 +868,8 @@ static void pop_tx_status(struct net_dev
if (tx_status & 0x30)
tc574_wait_for_completion(dev, TxReset);
if (tx_status & 0x38) {
- DEBUG(1, "%s: transmit error: status 0x%02x\n",
- dev->name, tx_status);
+ pn_dbg(1, "%s: transmit error: status 0x%02x\n",
+ dev->name, tx_status);
outw(TxEnable, ioaddr + EL3_CMD);
lp->stats.tx_aborted_errors++;
}
@@ -884,8 +883,8 @@ static int el3_start_xmit(struct sk_buff
struct el3_private *lp = netdev_priv(dev);
unsigned long flags;
- DEBUG(3, "%s: el3_start_xmit(length = %ld) called, "
- "status %4.4x.\n", dev->name, (long)skb->len,
+ pn_dbg(3, "%s: el3_start_xmit(length = %ld) called, "
+ "status %4.4x.\n", dev->name, (long)skb->len,
inw(ioaddr + EL3_STATUS));
spin_lock_irqsave(&lp->window_lock, flags);
@@ -922,8 +921,8 @@ static irqreturn_t el3_interrupt(int irq
return IRQ_NONE;
ioaddr = dev->base_addr;
- DEBUG(3, "%s: interrupt, status %4.4x.\n",
- dev->name, inw(ioaddr + EL3_STATUS));
+ pn_dbg(3, "%s: interrupt, status %4.4x.\n",
+ dev->name, inw(ioaddr + EL3_STATUS));
spin_lock(&lp->window_lock);
@@ -931,7 +930,7 @@ static irqreturn_t el3_interrupt(int irq
(IntLatch | RxComplete | RxEarly | StatsFull)) {
if (!netif_device_present(dev) ||
((status & 0xe000) != 0x2000)) {
- DEBUG(1, "%s: Interrupt from dead card\n", dev->name);
+ pn_dbg(1, "%s: Interrupt from dead card\n", dev->name);
break;
}
@@ -941,7 +940,7 @@ static irqreturn_t el3_interrupt(int irq
work_budget = el3_rx(dev, work_budget);
if (status & TxAvailable) {
- DEBUG(3, " TX room bit was handled.\n");
+ pn_dbg(3, " TX room bit was handled.\n");
/* There's room in the FIFO for a full-sized packet. */
outw(AckIntr | TxAvailable, ioaddr + EL3_CMD);
netif_wake_queue(dev);
@@ -981,8 +980,8 @@ static irqreturn_t el3_interrupt(int irq
}
if (--work_budget < 0) {
- DEBUG(0, "%s: Too much work in interrupt, "
- "status %4.4x.\n", dev->name, status);
+ pn_dbg(0, "%s: Too much work in interrupt, "
+ "status %4.4x.\n", dev->name, status);
/* Clear all interrupts */
outw(AckIntr | 0xFF, ioaddr + EL3_CMD);
break;
@@ -991,8 +990,8 @@ static irqreturn_t el3_interrupt(int irq
outw(AckIntr | IntReq | IntLatch, ioaddr + EL3_CMD);
}
- DEBUG(3, "%s: exiting interrupt, status %4.4x.\n",
- dev->name, inw(ioaddr + EL3_STATUS));
+ pn_dbg(3, "%s: exiting interrupt, status %4.4x.\n",
+ dev->name, inw(ioaddr + EL3_STATUS));
spin_unlock(&lp->window_lock);
return IRQ_RETVAL(handled);
@@ -1099,7 +1098,7 @@ static void update_stats(struct net_devi
ioaddr_t ioaddr = dev->base_addr;
u8 rx, tx, up;
- DEBUG(2, "%s: updating the statistics.\n", dev->name);
+ pn_dbg(2, "%s: updating the statistics.\n", dev->name);
if (inw(ioaddr+EL3_STATUS) == 0xffff) /* No card. */
return;
@@ -1136,8 +1135,8 @@ static int el3_rx(struct net_device *dev
ioaddr_t ioaddr = dev->base_addr;
short rx_status;
- DEBUG(3, "%s: in rx_packet(), status %4.4x, rx_status %4.4x.\n",
- dev->name, inw(ioaddr+EL3_STATUS), inw(ioaddr+RxStatus));
+ pn_dbg(3, "%s: in rx_packet(), status %4.4x, rx_status %4.4x.\n",
+ dev->name, inw(ioaddr+EL3_STATUS), inw(ioaddr+RxStatus));
while (!((rx_status = inw(ioaddr + RxStatus)) & 0x8000) &&
(--worklimit >= 0)) {
if (rx_status & 0x4000) { /* Error, update stats. */
@@ -1157,8 +1156,8 @@ static int el3_rx(struct net_device *dev
skb = dev_alloc_skb(pkt_len+5);
- DEBUG(3, " Receiving packet size %d status %4.4x.\n",
- pkt_len, rx_status);
+ pn_dbg(3, " Receiving packet size %d status %4.4x.\n",
+ pkt_len, rx_status);
if (skb != NULL) {
skb->dev = dev;
skb_reserve(skb, 2);
@@ -1170,8 +1169,8 @@ static int el3_rx(struct net_device *dev
lp->stats.rx_packets++;
lp->stats.rx_bytes += pkt_len;
} else {
- DEBUG(1, "%s: couldn't allocate a sk_buff of"
- " size %d.\n", dev->name, pkt_len);
+ pn_dbg(1, "%s: couldn't allocate a sk_buff of"
+ " size %d.\n", dev->name, pkt_len);
lp->stats.rx_dropped++;
}
}
@@ -1199,9 +1198,9 @@ static int el3_ioctl(struct net_device *
u16 *data = (u16 *)&rq->ifr_ifru;
int phy = lp->phys & 0x1f;
- DEBUG(2, "%s: In ioct(%-.6s, %#4.4x) %4.4x %4.4x %4.4x %4.4x.\n",
- dev->name, rq->ifr_ifrn.ifrn_name, cmd,
- data[0], data[1], data[2], data[3]);
+ pn_dbg(2, "%s: In ioct(%-.6s, %#4.4x) %4.4x %4.4x %4.4x %4.4x.\n",
+ dev->name, rq->ifr_ifrn.ifrn_name, cmd,
+ data[0], data[1], data[2], data[3]);
switch(cmd) {
case SIOCGMIIPHY: /* Get the address of the PHY in use. */
@@ -1266,7 +1265,7 @@ static int el3_close(struct net_device *
struct el3_private *lp = netdev_priv(dev);
dev_link_t *link = &lp->link;
- DEBUG(2, "%s: shutting down ethercard.\n", dev->name);
+ pn_dbg(2, "%s: shutting down ethercard.\n", dev->name);
if (DEV_OK(link)) {
unsigned long flags;
diff -puN drivers/net/pcmcia/3c589_cs.c~pcmcia-network-drivers-cleanup drivers/net/pcmcia/3c589_cs.c
--- 25/drivers/net/pcmcia/3c589_cs.c~pcmcia-network-drivers-cleanup Thu Nov 4 15:04:58 2004
+++ 25-akpm/drivers/net/pcmcia/3c589_cs.c Thu Nov 4 15:04:58 2004
@@ -51,6 +51,7 @@
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/system.h>
+#include "common.h"
/* To minimize the size of the driver source I only define operating
constants if they are used several times. You'll need the manual
@@ -126,23 +127,19 @@ MODULE_AUTHOR("David Hinds <dahinds@user
MODULE_DESCRIPTION("3Com 3c589 series PCMCIA ethernet driver");
MODULE_LICENSE("GPL");
-#define INT_MODULE_PARM(n, v) static int n = v; MODULE_PARM(n, "i")
-
-/* Special hook for setting if_port when module is loaded */
-INT_MODULE_PARM(if_port, 0);
-
/* Bit map of interrupts to choose from */
-INT_MODULE_PARM(irq_mask, 0xdeb8);
+static int irq_mask = 0xdeb8;
+module_param(irq_mask, int, 0444);
static int irq_list[4] = { -1 };
-MODULE_PARM(irq_list, "1-4i");
+module_param_array(irq_list, int, NULL, 0444);
+
+/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
+static int if_port; /* = 0 */
+module_param(if_port, int, 0444);
-#ifdef PCMCIA_DEBUG
-INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG);
-#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
-static char *version =
+#ifdef DEBUG
+static char __attribute((unused)) *version =
DRV_NAME ".c " DRV_VERSION " 2001/10/13 00:08:50 (David Hinds)";
-#else
-#define DEBUG(n, args...)
#endif
/*====================================================================*/
@@ -190,7 +187,7 @@ static dev_link_t *tc589_attach(void)
struct net_device *dev;
int i, ret;
- DEBUG(0, "3c589_attach()\n");
+ pn_dbg(0, "3c589_attach()\n");
/* Create new ethernet device */
dev = alloc_etherdev(sizeof(struct el3_private));
@@ -268,7 +265,7 @@ static void tc589_detach(dev_link_t *lin
struct net_device *dev = link->priv;
dev_link_t **linkp;
- DEBUG(0, "3c589_detach(0x%p)\n", link);
+ pn_dbg(0, "3c589_detach(0x%p)\n", link);
/* Locate device structure */
for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
@@ -313,7 +310,7 @@ static void tc589_config(dev_link_t *lin
ioaddr_t ioaddr;
char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
- DEBUG(0, "3c589_config(0x%p)\n", link);
+ pn_dbg(0, "3c589_config(0x%p)\n", link);
phys_addr = (u16 *)dev->dev_addr;
tuple.Attributes = 0;
@@ -429,7 +426,7 @@ failed:
static void tc589_release(dev_link_t *link)
{
- DEBUG(0, "3c589_release(0x%p)\n", link);
+ pn_dbg(0, "3c589_release(0x%p)\n", link);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
@@ -453,7 +450,7 @@ static int tc589_event(event_t event, in
dev_link_t *link = args->client_data;
struct net_device *dev = link->priv;
- DEBUG(1, "3c589_event(0x%06x)\n", event);
+ pn_dbg(1, "3c589_event(0x%06x)\n", event);
switch (event) {
case CS_EVENT_CARD_REMOVAL:
@@ -614,7 +611,7 @@ static void netdev_get_drvinfo(struct ne
sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr);
}
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
static u32 netdev_get_msglevel(struct net_device *dev)
{
return pc_debug;
@@ -624,14 +621,14 @@ static void netdev_set_msglevel(struct n
{
pc_debug = level;
}
-#endif /* PCMCIA_DEBUG */
+#endif /* DEBUG */
static struct ethtool_ops netdev_ethtool_ops = {
.get_drvinfo = netdev_get_drvinfo,
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
.get_msglevel = netdev_get_msglevel,
.set_msglevel = netdev_set_msglevel,
-#endif /* PCMCIA_DEBUG */
+#endif /* DEBUG */
};
static int el3_config(struct net_device *dev, struct ifmap *map)
@@ -666,8 +663,8 @@ static int el3_open(struct net_device *d
lp->media.expires = jiffies + HZ;
add_timer(&lp->media);
- DEBUG(1, "%s: opened, status %4.4x.\n",
- dev->name, inw(dev->base_addr + EL3_STATUS));
+ pn_dbg(1, "%s: opened, status %4.4x.\n",
+ dev->name, inw(dev->base_addr + EL3_STATUS));
return 0;
}
@@ -701,8 +698,8 @@ static void pop_tx_status(struct net_dev
if (tx_status & 0x30)
tc589_wait_for_completion(dev, TxReset);
if (tx_status & 0x38) {
- DEBUG(1, "%s: transmit error: status 0x%02x\n",
- dev->name, tx_status);
+ pn_dbg(1, "%s: transmit error: status 0x%02x\n",
+ dev->name, tx_status);
outw(TxEnable, ioaddr + EL3_CMD);
lp->stats.tx_aborted_errors++;
}
@@ -715,8 +712,8 @@ static int el3_start_xmit(struct sk_buff
ioaddr_t ioaddr = dev->base_addr;
struct el3_private *priv = netdev_priv(dev);
- DEBUG(3, "%s: el3_start_xmit(length = %ld) called, "
- "status %4.4x.\n", dev->name, (long)skb->len,
+ pn_dbg(3, "%s: el3_start_xmit(length = %ld) called, "
+ "status %4.4x.\n", dev->name, (long)skb->len,
inw(ioaddr + EL3_STATUS));
priv->stats.tx_bytes += skb->len;
@@ -753,14 +750,14 @@ static irqreturn_t el3_interrupt(int irq
ioaddr = dev->base_addr;
- DEBUG(3, "%s: interrupt, status %4.4x.\n",
- dev->name, inw(ioaddr + EL3_STATUS));
+ pn_dbg(3, "%s: interrupt, status %4.4x.\n",
+ dev->name, inw(ioaddr + EL3_STATUS));
spin_lock(&lp->lock);
while ((status = inw(ioaddr + EL3_STATUS)) &
(IntLatch | RxComplete | StatsFull)) {
if ((status & 0xe000) != 0x2000) {
- DEBUG(1, "%s: interrupt from dead card\n", dev->name);
+ pn_dbg(1, "%s: interrupt from dead card\n", dev->name);
handled = 0;
break;
}
@@ -769,7 +766,7 @@ static irqreturn_t el3_interrupt(int irq
el3_rx(dev);
if (status & TxAvailable) {
- DEBUG(3, " TX room bit was handled.\n");
+ pn_dbg(3, " TX room bit was handled.\n");
/* There's room in the FIFO for a full-sized packet. */
outw(AckIntr | TxAvailable, ioaddr + EL3_CMD);
netif_wake_queue(dev);
@@ -821,8 +818,8 @@ static irqreturn_t el3_interrupt(int irq
lp->last_irq = jiffies;
spin_unlock(&lp->lock);
- DEBUG(3, "%s: exiting interrupt, status %4.4x.\n",
- dev->name, inw(ioaddr + EL3_STATUS));
+ pn_dbg(3, "%s: exiting interrupt, status %4.4x.\n",
+ dev->name, inw(ioaddr + EL3_STATUS));
return IRQ_RETVAL(handled);
}
@@ -934,7 +931,7 @@ static void update_stats(struct net_devi
struct el3_private *lp = netdev_priv(dev);
ioaddr_t ioaddr = dev->base_addr;
- DEBUG(2, "%s: updating the statistics.\n", dev->name);
+ pn_dbg(2, "%s: updating the statistics.\n", dev->name);
/* Turn off statistics updates while reading. */
outw(StatsDisable, ioaddr + EL3_CMD);
/* Switch to the stats window, and read everything. */
@@ -963,8 +960,8 @@ static int el3_rx(struct net_device *dev
int worklimit = 32;
short rx_status;
- DEBUG(3, "%s: in rx_packet(), status %4.4x, rx_status %4.4x.\n",
- dev->name, inw(ioaddr+EL3_STATUS), inw(ioaddr+RX_STATUS));
+ pn_dbg(3, "%s: in rx_packet(), status %4.4x, rx_status %4.4x.\n",
+ dev->name, inw(ioaddr+EL3_STATUS), inw(ioaddr+RX_STATUS));
while (!((rx_status = inw(ioaddr + RX_STATUS)) & 0x8000) &&
(--worklimit >= 0)) {
if (rx_status & 0x4000) { /* Error, update stats. */
@@ -984,8 +981,8 @@ static int el3_rx(struct net_device *dev
skb = dev_alloc_skb(pkt_len+5);
- DEBUG(3, " Receiving packet size %d status %4.4x.\n",
- pkt_len, rx_status);
+ pn_dbg(3, " Receiving packet size %d status %4.4x.\n",
+ pkt_len, rx_status);
if (skb != NULL) {
skb->dev = dev;
skb_reserve(skb, 2);
@@ -997,8 +994,8 @@ static int el3_rx(struct net_device *dev
lp->stats.rx_packets++;
lp->stats.rx_bytes += pkt_len;
} else {
- DEBUG(1, "%s: couldn't allocate a sk_buff of"
- " size %d.\n", dev->name, pkt_len);
+ pn_dbg(1, "%s: couldn't allocate a sk_buff of"
+ " size %d.\n", dev->name, pkt_len);
lp->stats.rx_dropped++;
}
}
@@ -1031,7 +1028,7 @@ static int el3_close(struct net_device *
dev_link_t *link = &lp->link;
ioaddr_t ioaddr = dev->base_addr;
- DEBUG(1, "%s: shutting down ethercard.\n", dev->name);
+ pn_dbg(1, "%s: shutting down ethercard.\n", dev->name);
if (DEV_OK(link)) {
/* Turn off statistics ASAP. We update lp->stats below. */
diff -puN drivers/net/pcmcia/axnet_cs.c~pcmcia-network-drivers-cleanup drivers/net/pcmcia/axnet_cs.c
--- 25/drivers/net/pcmcia/axnet_cs.c~pcmcia-network-drivers-cleanup Thu Nov 4 15:04:58 2004
+++ 25-akpm/drivers/net/pcmcia/axnet_cs.c Thu Nov 4 15:04:58 2004
@@ -49,6 +49,7 @@
#include <asm/system.h>
#include <asm/byteorder.h>
#include <asm/uaccess.h>
+#include "common.h"
#define AXNET_CMD 0x00
#define AXNET_DATAPORT 0x10 /* NatSemi-defined port window offset. */
@@ -73,20 +74,15 @@ MODULE_AUTHOR("David Hinds <dahinds@user
MODULE_DESCRIPTION("Asix AX88190 PCMCIA ethernet driver");
MODULE_LICENSE("GPL");
-#define INT_MODULE_PARM(n, v) static int n = v; MODULE_PARM(n, "i")
-
/* Bit map of interrupts to choose from */
-INT_MODULE_PARM(irq_mask, 0xdeb8);
+static int irq_mask = 0xdeb8;
+module_param(irq_mask, int, 0444);
static int irq_list[4] = { -1 };
-MODULE_PARM(irq_list, "1-4i");
+module_param_array(irq_list, int, NULL, 0444);
-#ifdef PCMCIA_DEBUG
-INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG);
-#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
-static char *version =
+#ifdef DEBUG
+static char __attribute((unused)) *version =
"axnet_cs.c 1.28 2002/06/29 06:27:37 (David Hinds)";
-#else
-#define DEBUG(n, args...)
#endif
/*====================================================================*/
@@ -161,7 +157,7 @@ static dev_link_t *axnet_attach(void)
client_reg_t client_reg;
int i, ret;
- DEBUG(0, "axnet_attach()\n");
+ pn_dbg(0, "axnet_attach()\n");
dev = alloc_netdev(sizeof(struct ei_device) + sizeof(axnet_dev_t),
"eth%d", axdev_setup);
@@ -223,7 +219,7 @@ static void axnet_detach(dev_link_t *lin
struct net_device *dev = link->priv;
dev_link_t **linkp;
- DEBUG(0, "axnet_detach(0x%p)\n", link);
+ pn_dbg(0, "axnet_detach(0x%p)\n", link);
/* Locate device structure */
for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
@@ -342,11 +338,11 @@ static void axnet_config(dev_link_t *lin
axnet_dev_t *info = PRIV(dev);
tuple_t tuple;
cisparse_t parse;
- int i, j, last_ret, last_fn;
+ int i, j = 0, last_ret, last_fn;
u_short buf[64];
config_info_t conf;
- DEBUG(0, "axnet_config(0x%p)\n", link);
+ pn_dbg(0, "axnet_config(0x%p)\n", link);
tuple.Attributes = 0;
tuple.TupleData = (cisdata_t *)buf;
@@ -474,7 +470,7 @@ static void axnet_config(dev_link_t *lin
for (i = 0; i < 6; i++)
printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n"));
if (info->phy_id != -1) {
- DEBUG(0, " MII transceiver at index %d, status %x.\n", info->phy_id, j);
+ pn_dbg(0, " MII transceiver at index %d, status %x.\n", info->phy_id, j);
} else {
printk(KERN_NOTICE " No MII transceivers found!\n");
}
@@ -498,7 +494,7 @@ failed:
static void axnet_release(dev_link_t *link)
{
- DEBUG(0, "axnet_release(0x%p)\n", link);
+ pn_dbg(0, "axnet_release(0x%p)\n", link);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
@@ -522,7 +518,7 @@ static int axnet_event(event_t event, in
dev_link_t *link = args->client_data;
struct net_device *dev = link->priv;
- DEBUG(2, "axnet_event(0x%06x)\n", event);
+ pn_dbg(2, "axnet_event(0x%06x)\n", event);
switch (event) {
case CS_EVENT_CARD_REMOVAL:
@@ -626,7 +622,7 @@ static int axnet_open(struct net_device
axnet_dev_t *info = PRIV(dev);
dev_link_t *link = &info->link;
- DEBUG(2, "axnet_open('%s')\n", dev->name);
+ pn_dbg(2, "axnet_open('%s')\n", dev->name);
if (!DEV_OK(link))
return -ENODEV;
@@ -652,7 +648,7 @@ static int axnet_close(struct net_device
axnet_dev_t *info = PRIV(dev);
dev_link_t *link = &info->link;
- DEBUG(2, "axnet_close('%s')\n", dev->name);
+ pn_dbg(2, "axnet_close('%s')\n", dev->name);
ax_close(dev);
free_irq(dev->irq, dev);
@@ -823,7 +819,7 @@ static void block_input(struct net_devic
int xfer_count = count;
char *buf = skb->data;
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
if ((ei_debug > 4) && (count != 4))
printk(KERN_DEBUG "%s: [bi=%d]\n", dev->name, count+4);
#endif
@@ -844,7 +840,7 @@ static void block_output(struct net_devi
{
ioaddr_t nic_base = dev->base_addr;
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
if (ei_debug > 4)
printk(KERN_DEBUG "%s: [bo=%d]\n", dev->name, count);
#endif
diff -puN drivers/net/pcmcia/com20020_cs.c~pcmcia-network-drivers-cleanup drivers/net/pcmcia/com20020_cs.c
--- 25/drivers/net/pcmcia/com20020_cs.c~pcmcia-network-drivers-cleanup Thu Nov 4 15:04:58 2004
+++ 25-akpm/drivers/net/pcmcia/com20020_cs.c Thu Nov 4 15:04:58 2004
@@ -51,15 +51,11 @@
#include <asm/io.h>
#include <asm/system.h>
+#include "common.h"
#define VERSION "arcnet: COM20020 PCMCIA support loaded.\n"
-#ifdef PCMCIA_DEBUG
-
-static int pc_debug = PCMCIA_DEBUG;
-MODULE_PARM(pc_debug, "i");
-#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
-
+#ifdef DEBUG
static void regdump(struct net_device *dev)
{
int ioaddr = dev->base_addr;
@@ -90,37 +86,32 @@ static void regdump(struct net_device *d
}
printk("\n");
}
-
#else
-
-#define DEBUG(n, args...) do { } while (0)
static inline void regdump(struct net_device *dev) { }
-
#endif
/*====================================================================*/
-/* Parameters that can be set with 'insmod' */
-
-static int node;
-static int timeout = 3;
-static int backplane;
-static int clockp;
-static int clockm;
-
-MODULE_PARM(node, "i");
-MODULE_PARM(timeout, "i");
-MODULE_PARM(backplane, "i");
-MODULE_PARM(clockp, "i");
-MODULE_PARM(clockm, "i");
/* Bit map of interrupts to choose from */
-static u_int irq_mask = 0xdeb8;
+static int irq_mask = 0xdeb8;
+module_param(irq_mask, int, 0444);
static int irq_list[4] = { -1 };
+module_param_array(irq_list, int, NULL, 0444);
+
+/* Parameters that can be set with 'insmod' */
+static int node; /* = 0 */
+module_param(node, int, 0444);
+static int timeout = 3;
+module_param(timeout, int, 0444);
+static int backplane; /* = 0 */
+module_param(backplane, int, 0444);
+static int clockp; /* = 0 */
+module_param(clockp, int, 0444);
+static int clockm; /* = 0 */
+module_param(clockm, int, 0444);
-MODULE_PARM(irq_mask, "i");
-MODULE_PARM(irq_list, "1-4i");
MODULE_LICENSE("GPL");
/*====================================================================*/
@@ -161,7 +152,7 @@ static dev_link_t *com20020_attach(void)
int i, ret;
struct arcnet_local *lp;
- DEBUG(0, "com20020_attach()\n");
+ pn_dbg(0, "com20020_attach()\n");
/* Create new network device */
link = kmalloc(sizeof(struct dev_link_t), GFP_KERNEL);
@@ -250,9 +241,9 @@ static void com20020_detach(dev_link_t *
dev_link_t **linkp;
struct net_device *dev;
- DEBUG(1,"detach...\n");
+ pn_dbg(1,"detach...\n");
- DEBUG(0, "com20020_detach(0x%p)\n", link);
+ pn_dbg(0, "com20020_detach(0x%p)\n", link);
/* Locate device structure */
for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
@@ -263,7 +254,7 @@ static void com20020_detach(dev_link_t *
dev = info->dev;
if (link->dev) {
- DEBUG(1,"unregister...\n");
+ pn_dbg(1,"unregister...\n");
unregister_netdev(dev);
@@ -282,20 +273,20 @@ static void com20020_detach(dev_link_t *
pcmcia_deregister_client(link->handle);
/* Unlink device structure, free bits */
- DEBUG(1,"unlinking...\n");
+ pn_dbg(1,"unlinking...\n");
*linkp = link->next;
if (link->priv)
{
dev = info->dev;
if (dev)
{
- DEBUG(1,"kfree...\n");
+ pn_dbg(1,"kfree...\n");
free_netdev(dev);
}
- DEBUG(1,"kfree2...\n");
+ pn_dbg(1,"kfree2...\n");
kfree(info);
}
- DEBUG(1,"kfree3...\n");
+ pn_dbg(1,"kfree3...\n");
kfree(link);
} /* com20020_detach */
@@ -327,9 +318,9 @@ static void com20020_config(dev_link_t *
info = link->priv;
dev = info->dev;
- DEBUG(1,"config...\n");
+ pn_dbg(1,"config...\n");
- DEBUG(0, "com20020_config(0x%p)\n", link);
+ pn_dbg(0, "com20020_config(0x%p)\n", link);
tuple.Attributes = 0;
tuple.TupleData = buf;
@@ -344,7 +335,7 @@ static void com20020_config(dev_link_t *
/* Configure card */
link->state |= DEV_CONFIG;
- DEBUG(1,"arcnet: baseport1 is %Xh\n", link->io.BasePort1);
+ pn_dbg(1,"arcnet: baseport1 is %Xh\n", link->io.BasePort1);
i = !CS_SUCCESS;
if (!link->io.BasePort1)
{
@@ -361,20 +352,20 @@ static void com20020_config(dev_link_t *
if (i != CS_SUCCESS)
{
- DEBUG(1,"arcnet: requestIO failed totally!\n");
+ pn_dbg(1,"arcnet: requestIO failed totally!\n");
goto failed;
}
ioaddr = dev->base_addr = link->io.BasePort1;
- DEBUG(1,"arcnet: got ioaddr %Xh\n", ioaddr);
+ pn_dbg(1,"arcnet: got ioaddr %Xh\n", ioaddr);
- DEBUG(1,"arcnet: request IRQ %d (%Xh/%Xh)\n",
+ pn_dbg(1,"arcnet: request IRQ %d (%Xh/%Xh)\n",
link->irq.AssignedIRQ,
link->irq.IRQInfo1, link->irq.IRQInfo2);
i = pcmcia_request_irq(link->handle, &link->irq);
if (i != CS_SUCCESS)
{
- DEBUG(1,"arcnet: requestIRQ failed totally!\n");
+ pn_dbg(1,"arcnet: requestIRQ failed totally!\n");
goto failed;
}
@@ -399,21 +390,21 @@ static void com20020_config(dev_link_t *
i = com20020_found(dev, 0); /* calls register_netdev */
if (i != 0) {
- DEBUG(1,KERN_NOTICE "com20020_cs: com20020_found() failed\n");
+ pn_dbg(1,KERN_NOTICE "com20020_cs: com20020_found() failed\n");
link->dev = NULL;
goto failed;
}
strcpy(info->node.dev_name, dev->name);
- DEBUG(1,KERN_INFO "%s: port %#3lx, irq %d\n",
+ pn_dbg(1,KERN_INFO "%s: port %#3lx, irq %d\n",
dev->name, dev->base_addr, dev->irq);
return;
cs_failed:
cs_error(link->handle, last_fn, last_ret);
failed:
- DEBUG(1,"com20020_config failed...\n");
+ pn_dbg(1,"com20020_config failed...\n");
com20020_release(link);
} /* com20020_config */
@@ -428,9 +419,9 @@ failed:
static void com20020_release(dev_link_t *link)
{
- DEBUG(1,"release...\n");
+ pn_dbg(1,"release...\n");
- DEBUG(0, "com20020_release(0x%p)\n", link);
+ pn_dbg(0, "com20020_release(0x%p)\n", link);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
@@ -455,7 +446,7 @@ static int com20020_event(event_t event,
com20020_dev_t *info = link->priv;
struct net_device *dev = info->dev;
- DEBUG(1, "com20020_event(0x%06x)\n", event);
+ pn_dbg(1, "com20020_event(0x%06x)\n", event);
switch (event) {
case CS_EVENT_CARD_REMOVAL:
diff -puN /dev/null drivers/net/pcmcia/common.h
--- /dev/null Thu Apr 11 07:25:15 2002
+++ 25-akpm/drivers/net/pcmcia/common.h Thu Nov 4 15:04:58 2004
@@ -0,0 +1,16 @@
+#include <linux/kernel.h>
+#include <linux/moduleparam.h>
+
+#ifdef DEBUG
+static int pc_debug;
+
+module_param(pc_debug, int, 0644);
+
+#define pn_dbg(lvl, fmt, arg...) do { \
+ if (pc_debug > (lvl)) \
+ printk(KERN_DEBUG "pn: " fmt, ## arg); \
+} while (0)
+
+#else
+#define pn_dbg(lvl, fmt, arg...) do { } while (0)
+#endif
diff -puN drivers/net/pcmcia/fmvj18x_cs.c~pcmcia-network-drivers-cleanup drivers/net/pcmcia/fmvj18x_cs.c
--- 25/drivers/net/pcmcia/fmvj18x_cs.c~pcmcia-network-drivers-cleanup Thu Nov 4 15:04:58 2004
+++ 25-akpm/drivers/net/pcmcia/fmvj18x_cs.c Thu Nov 4 15:04:58 2004
@@ -59,6 +59,7 @@
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/system.h>
+#include "common.h"
/*====================================================================*/
@@ -67,24 +68,20 @@
MODULE_DESCRIPTION("fmvj18x and compatible PCMCIA ethernet driver");
MODULE_LICENSE("GPL");
-#define INT_MODULE_PARM(n, v) static int n = v; MODULE_PARM(n, "i")
-
/* Bit map of interrupts to choose from */
-/* This means pick from 15, 14, 12, 11, 10, 9, 7, 5, 4, and 3 */
-INT_MODULE_PARM(irq_mask, 0xdeb8);
+static int irq_mask = 0xdeb8;
+module_param(irq_mask, int, 0444);
static int irq_list[4] = { -1 };
-MODULE_PARM(irq_list, "1-4i");
+module_param_array(irq_list, int, NULL, 0444);
/* SRAM configuration */
/* 0:4KB*2 TX buffer else:8KB*2 TX buffer */
-INT_MODULE_PARM(sram_config, 0);
+static int sram_config; /* = 0 */
+module_param(sram_config, int, 0444);
-#ifdef PCMCIA_DEBUG
-INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG);
-#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
-static char *version = DRV_NAME ".c " DRV_VERSION " 2002/03/23";
-#else
-#define DEBUG(n, args...)
+#ifdef DEBUG
+static char __attribute((unused)) *version =
+DRV_NAME ".c " DRV_VERSION " 2002/03/23";
#endif
/*====================================================================*/
@@ -250,7 +247,7 @@ static dev_link_t *fmvj18x_attach(void)
client_reg_t client_reg;
int i, ret;
- DEBUG(0, "fmvj18x_attach()\n");
+ pn_dbg(0, "fmvj18x_attach()\n");
/* Make up a FMVJ18x specific data structure */
dev = alloc_etherdev(sizeof(local_info_t));
@@ -324,7 +321,7 @@ static void fmvj18x_detach(dev_link_t *l
struct net_device *dev = link->priv;
dev_link_t **linkp;
- DEBUG(0, "fmvj18x_detach(0x%p)\n", link);
+ pn_dbg(0, "fmvj18x_detach(0x%p)\n", link);
/* Locate device structure */
for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
@@ -405,7 +402,7 @@ static void fmvj18x_config(dev_link_t *l
char *card_name = "unknown";
u_char *node_id;
- DEBUG(0, "fmvj18x_config(0x%p)\n", link);
+ pn_dbg(0, "fmvj18x_config(0x%p)\n", link);
/*
This reads the card's CONFIG tuple to find its configuration
@@ -719,7 +716,7 @@ static int fmvj18x_setup_mfc(dev_link_t
static void fmvj18x_release(dev_link_t *link)
{
- DEBUG(0, "fmvj18x_release(0x%p)\n", link);
+ pn_dbg(0, "fmvj18x_release(0x%p)\n", link);
/* Don't bother checking to see if these succeed or not */
pcmcia_release_window(link->win);
@@ -738,7 +735,7 @@ static int fmvj18x_event(event_t event,
dev_link_t *link = args->client_data;
struct net_device *dev = link->priv;
- DEBUG(1, "fmvj18x_event(0x%06x)\n", event);
+ pn_dbg(1, "fmvj18x_event(0x%06x)\n", event);
switch (event) {
case CS_EVENT_CARD_REMOVAL:
@@ -829,8 +826,8 @@ static irqreturn_t fjn_interrupt(int irq
outb(tx_stat, ioaddr + TX_STATUS);
outb(rx_stat, ioaddr + RX_STATUS);
- DEBUG(4, "%s: interrupt, rx_status %02x.\n", dev->name, rx_stat);
- DEBUG(4, " tx_status %02x.\n", tx_stat);
+ pn_dbg(4, "%s: interrupt, rx_status %02x.\n", dev->name, rx_stat);
+ pn_dbg(4, " tx_status %02x.\n", tx_stat);
if (rx_stat || (inb(ioaddr + RX_MODE) & F_BUF_EMP) == 0) {
/* there is packet(s) in rx buffer */
@@ -850,8 +847,8 @@ static irqreturn_t fjn_interrupt(int irq
}
netif_wake_queue(dev);
}
- DEBUG(4, "%s: exiting interrupt,\n", dev->name);
- DEBUG(4, " tx_status %02x, rx_status %02x.\n", tx_stat, rx_stat);
+ pn_dbg(4, "%s: exiting interrupt,\n", dev->name);
+ pn_dbg(4, " tx_status %02x, rx_status %02x.\n", tx_stat, rx_stat);
outb(D_TX_INTR, ioaddr + TX_INTR);
outb(D_RX_INTR, ioaddr + RX_INTR);
@@ -916,8 +913,8 @@ static int fjn_start_xmit(struct sk_buff
return 1;
}
- DEBUG(4, "%s: Transmitting a packet of length %lu.\n",
- dev->name, (unsigned long)skb->len);
+ pn_dbg(4, "%s: Transmitting a packet of length %lu.\n",
+ dev->name, (unsigned long)skb->len);
lp->stats.tx_bytes += skb->len;
/* Disable both interrupts. */
@@ -971,7 +968,7 @@ static void fjn_reset(struct net_device
ioaddr_t ioaddr = dev->base_addr;
int i;
- DEBUG(4, "fjn_reset(%s) called.\n",dev->name);
+ pn_dbg(4, "fjn_reset(%s) called.\n",dev->name);
/* Reset controller */
if( sram_config == 0 )
@@ -1057,14 +1054,14 @@ static void fjn_rx(struct net_device *de
ioaddr_t ioaddr = dev->base_addr;
int boguscount = 10; /* 5 -> 10: by agy 19940922 */
- DEBUG(4, "%s: in rx_packet(), rx_status %02x.\n",
- dev->name, inb(ioaddr + RX_STATUS));
+ pn_dbg(4, "%s: in rx_packet(), rx_status %02x.\n",
+ dev->name, inb(ioaddr + RX_STATUS));
while ((inb(ioaddr + RX_MODE) & F_BUF_EMP) == 0) {
u_short status = inw(ioaddr + DATAPORT);
- DEBUG(4, "%s: Rxing packet mode %02x status %04x.\n",
- dev->name, inb(ioaddr + RX_MODE), status);
+ pn_dbg(4, "%s: Rxing packet mode %02x status %04x.\n",
+ dev->name, inb(ioaddr + RX_MODE), status);
#ifndef final_version
if (status == 0) {
outb(F_SKP_PKT, ioaddr + RX_SKIP);
@@ -1104,7 +1101,7 @@ static void fjn_rx(struct net_device *de
(pkt_len + 1) >> 1);
skb->protocol = eth_type_trans(skb, dev);
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
if (pc_debug > 5) {
int i;
printk(KERN_DEBUG "%s: Rxed packet of length %d: ",
@@ -1138,8 +1135,8 @@ static void fjn_rx(struct net_device *de
}
if (i > 0)
- DEBUG(5, "%s: Exint Rx packet with mode %02x after "
- "%d ticks.\n", dev->name, inb(ioaddr + RX_MODE), i);
+ pn_dbg(5, "%s: Exint Rx packet with mode %02x after "
+ "%d ticks.\n", dev->name, inb(ioaddr + RX_MODE), i);
}
*/
@@ -1156,7 +1153,7 @@ static void netdev_get_drvinfo(struct ne
sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr);
}
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
static u32 netdev_get_msglevel(struct net_device *dev)
{
return pc_debug;
@@ -1166,14 +1163,14 @@ static void netdev_set_msglevel(struct n
{
pc_debug = level;
}
-#endif /* PCMCIA_DEBUG */
+#endif /* DEBUG */
static struct ethtool_ops netdev_ethtool_ops = {
.get_drvinfo = netdev_get_drvinfo,
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
.get_msglevel = netdev_get_msglevel,
.set_msglevel = netdev_set_msglevel,
-#endif /* PCMCIA_DEBUG */
+#endif /* DEBUG */
};
static int fjn_config(struct net_device *dev, struct ifmap *map){
@@ -1185,7 +1182,7 @@ static int fjn_open(struct net_device *d
struct local_info_t *lp = netdev_priv(dev);
dev_link_t *link = &lp->link;
- DEBUG(4, "fjn_open('%s').\n", dev->name);
+ pn_dbg(4, "fjn_open('%s').\n", dev->name);
if (!DEV_OK(link))
return -ENODEV;
@@ -1211,7 +1208,7 @@ static int fjn_close(struct net_device *
dev_link_t *link = &lp->link;
ioaddr_t ioaddr = dev->base_addr;
- DEBUG(4, "fjn_close('%s').\n", dev->name);
+ pn_dbg(4, "fjn_close('%s').\n", dev->name);
lp->open_time = 0;
netif_stop_queue(dev);
diff -puN drivers/net/pcmcia/ibmtr_cs.c~pcmcia-network-drivers-cleanup drivers/net/pcmcia/ibmtr_cs.c
--- 25/drivers/net/pcmcia/ibmtr_cs.c~pcmcia-network-drivers-cleanup Thu Nov 4 15:04:58 2004
+++ 25-akpm/drivers/net/pcmcia/ibmtr_cs.c Thu Nov 4 15:04:58 2004
@@ -66,20 +66,16 @@
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/system.h>
+#include "common.h"
#define PCMCIA
#include "../tokenring/ibmtr.c"
-#ifdef PCMCIA_DEBUG
-static int pc_debug = PCMCIA_DEBUG;
-MODULE_PARM(pc_debug, "i");
-#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
-static char *version =
+#ifdef DEBUG
+static char __attribute((unused)) *version =
"ibmtr_cs.c 1.10 1996/01/06 05:19:00 (Steve Kipisz)\n"
" 2.2.7 1999/05/03 12:00:00 (Mike Phillips)\n"
" 2.4.2 2001/30/28 Midnight (Burt Silverman)\n";
-#else
-#define DEBUG(n, args...)
#endif
/*====================================================================*/
@@ -87,27 +83,27 @@ static char *version =
/* Parameters that can be set with 'insmod' */
/* Bit map of interrupts to choose from */
-static u_int irq_mask = 0xdeb8;
+static int irq_mask = 0xdeb8;
+module_param(irq_mask, int, 0444);
static int irq_list[4] = { -1 };
+module_param_array(irq_list, int, NULL, 0444);
/* MMIO base address */
-static u_long mmiobase = 0xce000;
+static int mmiobase = 0xce000;
+module_param(mmiobase, int, 0444);
/* SRAM base address */
-static u_long srambase = 0xd0000;
+static int srambase = 0xd0000;
+module_param(srambase, int, 0444);
/* SRAM size 8,16,32,64 */
-static u_long sramsize = 64;
+static int sramsize = 64;
+module_param(sramsize, int, 0444);
/* Ringspeed 4,16 */
static int ringspeed = 16;
+module_param(ringspeed, int, 0444);
-MODULE_PARM(irq_mask, "i");
-MODULE_PARM(irq_list, "1-4i");
-MODULE_PARM(mmiobase, "i");
-MODULE_PARM(srambase, "i");
-MODULE_PARM(sramsize, "i");
-MODULE_PARM(ringspeed, "i");
MODULE_LICENSE("GPL");
/*====================================================================*/
@@ -164,7 +160,7 @@ static dev_link_t *ibmtr_attach(void)
client_reg_t client_reg;
int i, ret;
- DEBUG(0, "ibmtr_attach()\n");
+ pn_dbg(0, "ibmtr_attach()\n");
/* Create new token-ring device */
info = kmalloc(sizeof(*info), GFP_KERNEL);
@@ -242,7 +238,7 @@ static void ibmtr_detach(dev_link_t *lin
dev_link_t **linkp;
struct net_device *dev;
- DEBUG(0, "ibmtr_detach(0x%p)\n", link);
+ pn_dbg(0, "ibmtr_detach(0x%p)\n", link);
/* Locate device structure */
for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
@@ -295,7 +291,7 @@ static void ibmtr_config(dev_link_t *lin
int i, last_ret, last_fn;
u_char buf[64];
- DEBUG(0, "ibmtr_config(0x%p)\n", link);
+ pn_dbg(0, "ibmtr_config(0x%p)\n", link);
tuple.Attributes = 0;
tuple.TupleData = buf;
@@ -407,7 +403,7 @@ static void ibmtr_release(dev_link_t *li
ibmtr_dev_t *info = link->priv;
struct net_device *dev = info->dev;
- DEBUG(0, "ibmtr_release(0x%p)\n", link);
+ pn_dbg(0, "ibmtr_release(0x%p)\n", link);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
@@ -438,7 +434,7 @@ static int ibmtr_event(event_t event, in
ibmtr_dev_t *info = link->priv;
struct net_device *dev = info->dev;
- DEBUG(1, "ibmtr_event(0x%06x)\n", event);
+ pn_dbg(1, "ibmtr_event(0x%06x)\n", event);
switch (event) {
case CS_EVENT_CARD_REMOVAL:
diff -puN drivers/net/pcmcia/Makefile~pcmcia-network-drivers-cleanup drivers/net/pcmcia/Makefile
--- 25/drivers/net/pcmcia/Makefile~pcmcia-network-drivers-cleanup Thu Nov 4 15:04:58 2004
+++ 25-akpm/drivers/net/pcmcia/Makefile Thu Nov 4 15:04:58 2004
@@ -2,6 +2,10 @@
# Makefile for the Linux PCMCIA network device drivers.
#
+ifeq ($(CONFIG_PCMCIA_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
+
# 16-bit client drivers
obj-$(CONFIG_PCMCIA_3C589) += 3c589_cs.o
obj-$(CONFIG_PCMCIA_3C574) += 3c574_cs.o
diff -puN drivers/net/pcmcia/nmclan_cs.c~pcmcia-network-drivers-cleanup drivers/net/pcmcia/nmclan_cs.c
--- 25/drivers/net/pcmcia/nmclan_cs.c~pcmcia-network-drivers-cleanup Thu Nov 4 15:04:58 2004
+++ 25-akpm/drivers/net/pcmcia/nmclan_cs.c Thu Nov 4 15:04:58 2004
@@ -156,6 +156,7 @@ Include Files
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/system.h>
+#include "common.h"
/* ----------------------------------------------------------------------------
Defines
@@ -382,10 +383,10 @@ typedef struct _mace_private {
Private Global Variables
---------------------------------------------------------------------------- */
-#ifdef PCMCIA_DEBUG
-static char rcsid[] =
+#ifdef DEBUG
+static char __attribute((unused)) rcsid[] =
"nmclan_cs.c,v 0.16 1995/07/01 06:42:17 rpao Exp rpao";
-static char *version =
+static char __attribute((unused)) *version =
DRV_NAME " " DRV_VERSION " (Roger C. Pao)";
#endif
@@ -405,22 +406,15 @@ Parameters
MODULE_DESCRIPTION("New Media PCMCIA ethernet driver");
MODULE_LICENSE("GPL");
-#define INT_MODULE_PARM(n, v) static int n = v; MODULE_PARM(n, "i")
-
+/* Bit map of interrupts to choose from */
+static int irq_mask = 0xdeb8;
+module_param(irq_mask, int, 0444);
static int irq_list[4] = { -1 };
-MODULE_PARM(irq_list, "1-4i");
+module_param_array(irq_list, int, NULL, 0444);
/* 0=auto, 1=10baseT, 2 = 10base2, default=auto */
-INT_MODULE_PARM(if_port, 0);
-/* Bit map of interrupts to choose from */
-INT_MODULE_PARM(irq_mask, 0xdeb8);
-
-#ifdef PCMCIA_DEBUG
-INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG);
-#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
-#else
-#define DEBUG(n, args...)
-#endif
+static int if_port; /* = 0 */
+module_param(if_port, int, 0444);
/* ----------------------------------------------------------------------------
Function Prototypes
@@ -463,8 +457,8 @@ static dev_link_t *nmclan_attach(void)
client_reg_t client_reg;
int i, ret;
- DEBUG(0, "nmclan_attach()\n");
- DEBUG(1, "%s\n", rcsid);
+ pn_dbg(0, "nmclan_attach()\n");
+ pn_dbg(1, "%s\n", rcsid);
/* Create new ethernet device */
dev = alloc_etherdev(sizeof(mace_private));
@@ -543,7 +537,7 @@ static void nmclan_detach(dev_link_t *li
struct net_device *dev = link->priv;
dev_link_t **linkp;
- DEBUG(0, "nmclan_detach(0x%p)\n", link);
+ pn_dbg(0, "nmclan_detach(0x%p)\n", link);
/* Locate device structure */
for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
@@ -715,7 +709,7 @@ static void nmclan_config(dev_link_t *li
int i, last_ret, last_fn;
ioaddr_t ioaddr;
- DEBUG(0, "nmclan_config(0x%p)\n", link);
+ pn_dbg(0, "nmclan_config(0x%p)\n", link);
tuple.Attributes = 0;
tuple.TupleData = buf;
@@ -754,8 +748,8 @@ static void nmclan_config(dev_link_t *li
sig[0] = mace_read(lp, ioaddr, MACE_CHIPIDL);
sig[1] = mace_read(lp, ioaddr, MACE_CHIPIDH);
if ((sig[0] == 0x40) && ((sig[1] & 0x0F) == 0x09)) {
- DEBUG(0, "nmclan_cs configured: mace id=%x %x\n",
- sig[0], sig[1]);
+ pn_dbg(0, "nmclan_cs configured: mace id=%x %x\n",
+ sig[0], sig[1]);
} else {
printk(KERN_NOTICE "nmclan_cs: mace id not found: %x %x should"
" be 0x40 0x?9\n", sig[0], sig[1]);
@@ -809,7 +803,7 @@ nmclan_release
static void nmclan_release(dev_link_t *link)
{
- DEBUG(0, "nmclan_release(0x%p)\n", link);
+ pn_dbg(0, "nmclan_release(0x%p)\n", link);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
@@ -831,7 +825,7 @@ static int nmclan_event(event_t event, i
dev_link_t *link = args->client_data;
struct net_device *dev = link->priv;
- DEBUG(1, "nmclan_event(0x%06x)\n", event);
+ pn_dbg(1, "nmclan_event(0x%06x)\n", event);
switch (event) {
case CS_EVENT_CARD_REMOVAL:
@@ -896,8 +890,8 @@ static void nmclan_reset(struct net_devi
/* Reset Xilinx */
reg.Action = CS_WRITE;
reg.Offset = CISREG_COR;
- DEBUG(1, "nmclan_reset: OrigCorValue=0x%lX, resetting...\n",
- OrigCorValue);
+ pn_dbg(1, "nmclan_reset: OrigCorValue=0x%lX, resetting...\n",
+ OrigCorValue);
reg.Value = COR_SOFT_RESET;
pcmcia_access_configuration_register(link->handle, ®);
/* Need to wait for 20 ms for PCMCIA to finish reset. */
@@ -973,7 +967,7 @@ static int mace_close(struct net_device
mace_private *lp = netdev_priv(dev);
dev_link_t *link = &lp->link;
- DEBUG(2, "%s: shutting down ethercard.\n", dev->name);
+ pn_dbg(2, "%s: shutting down ethercard.\n", dev->name);
/* Mask off all interrupts from the MACE chip. */
outb(0xFF, ioaddr + AM2150_MACE_BASE + MACE_IMR);
@@ -992,7 +986,7 @@ static void netdev_get_drvinfo(struct ne
sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr);
}
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
static u32 netdev_get_msglevel(struct net_device *dev)
{
return pc_debug;
@@ -1002,14 +996,14 @@ static void netdev_set_msglevel(struct n
{
pc_debug = level;
}
-#endif /* PCMCIA_DEBUG */
+#endif /* DEBUG */
static struct ethtool_ops netdev_ethtool_ops = {
.get_drvinfo = netdev_get_drvinfo,
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
.get_msglevel = netdev_get_msglevel,
.set_msglevel = netdev_set_msglevel,
-#endif /* PCMCIA_DEBUG */
+#endif /* DEBUG */
};
/* ----------------------------------------------------------------------------
@@ -1046,8 +1040,8 @@ static int mace_start_xmit(struct sk_buf
netif_stop_queue(dev);
- DEBUG(3, "%s: mace_start_xmit(length = %ld) called.\n",
- dev->name, (long)skb->len);
+ pn_dbg(3, "%s: mace_start_xmit(length = %ld) called.\n",
+ dev->name, (long)skb->len);
#if (!TX_INTERRUPTABLE)
/* Disable MACE TX interrupts. */
@@ -1108,8 +1102,7 @@ static irqreturn_t mace_interrupt(int ir
int IntrCnt = MACE_MAX_IR_ITERATIONS;
if (dev == NULL) {
- DEBUG(2, "mace_interrupt(): irq 0x%X for unknown device.\n",
- irq);
+ pn_dbg(2, "mace_interrupt(): irq 0x%X for unknown device.\n", irq);
return IRQ_NONE;
}
@@ -1129,7 +1122,7 @@ static irqreturn_t mace_interrupt(int ir
}
if (!netif_device_present(dev)) {
- DEBUG(2, "%s: interrupt from dead card\n", dev->name);
+ pn_dbg(2, "%s: interrupt from dead card\n", dev->name);
return IRQ_NONE;
}
@@ -1137,7 +1130,7 @@ static irqreturn_t mace_interrupt(int ir
/* WARNING: MACE_IR is a READ/CLEAR port! */
status = inb(ioaddr + AM2150_MACE_BASE + MACE_IR);
- DEBUG(3, "mace_interrupt: irq 0x%X status 0x%X.\n", irq, status);
+ pn_dbg(3, "mace_interrupt: irq 0x%X status 0x%X.\n", irq, status);
if (status & MACE_IR_RCVINT) {
mace_rx(dev, MACE_MAX_RX_ITERATIONS);
@@ -1256,8 +1249,8 @@ static int mace_rx(struct net_device *de
) {
rx_status = inw(ioaddr + AM2150_RCV);
- DEBUG(3, "%s: in mace_rx(), framecnt 0x%X, rx_status"
- " 0x%X.\n", dev->name, rx_framecnt, rx_status);
+ pn_dbg(3, "%s: in mace_rx(), framecnt 0x%X, rx_status"
+ " 0x%X.\n", dev->name, rx_framecnt, rx_status);
if (rx_status & MACE_RCVFS_RCVSTS) { /* Error, update stats. */
lp->linux_stats.rx_errors++;
@@ -1283,8 +1276,8 @@ static int mace_rx(struct net_device *de
lp->mace_stats.rfs_rcvcc += inb(ioaddr + AM2150_RCV);
/* rcv collision count */
- DEBUG(3, " receiving packet size 0x%X rx_status"
- " 0x%X.\n", pkt_len, rx_status);
+ pn_dbg(3, " receiving packet size 0x%X rx_status"
+ " 0x%X.\n", pkt_len, rx_status);
skb = dev_alloc_skb(pkt_len+2);
@@ -1305,8 +1298,8 @@ static int mace_rx(struct net_device *de
outb(0xFF, ioaddr + AM2150_RCV_NEXT); /* skip to next frame */
continue;
} else {
- DEBUG(1, "%s: couldn't allocate a sk_buff of size"
- " %d.\n", dev->name, pkt_len);
+ pn_dbg(1, "%s: couldn't allocate a sk_buff of size"
+ " %d.\n", dev->name, pkt_len);
lp->linux_stats.rx_dropped++;
}
}
@@ -1321,29 +1314,29 @@ pr_linux_stats
---------------------------------------------------------------------------- */
static void pr_linux_stats(struct net_device_stats *pstats)
{
- DEBUG(2, "pr_linux_stats\n");
- DEBUG(2, " rx_packets=%-7ld tx_packets=%ld\n",
- (long)pstats->rx_packets, (long)pstats->tx_packets);
- DEBUG(2, " rx_errors=%-7ld tx_errors=%ld\n",
- (long)pstats->rx_errors, (long)pstats->tx_errors);
- DEBUG(2, " rx_dropped=%-7ld tx_dropped=%ld\n",
- (long)pstats->rx_dropped, (long)pstats->tx_dropped);
- DEBUG(2, " multicast=%-7ld collisions=%ld\n",
- (long)pstats->multicast, (long)pstats->collisions);
-
- DEBUG(2, " rx_length_errors=%-7ld rx_over_errors=%ld\n",
- (long)pstats->rx_length_errors, (long)pstats->rx_over_errors);
- DEBUG(2, " rx_crc_errors=%-7ld rx_frame_errors=%ld\n",
- (long)pstats->rx_crc_errors, (long)pstats->rx_frame_errors);
- DEBUG(2, " rx_fifo_errors=%-7ld rx_missed_errors=%ld\n",
- (long)pstats->rx_fifo_errors, (long)pstats->rx_missed_errors);
-
- DEBUG(2, " tx_aborted_errors=%-7ld tx_carrier_errors=%ld\n",
- (long)pstats->tx_aborted_errors, (long)pstats->tx_carrier_errors);
- DEBUG(2, " tx_fifo_errors=%-7ld tx_heartbeat_errors=%ld\n",
- (long)pstats->tx_fifo_errors, (long)pstats->tx_heartbeat_errors);
- DEBUG(2, " tx_window_errors=%ld\n",
- (long)pstats->tx_window_errors);
+ pn_dbg(2, "pr_linux_stats\n");
+ pn_dbg(2, " rx_packets=%-7ld tx_packets=%ld\n",
+ (long)pstats->rx_packets, (long)pstats->tx_packets);
+ pn_dbg(2, " rx_errors=%-7ld tx_errors=%ld\n",
+ (long)pstats->rx_errors, (long)pstats->tx_errors);
+ pn_dbg(2, " rx_dropped=%-7ld tx_dropped=%ld\n",
+ (long)pstats->rx_dropped, (long)pstats->tx_dropped);
+ pn_dbg(2, " multicast=%-7ld collisions=%ld\n",
+ (long)pstats->multicast, (long)pstats->collisions);
+
+ pn_dbg(2, " rx_length_errors=%-7ld rx_over_errors=%ld\n",
+ (long)pstats->rx_length_errors, (long)pstats->rx_over_errors);
+ pn_dbg(2, " rx_crc_errors=%-7ld rx_frame_errors=%ld\n",
+ (long)pstats->rx_crc_errors, (long)pstats->rx_frame_errors);
+ pn_dbg(2, " rx_fifo_errors=%-7ld rx_missed_errors=%ld\n",
+ (long)pstats->rx_fifo_errors, (long)pstats->rx_missed_errors);
+
+ pn_dbg(2, " tx_aborted_errors=%-7ld tx_carrier_errors=%ld\n",
+ (long)pstats->tx_aborted_errors, (long)pstats->tx_carrier_errors);
+ pn_dbg(2, " tx_fifo_errors=%-7ld tx_heartbeat_errors=%ld\n",
+ (long)pstats->tx_fifo_errors, (long)pstats->tx_heartbeat_errors);
+ pn_dbg(2, " tx_window_errors=%ld\n",
+ (long)pstats->tx_window_errors);
} /* pr_linux_stats */
/* ----------------------------------------------------------------------------
@@ -1351,48 +1344,48 @@ pr_mace_stats
---------------------------------------------------------------------------- */
static void pr_mace_stats(mace_statistics *pstats)
{
- DEBUG(2, "pr_mace_stats\n");
+ pn_dbg(2, "pr_mace_stats\n");
- DEBUG(2, " xmtsv=%-7d uflo=%d\n",
- pstats->xmtsv, pstats->uflo);
- DEBUG(2, " lcol=%-7d more=%d\n",
- pstats->lcol, pstats->more);
- DEBUG(2, " one=%-7d defer=%d\n",
- pstats->one, pstats->defer);
- DEBUG(2, " lcar=%-7d rtry=%d\n",
- pstats->lcar, pstats->rtry);
+ pn_dbg(2, " xmtsv=%-7d uflo=%d\n",
+ pstats->xmtsv, pstats->uflo);
+ pn_dbg(2, " lcol=%-7d more=%d\n",
+ pstats->lcol, pstats->more);
+ pn_dbg(2, " one=%-7d defer=%d\n",
+ pstats->one, pstats->defer);
+ pn_dbg(2, " lcar=%-7d rtry=%d\n",
+ pstats->lcar, pstats->rtry);
/* MACE_XMTRC */
- DEBUG(2, " exdef=%-7d xmtrc=%d\n",
- pstats->exdef, pstats->xmtrc);
+ pn_dbg(2, " exdef=%-7d xmtrc=%d\n",
+ pstats->exdef, pstats->xmtrc);
/* RFS1--Receive Status (RCVSTS) */
- DEBUG(2, " oflo=%-7d clsn=%d\n",
- pstats->oflo, pstats->clsn);
- DEBUG(2, " fram=%-7d fcs=%d\n",
- pstats->fram, pstats->fcs);
+ pn_dbg(2, " oflo=%-7d clsn=%d\n",
+ pstats->oflo, pstats->clsn);
+ pn_dbg(2, " fram=%-7d fcs=%d\n",
+ pstats->fram, pstats->fcs);
/* RFS2--Runt Packet Count (RNTPC) */
/* RFS3--Receive Collision Count (RCVCC) */
- DEBUG(2, " rfs_rntpc=%-7d rfs_rcvcc=%d\n",
- pstats->rfs_rntpc, pstats->rfs_rcvcc);
+ pn_dbg(2, " rfs_rntpc=%-7d rfs_rcvcc=%d\n",
+ pstats->rfs_rntpc, pstats->rfs_rcvcc);
/* MACE_IR */
- DEBUG(2, " jab=%-7d babl=%d\n",
- pstats->jab, pstats->babl);
- DEBUG(2, " cerr=%-7d rcvcco=%d\n",
- pstats->cerr, pstats->rcvcco);
- DEBUG(2, " rntpco=%-7d mpco=%d\n",
- pstats->rntpco, pstats->mpco);
+ pn_dbg(2, " jab=%-7d babl=%d\n",
+ pstats->jab, pstats->babl);
+ pn_dbg(2, " cerr=%-7d rcvcco=%d\n",
+ pstats->cerr, pstats->rcvcco);
+ pn_dbg(2, " rntpco=%-7d mpco=%d\n",
+ pstats->rntpco, pstats->mpco);
/* MACE_MPC */
- DEBUG(2, " mpc=%d\n", pstats->mpc);
+ pn_dbg(2, " mpc=%d\n", pstats->mpc);
/* MACE_RNTPC */
- DEBUG(2, " rntpc=%d\n", pstats->rntpc);
+ pn_dbg(2, " rntpc=%d\n", pstats->rntpc);
/* MACE_RCVCC */
- DEBUG(2, " rcvcc=%d\n", pstats->rcvcc);
+ pn_dbg(2, " rcvcc=%d\n", pstats->rcvcc);
} /* pr_mace_stats */
@@ -1461,7 +1454,7 @@ static struct net_device_stats *mace_get
update_stats(dev->base_addr, dev);
- DEBUG(1, "%s: updating the statistics.\n", dev->name);
+ pn_dbg(1, "%s: updating the statistics.\n", dev->name);
pr_linux_stats(&lp->linux_stats);
pr_mace_stats(&lp->mace_stats);
@@ -1527,7 +1520,7 @@ static void BuildLAF(int *ladrf, int *ad
byte = hashcode >> 3;
ladrf[byte] |= (1 << (hashcode & 7));
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
if (pc_debug > 2) {
printk(KERN_DEBUG " adr =");
for (i = 0; i < 6; i++)
@@ -1558,12 +1551,12 @@ static void restore_multicast_list(struc
ioaddr_t ioaddr = dev->base_addr;
int i;
- DEBUG(2, "%s: restoring Rx mode to %d addresses.\n",
- dev->name, num_addrs);
+ pn_dbg(2, "%s: restoring Rx mode to %d addresses.\n",
+ dev->name, num_addrs);
if (num_addrs > 0) {
- DEBUG(1, "Attempt to restore multicast list detected.\n");
+ pn_dbg(1, "Attempt to restore multicast list detected.\n");
mace_write(lp, ioaddr, MACE_IAC, MACE_IAC_ADDRCHG | MACE_IAC_LOGADDR);
/* Poll ADDRCHG bit */
@@ -1614,13 +1607,13 @@ static void set_multicast_list(struct ne
int i;
struct dev_mc_list *dmi = dev->mc_list;
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
if (pc_debug > 1) {
static int old;
if (dev->mc_count != old) {
old = dev->mc_count;
- DEBUG(0, "%s: setting Rx mode to %d addresses.\n",
- dev->name, old);
+ pn_dbg(0, "%s: setting Rx mode to %d addresses.\n",
+ dev->name, old);
}
}
#endif
@@ -1650,8 +1643,8 @@ static void restore_multicast_list(struc
ioaddr_t ioaddr = dev->base_addr;
mace_private *lp = netdev_priv(dev);
- DEBUG(2, "%s: restoring Rx mode to %d addresses.\n", dev->name,
- lp->multicast_num_addrs);
+ pn_dbg(2, "%s: restoring Rx mode to %d addresses.\n", dev->name,
+ lp->multicast_num_addrs);
if (dev->flags & IFF_PROMISC) {
/* Promiscuous mode: receive all packets */
@@ -1670,13 +1663,13 @@ static void set_multicast_list(struct ne
{
mace_private *lp = netdev_priv(dev);
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
if (pc_debug > 1) {
static int old;
if (dev->mc_count != old) {
old = dev->mc_count;
- DEBUG(0, "%s: setting Rx mode to %d addresses.\n",
- dev->name, old);
+ pn_dbg(0, "%s: setting Rx mode to %d addresses.\n",
+ dev->name, old);
}
}
#endif
diff -puN drivers/net/pcmcia/pcnet_cs.c~pcmcia-network-drivers-cleanup drivers/net/pcmcia/pcnet_cs.c
--- 25/drivers/net/pcmcia/pcnet_cs.c~pcmcia-network-drivers-cleanup Thu Nov 4 15:04:58 2004
+++ 25-akpm/drivers/net/pcmcia/pcnet_cs.c Thu Nov 4 15:04:58 2004
@@ -52,6 +52,7 @@
#include <asm/system.h>
#include <asm/byteorder.h>
#include <asm/uaccess.h>
+#include "common.h"
#define PCNET_CMD 0x00
#define PCNET_DATAPORT 0x10 /* NatSemi-defined port window offset. */
@@ -69,14 +70,9 @@
static char *if_names[] = { "auto", "10baseT", "10base2"};
-#ifdef PCMCIA_DEBUG
-static int pc_debug = PCMCIA_DEBUG;
-MODULE_PARM(pc_debug, "i");
-#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
-static char *version =
+#ifdef DEBUG
+static char __attribute((unused)) *version =
"pcnet_cs.c 1.153 2003/11/09 18:53:09 (David Hinds)";
-#else
-#define DEBUG(n, args...)
#endif
/*====================================================================*/
@@ -87,24 +83,43 @@ MODULE_AUTHOR("David Hinds <dahinds@user
MODULE_DESCRIPTION("NE2000 compatible PCMCIA ethernet driver");
MODULE_LICENSE("GPL");
-#define INT_MODULE_PARM(n, v) static int n = v; MODULE_PARM(n, "i")
-
/* Bit map of interrupts to choose from */
-INT_MODULE_PARM(irq_mask, 0xdeb8);
+static int irq_mask = 0xdeb8;
+module_param(irq_mask, int, 0444);
static int irq_list[4] = { -1 };
-MODULE_PARM(irq_list, "1-4i");
+module_param_array(irq_list, int, NULL, 0444);
-INT_MODULE_PARM(if_port, 1); /* Transceiver type */
-INT_MODULE_PARM(use_big_buf, 1); /* use 64K packet buffer? */
-INT_MODULE_PARM(mem_speed, 0); /* shared mem speed, in ns */
-INT_MODULE_PARM(delay_output, 0); /* pause after xmit? */
-INT_MODULE_PARM(delay_time, 4); /* in usec */
-INT_MODULE_PARM(use_shmem, -1); /* use shared memory? */
-INT_MODULE_PARM(full_duplex, 0); /* full duplex? */
+/* Transceiver type */
+static int if_port = 1;
+module_param(if_port, int, 0444);
+
+/* use 64K packet buffer? */
+static int use_big_buf = 1;
+module_param(use_big_buf, int, 0444);
+
+/* shared mem speed, in ns */
+static int mem_speed; /* = 0 */
+module_param(mem_speed, int, 0444);
+
+/* pause after xmit? */
+static int delay_output; /* = 0 */
+module_param(delay_output, int, 0444);
+
+/* in usec */
+static int delay_time = 4;
+module_param(delay_time, int, 0444);
+
+/* use shared memory? */
+static int use_shmem = -1;
+module_param(use_shmem, int, 0444);
+
+/* full duplex ? */
+static int full_duplex; /* = 0 */
+module_param(full_duplex, int, 0444);
/* Ugh! Let the user hardwire the hardware address for queer cards */
static int hw_addr[6] = { 0, /* ... */ };
-MODULE_PARM(hw_addr, "6i");
+module_param_array(hw_addr, int, NULL, 0444);
/*====================================================================*/
@@ -258,7 +273,7 @@ static dev_link_t *pcnet_attach(void)
client_reg_t client_reg;
int i, ret;
- DEBUG(0, "pcnet_attach()\n");
+ pn_dbg(0, "pcnet_attach()\n");
/* Create new ethernet device */
dev = __alloc_ei_netdev(sizeof(pcnet_dev_t));
@@ -318,7 +333,7 @@ static void pcnet_detach(dev_link_t *lin
struct net_device *dev = link->priv;
dev_link_t **linkp;
- DEBUG(0, "pcnet_detach(0x%p)\n", link);
+ pn_dbg(0, "pcnet_detach(0x%p)\n", link);
/* Locate device structure */
for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
@@ -575,7 +590,7 @@ static void pcnet_config(dev_link_t *lin
config_info_t conf;
hw_info_t *hw_info;
- DEBUG(0, "pcnet_config(0x%p)\n", link);
+ pn_dbg(0, "pcnet_config(0x%p)\n", link);
tuple.Attributes = 0;
tuple.TupleData = (cisdata_t *)buf;
@@ -775,7 +790,7 @@ static void pcnet_release(dev_link_t *li
{
pcnet_dev_t *info = PRIV(link->priv);
- DEBUG(0, "pcnet_release(0x%p)\n", link);
+ pn_dbg(0, "pcnet_release(0x%p)\n", link);
if (info->flags & USE_SHMEM) {
iounmap(info->base);
@@ -803,7 +818,7 @@ static int pcnet_event(event_t event, in
dev_link_t *link = args->client_data;
struct net_device *dev = link->priv;
- DEBUG(2, "pcnet_event(0x%06x)\n", event);
+ pn_dbg(2, "pcnet_event(0x%06x)\n", event);
switch (event) {
case CS_EVENT_CARD_REMOVAL:
@@ -1057,7 +1072,7 @@ static void mii_phy_probe(struct net_dev
phyid = tmp << 16;
phyid |= mdio_read(mii_addr, i, MII_PHYID_REG2);
phyid &= MII_PHYID_REV_MASK;
- DEBUG(0, "%s: MII at %d is 0x%08x\n", dev->name, i, phyid);
+ pn_dbg(0, "%s: MII at %d is 0x%08x\n", dev->name, i, phyid);
if (phyid == AM79C9XX_HOME_PHY) {
info->pna_phy = i;
} else if (phyid != AM79C9XX_ETH_PHY) {
@@ -1071,7 +1086,7 @@ static int pcnet_open(struct net_device
pcnet_dev_t *info = PRIV(dev);
dev_link_t *link = &info->link;
- DEBUG(2, "pcnet_open('%s')\n", dev->name);
+ pn_dbg(2, "pcnet_open('%s')\n", dev->name);
if (!DEV_OK(link))
return -ENODEV;
@@ -1099,7 +1114,7 @@ static int pcnet_close(struct net_device
pcnet_dev_t *info = PRIV(dev);
dev_link_t *link = &info->link;
- DEBUG(2, "pcnet_close('%s')\n", dev->name);
+ pn_dbg(2, "pcnet_close('%s')\n", dev->name);
ei_close(dev);
free_irq(dev->irq, dev);
@@ -1339,7 +1354,7 @@ static void dma_block_input(struct net_d
int xfer_count = count;
char *buf = skb->data;
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
if ((ei_debug > 4) && (count != 4))
printk(KERN_DEBUG "%s: [bi=%d]\n", dev->name, count+4);
#endif
@@ -1363,7 +1378,7 @@ static void dma_block_input(struct net_d
/* This was for the ALPHA version only, but enough people have
encountering problems that it is still here. */
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
if (ei_debug > 4) { /* DMA termination address check... */
int addr, tries = 20;
do {
@@ -1392,12 +1407,12 @@ static void dma_block_output(struct net_
{
ioaddr_t nic_base = dev->base_addr;
pcnet_dev_t *info = PRIV(dev);
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
int retries = 0;
#endif
u_long dma_start;
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
if (ei_debug > 4)
printk(KERN_DEBUG "%s: [bo=%d]\n", dev->name, count);
#endif
@@ -1417,7 +1432,7 @@ static void dma_block_output(struct net_
/* We should already be in page 0, but to be safe... */
outb_p(E8390_PAGE0+E8390_START+E8390_NODMA, nic_base+PCNET_CMD);
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
retry:
#endif
@@ -1434,7 +1449,7 @@ static void dma_block_output(struct net_
dma_start = jiffies;
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
/* This was for the ALPHA version only, but enough people have
encountering problems that it is still here. */
if (ei_debug > 4) { /* DMA termination address check... */
@@ -1661,7 +1676,7 @@ static int __init init_pcnet_cs(void)
static void __exit exit_pcnet_cs(void)
{
- DEBUG(0, "pcnet_cs: unloading\n");
+ pn_dbg(0, "pcnet_cs: unloading\n");
pcmcia_unregister_driver(&pcnet_driver);
BUG_ON(dev_list != NULL);
}
diff -puN drivers/net/pcmcia/smc91c92_cs.c~pcmcia-network-drivers-cleanup drivers/net/pcmcia/smc91c92_cs.c
--- 25/drivers/net/pcmcia/smc91c92_cs.c~pcmcia-network-drivers-cleanup Thu Nov 4 15:04:58 2004
+++ 25-akpm/drivers/net/pcmcia/smc91c92_cs.c Thu Nov 4 15:04:58 2004
@@ -53,6 +53,7 @@
#include <asm/io.h>
#include <asm/system.h>
#include <asm/uaccess.h>
+#include "common.h"
/* Ositech Seven of Diamonds firmware */
#include "ositech.h"
@@ -66,7 +67,11 @@ static char *if_names[] = { "auto", "10b
MODULE_DESCRIPTION("SMC 91c92 series PCMCIA ethernet driver");
MODULE_LICENSE("GPL");
-#define INT_MODULE_PARM(n, v) static int n = v; MODULE_PARM(n, "i")
+/* Bit map of interrupts to choose from */
+static int irq_mask = 0xdeb8;
+module_param(irq_mask, int, 0444);
+static int irq_list[4] = { -1 };
+module_param_array(irq_list, int, NULL, 0444);
/*
Transceiver/media type.
@@ -74,20 +79,12 @@ MODULE_LICENSE("GPL");
1 = 10baseT (and autoselect if #define AUTOSELECT),
2 = AUI/10base2,
*/
-INT_MODULE_PARM(if_port, 0);
-
-/* Bit map of interrupts to choose from. */
-INT_MODULE_PARM(irq_mask, 0xdeb8);
-static int irq_list[4] = { -1 };
-MODULE_PARM(irq_list, "1-4i");
+static int if_port; /* = 0 */
+module_param(if_port, int, 0444);
-#ifdef PCMCIA_DEBUG
-INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG);
-static const char *version =
+#ifdef DEBUG
+static char __attribute((unused)) *version =
"smc91c92_cs.c 0.09 1996/8/4 Donald Becker, becker@scyld.com.\n";
-#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
-#else
-#define DEBUG(n, args...)
#endif
#define DRV_NAME "smc91c92_cs"
@@ -322,7 +319,7 @@ static dev_link_t *smc91c92_attach(void)
struct net_device *dev;
int i, ret;
- DEBUG(0, "smc91c92_attach()\n");
+ pn_dbg(0, "smc91c92_attach()\n");
/* Create new ethernet device */
dev = alloc_etherdev(sizeof(struct smc_private));
@@ -405,7 +402,7 @@ static void smc91c92_detach(dev_link_t *
struct net_device *dev = link->priv;
dev_link_t **linkp;
- DEBUG(0, "smc91c92_detach(0x%p)\n", link);
+ pn_dbg(0, "smc91c92_detach(0x%p)\n", link);
/* Locate device structure */
for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
@@ -821,9 +818,9 @@ static int osi_setup(dev_link_t *link, u
set_bits(0x300, link->io.BasePort1 + OSITECH_AUI_PWR);
/* Now, turn on the interrupt for both card functions */
set_bits(0x300, link->io.BasePort1 + OSITECH_RESET_ISR);
- DEBUG(2, "AUI/PWR: %4.4x RESET/ISR: %4.4x\n",
- inw(link->io.BasePort1 + OSITECH_AUI_PWR),
- inw(link->io.BasePort1 + OSITECH_RESET_ISR));
+ pn_dbg(2, "AUI/PWR: %4.4x RESET/ISR: %4.4x\n",
+ inw(link->io.BasePort1 + OSITECH_AUI_PWR),
+ inw(link->io.BasePort1 + OSITECH_RESET_ISR));
}
return 0;
@@ -902,11 +899,11 @@ static void smc91c92_config(dev_link_t *
cisparse_t parse;
u_short buf[32];
char *name;
- int i, j, rev;
+ int i, j = 0, rev;
ioaddr_t ioaddr;
u_long mir;
- DEBUG(0, "smc91c92_config(0x%p)\n", link);
+ pn_dbg(0, "smc91c92_config(0x%p)\n", link);
tuple.Attributes = tuple.TupleOffset = 0;
tuple.TupleData = (cisdata_t *)buf;
@@ -1051,8 +1048,8 @@ static void smc91c92_config(dev_link_t *
if (smc->cfg & CFG_MII_SELECT) {
if (smc->mii_if.phy_id != -1) {
- DEBUG(0, " MII transceiver at index %d, status %x.\n",
- smc->mii_if.phy_id, j);
+ pn_dbg(0, " MII transceiver at index %d, status %x.\n",
+ smc->mii_if.phy_id, j);
} else {
printk(KERN_NOTICE " No MII transceivers found!\n");
}
@@ -1079,7 +1076,7 @@ config_failed: /* CS_EXIT_TEST() calls
static void smc91c92_release(dev_link_t *link)
{
- DEBUG(0, "smc91c92_release(0x%p)\n", link);
+ pn_dbg(0, "smc91c92_release(0x%p)\n", link);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
@@ -1111,7 +1108,7 @@ static int smc91c92_event(event_t event,
struct smc_private *smc = netdev_priv(dev);
int i;
- DEBUG(1, "smc91c92_event(0x%06x)\n", event);
+ pn_dbg(1, "smc91c92_event(0x%06x)\n", event);
switch (event) {
case CS_EVENT_CARD_REMOVAL:
@@ -1236,7 +1233,7 @@ static void mdio_write(struct net_device
======================================================================*/
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
static void smc_dump(struct net_device *dev)
{
ioaddr_t ioaddr = dev->base_addr;
@@ -1258,9 +1255,9 @@ static int smc_open(struct net_device *d
struct smc_private *smc = netdev_priv(dev);
dev_link_t *link = &smc->link;
-#ifdef PCMCIA_DEBUG
- DEBUG(0, "%s: smc_open(%p), ID/Window %4.4x.\n",
- dev->name, dev, inw(dev->base_addr + BANK_SELECT));
+#ifdef DEBUG
+ pn_dbg(0, "%s: smc_open(%p), ID/Window %4.4x.\n",
+ dev->name, dev, inw(dev->base_addr + BANK_SELECT));
if (pc_debug > 1) smc_dump(dev);
#endif
@@ -1296,8 +1293,8 @@ static int smc_close(struct net_device *
dev_link_t *link = &smc->link;
ioaddr_t ioaddr = dev->base_addr;
- DEBUG(0, "%s: smc_close(), status %4.4x.\n",
- dev->name, inw(ioaddr + BANK_SELECT));
+ pn_dbg(0, "%s: smc_close(), status %4.4x.\n",
+ dev->name, inw(ioaddr + BANK_SELECT));
netif_stop_queue(dev);
@@ -1363,8 +1360,8 @@ static void smc_hardware_send_packet(str
u_char *buf = skb->data;
u_int length = skb->len; /* The chip will pad to ethernet min. */
- DEBUG(2, "%s: Trying to xmit packet of length %d.\n",
- dev->name, length);
+ pn_dbg(2, "%s: Trying to xmit packet of length %d.\n",
+ dev->name, length);
/* send the packet length: +6 for status word, length, and ctl */
outw(0, ioaddr + DATA_1);
@@ -1416,8 +1413,8 @@ static int smc_start_xmit(struct sk_buff
netif_stop_queue(dev);
- DEBUG(2, "%s: smc_start_xmit(length = %d) called,"
- " status %4.4x.\n", dev->name, skb->len, inw(ioaddr + 2));
+ pn_dbg(2, "%s: smc_start_xmit(length = %d) called,"
+ " status %4.4x.\n", dev->name, skb->len, inw(ioaddr + 2));
if (smc->saved_skb) {
/* THIS SHOULD NEVER HAPPEN. */
@@ -1461,7 +1458,7 @@ static int smc_start_xmit(struct sk_buff
}
/* Otherwise defer until the Tx-space-allocated interrupt. */
- DEBUG(2, "%s: memory allocation deferred.\n", dev->name);
+ pn_dbg(2, "%s: memory allocation deferred.\n", dev->name);
outw((IM_ALLOC_INT << 8) | (ir & 0xff00), ioaddr + INTERRUPT);
return 0;
@@ -1525,8 +1522,8 @@ static void smc_eph_irq(struct net_devic
SMC_SELECT_BANK(0);
ephs = inw(ioaddr + EPH);
- DEBUG(2, "%s: Ethernet protocol handler interrupt, status"
- " %4.4x.\n", dev->name, ephs);
+ pn_dbg(2, "%s: Ethernet protocol handler interrupt, status"
+ " %4.4x.\n", dev->name, ephs);
/* Could be a counter roll-over warning: update stats. */
card_stats = inw(ioaddr + COUNTER);
/* single collisions */
@@ -1565,16 +1562,16 @@ static irqreturn_t smc_interrupt(int irq
ioaddr = dev->base_addr;
- DEBUG(3, "%s: SMC91c92 interrupt %d at %#x.\n", dev->name,
- irq, ioaddr);
+ pn_dbg(3, "%s: SMC91c92 interrupt %d at %#x.\n", dev->name,
+ irq, ioaddr);
smc->watchdog = 0;
saved_bank = inw(ioaddr + BANK_SELECT);
if ((saved_bank & 0xff00) != 0x3300) {
/* The device does not exist -- the card could be off-line, or
maybe it has been ejected. */
- DEBUG(1, "%s: SMC91c92 interrupt %d for non-existent"
- "/ejected device.\n", dev->name, irq);
+ pn_dbg(1, "%s: SMC91c92 interrupt %d for non-existent"
+ "/ejected device.\n", dev->name, irq);
handled = 0;
goto irq_done;
}
@@ -1587,8 +1584,8 @@ static irqreturn_t smc_interrupt(int irq
do { /* read the status flag, and mask it */
status = inw(ioaddr + INTERRUPT) & 0xff;
- DEBUG(3, "%s: Status is %#2.2x (mask %#2.2x).\n", dev->name,
- status, mask);
+ pn_dbg(3, "%s: Status is %#2.2x (mask %#2.2x).\n", dev->name,
+ status, mask);
if ((status & mask) == 0) {
if (bogus_cnt == INTR_WORK)
handled = 0;
@@ -1632,15 +1629,15 @@ static irqreturn_t smc_interrupt(int irq
smc_eph_irq(dev);
} while (--bogus_cnt);
- DEBUG(3, " Restoring saved registers mask %2.2x bank %4.4x"
- " pointer %4.4x.\n", mask, saved_bank, saved_pointer);
+ pn_dbg(3, " Restoring saved registers mask %2.2x bank %4.4x"
+ " pointer %4.4x.\n", mask, saved_bank, saved_pointer);
/* restore state register */
outw((mask<<8), ioaddr + INTERRUPT);
outw(saved_pointer, ioaddr + POINTER);
SMC_SELECT_BANK(saved_bank);
- DEBUG(3, "%s: Exiting interrupt IRQ%d.\n", dev->name, irq);
+ pn_dbg(3, "%s: Exiting interrupt IRQ%d.\n", dev->name, irq);
irq_done:
@@ -1691,8 +1688,8 @@ static void smc_rx(struct net_device *de
rx_status = inw(ioaddr + DATA_1);
packet_length = inw(ioaddr + DATA_1) & 0x07ff;
- DEBUG(2, "%s: Receive status %4.4x length %d.\n",
- dev->name, rx_status, packet_length);
+ pn_dbg(2, "%s: Receive status %4.4x length %d.\n",
+ dev->name, rx_status, packet_length);
if (!(rx_status & RS_ERRORS)) {
/* do stuff to make a new packet */
@@ -1702,7 +1699,7 @@ static void smc_rx(struct net_device *de
skb = dev_alloc_skb(packet_length+2);
if (skb == NULL) {
- DEBUG(1, "%s: Low memory, packet dropped.\n", dev->name);
+ pn_dbg(1, "%s: Low memory, packet dropped.\n", dev->name);
smc->stats.rx_dropped++;
outw(MC_RELEASE, ioaddr + MMU_CMD);
return;
@@ -1873,7 +1870,7 @@ static void smc_reset(struct net_device
struct smc_private *smc = netdev_priv(dev);
int i;
- DEBUG(0, "%s: smc91c92 reset called.\n", dev->name);
+ pn_dbg(0, "%s: smc91c92 reset called.\n", dev->name);
/* The first interaction must be a write to bring the chip out
of sleep mode. */
@@ -2185,7 +2182,7 @@ static u32 smc_get_link(struct net_devic
return ret;
}
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
static u32 smc_get_msglevel(struct net_device *dev)
{
return pc_debug;
@@ -2220,7 +2217,7 @@ static struct ethtool_ops ethtool_ops =
.get_settings = smc_get_settings,
.set_settings = smc_set_settings,
.get_link = smc_get_link,
-#ifdef PCMCIA_DEBUG
+#ifdef DEBUG
.get_msglevel = smc_get_msglevel,
.set_msglevel = smc_set_msglevel,
#endif
diff -puN drivers/net/pcmcia/xirc2ps_cs.c~pcmcia-network-drivers-cleanup drivers/net/pcmcia/xirc2ps_cs.c
--- 25/drivers/net/pcmcia/xirc2ps_cs.c~pcmcia-network-drivers-cleanup Thu Nov 4 15:04:58 2004
+++ 25-akpm/drivers/net/pcmcia/xirc2ps_cs.c Thu Nov 4 15:04:58 2004
@@ -91,6 +91,7 @@
#include <asm/io.h>
#include <asm/system.h>
#include <asm/uaccess.h>
+#include "common.h"
#ifndef MANFID_COMPAQ
#define MANFID_COMPAQ 0x0138
@@ -211,21 +212,6 @@ enum xirc_cmd { /* Commands */
static char *if_names[] = { "Auto", "10BaseT", "10Base2", "AUI", "100BaseT" };
-/****************
- * All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If
- * you do not define PCMCIA_DEBUG at all, all the debug code will be
- * left out. If you compile with PCMCIA_DEBUG=0, the debug code will
- * be present but disabled -- but it can then be enabled for specific
- * modules at load time with a 'pc_debug=#' option to insmod.
- */
-#ifdef PCMCIA_DEBUG
-static int pc_debug = PCMCIA_DEBUG;
-MODULE_PARM(pc_debug, "i");
-#define DEBUG(n, args...) if (pc_debug>(n)) printk(KDBG_XIRC args)
-#else
-#define DEBUG(n, args...)
-#endif
-
#define KDBG_XIRC KERN_DEBUG "xirc2ps_cs: "
#define KERR_XIRC KERN_ERR "xirc2ps_cs: "
#define KWRN_XIRC KERN_WARNING "xirc2ps_cs: "
@@ -255,15 +241,23 @@ MODULE_PARM(pc_debug, "i");
MODULE_DESCRIPTION("Xircom PCMCIA ethernet driver");
MODULE_LICENSE("Dual MPL/GPL");
-#define INT_MODULE_PARM(n, v) static int n = v; MODULE_PARM(n, "i")
-
+/* Bit map of interrupts to choose from */
+static int irq_mask = 0xdeb8;
+module_param(irq_mask, int, 0444);
static int irq_list[4] = { -1 };
-MODULE_PARM(irq_list, "1-4i");
-INT_MODULE_PARM(irq_mask, 0xdeb8);
-INT_MODULE_PARM(if_port, 0);
-INT_MODULE_PARM(full_duplex, 0);
-INT_MODULE_PARM(do_sound, 1);
-INT_MODULE_PARM(lockup_hack, 0); /* anti lockup hack */
+module_param_array(irq_list, int, NULL, 0444);
+
+static int if_port; /* = 0 */
+module_param(if_port, int, 0444);
+
+static int full_duplex; /* = 0 */
+module_param(full_duplex, int, 0444);
+
+static int do_sound = 1;
+module_param(do_sound, int, 0444);
+
+static int lockup_hack; /* = 0 */
+module_param(lockup_hack, int, 0444);
/*====================================================================*/
@@ -424,7 +418,7 @@ next_tuple(client_handle_t handle, tuple
} while (0)
/*====== Functions used for debugging =================================*/
-#if defined(PCMCIA_DEBUG) && 0 /* reading regs may change system status */
+#if defined(DEBUG) && 0 /* reading regs may change system status */
static void
PrintRegisters(struct net_device *dev)
{
@@ -456,7 +450,7 @@ PrintRegisters(struct net_device *dev)
}
}
}
-#endif /* PCMCIA_DEBUG */
+#endif /* DEBUG */
/*============== MII Management functions ===============*/
@@ -589,7 +583,7 @@ xirc2ps_attach(void)
local_info_t *local;
int err;
- DEBUG(0, "attach()\n");
+ pn_dbg(0, "attach()\n");
/* Allocate the device structure */
dev = alloc_etherdev(sizeof(local_info_t));
@@ -657,14 +651,14 @@ xirc2ps_detach(dev_link_t * link)
struct net_device *dev = link->priv;
dev_link_t **linkp;
- DEBUG(0, "detach(0x%p)\n", link);
+ pn_dbg(0, "detach(0x%p)\n", link);
/* Locate device structure */
for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
if (*linkp == link)
break;
if (!*linkp) {
- DEBUG(0, "detach(0x%p): dev_link lost\n", link);
+ pn_dbg(0, "detach(0x%p): dev_link lost\n", link);
return;
}
@@ -712,14 +706,14 @@ set_card_type(dev_link_t *link, const vo
{
struct net_device *dev = link->priv;
local_info_t *local = netdev_priv(dev);
- #ifdef PCMCIA_DEBUG
+ #ifdef DEBUG
unsigned cisrev = ((const unsigned char *)s)[2];
#endif
unsigned mediaid= ((const unsigned char *)s)[3];
unsigned prodid = ((const unsigned char *)s)[4];
- DEBUG(0, "cisrev=%02x mediaid=%02x prodid=%02x\n",
- cisrev, mediaid, prodid);
+ pn_dbg(0, "cisrev=%02x mediaid=%02x prodid=%02x\n",
+ cisrev, mediaid, prodid);
local->mohawk = 0;
local->dingo = 0;
@@ -817,7 +811,7 @@ xirc2ps_config(dev_link_t * link)
local->dingo_ccr = NULL;
- DEBUG(0, "config(0x%p)\n", link);
+ pn_dbg(0, "config(0x%p)\n", link);
/*
* This reads the card's CONFIG tuple to find its configuration
@@ -857,7 +851,7 @@ xirc2ps_config(dev_link_t * link)
(unsigned)parse.manfid.manf);
goto failure;
}
- DEBUG(0, "found %s card\n", local->manf_str);
+ pn_dbg(0, "found %s card\n", local->manf_str);
if (!set_card_type(link, buf)) {
printk(KNOT_XIRC "this card is not supported\n");
@@ -1160,7 +1154,7 @@ static void
xirc2ps_release(dev_link_t *link)
{
- DEBUG(0, "release(0x%p)\n", link);
+ pn_dbg(0, "release(0x%p)\n", link);
if (link->win) {
struct net_device *dev = link->priv;
@@ -1197,11 +1191,11 @@ xirc2ps_event(event_t event, int priorit
dev_link_t *link = args->client_data;
struct net_device *dev = link->priv;
- DEBUG(0, "event(%d)\n", (int)event);
+ pn_dbg(0, "event(%d)\n", (int)event);
switch (event) {
case CS_EVENT_REGISTRATION_COMPLETE:
- DEBUG(0, "registration complete\n");
+ pn_dbg(0, "registration complete\n");
break;
case CS_EVENT_CARD_REMOVAL:
link->state &= ~DEV_PRESENT;
@@ -1268,7 +1262,7 @@ xirc2ps_interrupt(int irq, void *dev_id,
PutByte(XIRCREG_CR, 0);
}
- DEBUG(6, "%s: interrupt %d at %#x.\n", dev->name, irq, ioaddr);
+ pn_dbg(6, "%s: interrupt %d at %#x.\n", dev->name, irq, ioaddr);
saved_page = GetByte(XIRCREG_PR);
/* Read the ISR to see whats the cause for the interrupt.
@@ -1278,7 +1272,7 @@ xirc2ps_interrupt(int irq, void *dev_id,
bytes_rcvd = 0;
loop_entry:
if (int_status == 0xff) { /* card may be ejected */
- DEBUG(3, "%s: interrupt %d for dead card\n", dev->name, irq);
+ pn_dbg(3, "%s: interrupt %d for dead card\n", dev->name, irq);
goto leave;
}
eth_status = GetByte(XIRCREG_ESR);
@@ -1291,8 +1285,8 @@ xirc2ps_interrupt(int irq, void *dev_id,
PutByte(XIRCREG40_TXST0, 0);
PutByte(XIRCREG40_TXST1, 0);
- DEBUG(3, "%s: ISR=%#2.2x ESR=%#2.2x RSR=%#2.2x TSR=%#4.4x\n",
- dev->name, int_status, eth_status, rx_status, tx_status);
+ pn_dbg(3, "%s: ISR=%#2.2x ESR=%#2.2x RSR=%#2.2x TSR=%#4.4x\n",
+ dev->name, int_status, eth_status, rx_status, tx_status);
/***** receive section ******/
SelectPage(0);
@@ -1302,14 +1296,14 @@ xirc2ps_interrupt(int irq, void *dev_id,
/* too many bytes received during this int, drop the rest of the
* packets */
lp->stats.rx_dropped++;
- DEBUG(2, "%s: RX drop, too much done\n", dev->name);
+ pn_dbg(2, "%s: RX drop, too much done\n", dev->name);
} else if (rsr & PktRxOk) {
struct sk_buff *skb;
pktlen = GetWord(XIRCREG0_RBC);
bytes_rcvd += pktlen;
- DEBUG(5, "rsr=%#02x packet_length=%u\n", rsr, pktlen);
+ pn_dbg(5, "rsr=%#02x packet_length=%u\n", rsr, pktlen);
skb = dev_alloc_skb(pktlen+3); /* 1 extra so we can use insw */
if (!skb) {
@@ -1379,19 +1373,19 @@ xirc2ps_interrupt(int irq, void *dev_id,
lp->stats.multicast++;
}
} else { /* bad packet */
- DEBUG(5, "rsr=%#02x\n", rsr);
+ pn_dbg(5, "rsr=%#02x\n", rsr);
}
if (rsr & PktTooLong) {
lp->stats.rx_frame_errors++;
- DEBUG(3, "%s: Packet too long\n", dev->name);
+ pn_dbg(3, "%s: Packet too long\n", dev->name);
}
if (rsr & CRCErr) {
lp->stats.rx_crc_errors++;
- DEBUG(3, "%s: CRC error\n", dev->name);
+ pn_dbg(3, "%s: CRC error\n", dev->name);
}
if (rsr & AlignErr) {
lp->stats.rx_fifo_errors++; /* okay ? */
- DEBUG(3, "%s: Alignment error\n", dev->name);
+ pn_dbg(3, "%s: Alignment error\n", dev->name);
}
/* clear the received/dropped/error packet */
@@ -1403,7 +1397,7 @@ xirc2ps_interrupt(int irq, void *dev_id,
if (rx_status & 0x10) { /* Receive overrun */
lp->stats.rx_over_errors++;
PutByte(XIRCREG_CR, ClearRxOvrun);
- DEBUG(3, "receive overrun cleared\n");
+ pn_dbg(3, "receive overrun cleared\n");
}
/***** transmit section ******/
@@ -1416,13 +1410,13 @@ xirc2ps_interrupt(int irq, void *dev_id,
if (nn < n) /* rollover */
lp->stats.tx_packets += 256 - n;
else if (n == nn) { /* happens sometimes - don't know why */
- DEBUG(0, "PTR not changed?\n");
+ pn_dbg(0, "PTR not changed?\n");
} else
lp->stats.tx_packets += lp->last_ptr_value - n;
netif_wake_queue(dev);
}
if (tx_status & 0x0002) { /* Execessive collissions */
- DEBUG(0, "tx restarted due to execssive collissions\n");
+ pn_dbg(0, "tx restarted due to execssive collissions\n");
PutByte(XIRCREG_CR, RestartTx); /* restart transmitter process */
}
if (tx_status & 0x0040)
@@ -1441,14 +1435,14 @@ xirc2ps_interrupt(int irq, void *dev_id,
maxrx_bytes = 2000;
else if (maxrx_bytes > 22000)
maxrx_bytes = 22000;
- DEBUG(1, "set maxrx=%u (rcvd=%u ticks=%lu)\n",
- maxrx_bytes, bytes_rcvd, duration);
+ pn_dbg(1, "set maxrx=%u (rcvd=%u ticks=%lu)\n",
+ maxrx_bytes, bytes_rcvd, duration);
} else if (!duration && maxrx_bytes < 22000) {
/* now much faster */
maxrx_bytes += 2000;
if (maxrx_bytes > 22000)
maxrx_bytes = 22000;
- DEBUG(1, "set maxrx=%u\n", maxrx_bytes);
+ pn_dbg(1, "set maxrx=%u\n", maxrx_bytes);
}
}
@@ -1489,8 +1483,8 @@ do_start_xmit(struct sk_buff *skb, struc
unsigned freespace;
unsigned pktlen = skb? skb->len : 0;
- DEBUG(1, "do_start_xmit(skb=%p, dev=%p) len=%u\n",
- skb, dev, pktlen);
+ pn_dbg(1, "do_start_xmit(skb=%p, dev=%p) len=%u\n",
+ skb, dev, pktlen);
/* adjust the packet length to min. required
@@ -1516,8 +1510,8 @@ do_start_xmit(struct sk_buff *skb, struc
freespace &= 0x7fff;
/* TRS doesn't work - (indeed it is eliminated with sil-rev 1) */
okay = pktlen +2 < freespace;
- DEBUG(2 + (okay ? 2 : 0), "%s: avail. tx space=%u%s\n",
- dev->name, freespace, okay ? " (okay)":" (not enough)");
+ pn_dbg(2 + (okay ? 2 : 0), "%s: avail. tx space=%u%s\n",
+ dev->name, freespace, okay ? " (okay)":" (not enough)");
if (!okay) { /* not enough space */
return 1; /* upper layer may decide to requeue this packet */
}
@@ -1622,7 +1616,7 @@ do_config(struct net_device *dev, struct
{
local_info_t *local = netdev_priv(dev);
- DEBUG(0, "do_config(%p)\n", dev);
+ pn_dbg(0, "do_config(%p)\n", dev);
if (map->port != 255 && map->port != dev->if_port) {
if (map->port > 4)
return -EINVAL;
@@ -1649,7 +1643,7 @@ do_open(struct net_device *dev)
local_info_t *lp = netdev_priv(dev);
dev_link_t *link = &lp->link;
- DEBUG(0, "do_open(%p)\n", dev);
+ pn_dbg(0, "do_open(%p)\n", dev);
/* Check that the PCMCIA card is still here. */
/* Physical device present signature. */
@@ -1683,9 +1677,9 @@ do_ioctl(struct net_device *dev, struct
ioaddr_t ioaddr = dev->base_addr;
u16 *data = (u16 *)&rq->ifr_ifru;
- DEBUG(1, "%s: ioctl(%-.6s, %#04x) %04x %04x %04x %04x\n",
- dev->name, rq->ifr_ifrn.ifrn_name, cmd,
- data[0], data[1], data[2], data[3]);
+ pn_dbg(1, "%s: ioctl(%-.6s, %#04x) %04x %04x %04x %04x\n",
+ dev->name, rq->ifr_ifrn.ifrn_name, cmd,
+ data[0], data[1], data[2], data[3]);
if (!local->mohawk)
return -EOPNOTSUPP;
@@ -1732,7 +1726,7 @@ do_reset(struct net_device *dev, int ful
ioaddr_t ioaddr = dev->base_addr;
unsigned value;
- DEBUG(0, "%s: do_reset(%p,%d)\n", dev? dev->name:"eth?", dev, full);
+ pn_dbg(0, "%s: do_reset(%p,%d)\n", dev? dev->name:"eth?", dev, full);
hardreset(dev);
PutByte(XIRCREG_CR, SoftReset); /* set */
@@ -1770,7 +1764,7 @@ do_reset(struct net_device *dev, int ful
}
Wait(HZ/25); /* wait 40 msec to let it complete */
- #ifdef PCMCIA_DEBUG
+ #ifdef DEBUG
if (pc_debug) {
SelectPage(0);
value = GetByte(XIRCREG_ESR); /* read the ESR */
@@ -1788,7 +1782,7 @@ do_reset(struct net_device *dev, int ful
value |= DisableLinkPulse;
PutByte(XIRCREG1_ECR, value);
#endif
- DEBUG(0, "%s: ECR is: %#02x\n", dev->name, value);
+ pn_dbg(0, "%s: ECR is: %#02x\n", dev->name, value);
SelectPage(0x42);
PutByte(XIRCREG42_SWC0, 0x20); /* disable source insertion */
@@ -1965,7 +1959,7 @@ do_powerdown(struct net_device *dev)
ioaddr_t ioaddr = dev->base_addr;
- DEBUG(0, "do_powerdown(%p)\n", dev);
+ pn_dbg(0, "do_powerdown(%p)\n", dev);
SelectPage(4);
PutByte(XIRCREG4_GPR1, 0); /* clear bit 0: power down */
@@ -1979,7 +1973,7 @@ do_stop(struct net_device *dev)
local_info_t *lp = netdev_priv(dev);
dev_link_t *link = &lp->link;
- DEBUG(0, "do_stop(%p)\n", dev);
+ pn_dbg(0, "do_stop(%p)\n", dev);
if (!link)
return -ENODEV;
_