* Re: [PATCH 437] Amiga eth%d
2004-04-13 16:33 ` Jeff Garzik
@ 2004-04-18 17:52 ` Geert Uytterhoeven
2004-04-18 17:55 ` Geert Uytterhoeven
2004-04-18 17:53 ` Geert Uytterhoeven
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Geert Uytterhoeven @ 2004-04-18 17:52 UTC (permalink / raw)
To: Jeff Garzik
Cc: Andrew Morton, Linus Torvalds, Linux Kernel Development,
Linux/m68k
On Tue, 13 Apr 2004, Jeff Garzik wrote:
> As a further change, can you please add KERN_xxx prefixes to those printk's?
Do these look OK?
To: akpm, linus, jeff
Cc: lkml
Subject: [PATCH] Amiga A2065 Ethernet KERN_*
Amiga A2065 Ethernet: Add KERN_* prefixes to printk() messages
--- linux-2.6.6-rc1/drivers/net/a2065.c 2004-04-16 13:38:47.000000000 +0200
+++ linux-m68k-2.6.6-rc1/drivers/net/a2065.c 2004-04-16 13:37:55.000000000 +0200
@@ -190,7 +190,7 @@
ib->phys_addr [5] = dev->dev_addr [4];
if (ZERO)
- printk ("TX rings:\n");
+ printk(KERN_DEBUG "TX rings:\n");
/* Setup the Tx ring entries */
for (i = 0; i <= (1<<lp->lance_log_tx_bufs); i++) {
@@ -200,13 +200,13 @@
ib->btx_ring [i].tmd1_bits = 0;
ib->btx_ring [i].length = 0xf000; /* The ones required by tmd2 */
ib->btx_ring [i].misc = 0;
- if (i < 3)
- if (ZERO) printk ("%d: 0x%8.8x\n", i, leptr);
+ if (i < 3 && ZERO)
+ printk(KERN_DEBUG "%d: 0x%8.8x\n", i, leptr);
}
/* Setup the Rx ring entries */
if (ZERO)
- printk ("RX rings:\n");
+ printk(KERN_DEBUG "RX rings:\n");
for (i = 0; i < (1<<lp->lance_log_rx_bufs); i++) {
leptr = LANCE_ADDR(&aib->rx_buf[i][0]);
@@ -216,7 +216,7 @@
ib->brx_ring [i].length = -RX_BUFF_SIZE | 0xf000;
ib->brx_ring [i].mblength = 0;
if (i < 3 && ZERO)
- printk ("%d: 0x%8.8x\n", i, leptr);
+ printk(KERN_DEBUG "%d: 0x%8.8x\n", i, leptr);
}
/* Setup the initialization block */
@@ -226,14 +226,14 @@
ib->rx_len = (lp->lance_log_rx_bufs << 13) | (leptr >> 16);
ib->rx_ptr = leptr;
if (ZERO)
- printk ("RX ptr: %8.8x\n", leptr);
+ printk(KERN_DEBUG "RX ptr: %8.8x\n", leptr);
/* Setup tx descriptor pointer */
leptr = LANCE_ADDR(&aib->btx_ring);
ib->tx_len = (lp->lance_log_tx_bufs << 13) | (leptr >> 16);
ib->tx_ptr = leptr;
if (ZERO)
- printk ("TX ptr: %8.8x\n", leptr);
+ printk(KERN_DEBUG "TX ptr: %8.8x\n", leptr);
/* Clear the multicast filter */
ib->filter [0] = 0;
@@ -252,7 +252,8 @@
for (i = 0; (i < 100) && !(ll->rdp & (LE_C0_ERR | LE_C0_IDON)); i++)
barrier();
if ((i == 100) || (ll->rdp & LE_C0_ERR)) {
- printk ("LANCE unopened after %d ticks, csr0=%4.4x.\n", i, ll->rdp);
+ printk(KERN_ERR "LANCE unopened after %d ticks, csr0=%4.4x.\n",
+ i, ll->rdp);
return -EIO;
}
@@ -275,7 +276,7 @@
#ifdef TEST_HITS
int i;
- printk ("[");
+ printk(KERN_DEBUG "[");
for (i = 0; i < RX_RING_SIZE; i++) {
if (i == lp->rx_new)
printk ("%s",
@@ -284,7 +285,7 @@
printk ("%s",
ib->brx_ring [i].rmd1_bits & LE_R1_OWN ? "." : "1");
}
- printk ("]");
+ printk ("]\n");
#endif
ll->rdp = LE_C0_RINT|LE_C0_INEA;
@@ -311,8 +312,8 @@
skb = dev_alloc_skb (len+2);
if (skb == 0) {
- printk ("%s: Memory squeeze, deferring packet.\n",
- dev->name);
+ printk(KERN_WARNING "%s: Memory squeeze, "
+ "deferring packet.\n", dev->name);
lp->stats.rx_dropped++;
rd->mblength = 0;
rd->rmd1_bits = LE_R1_OWN;
@@ -373,8 +374,9 @@
lp->stats.tx_carrier_errors++;
if (lp->auto_select) {
lp->tpe = 1 - lp->tpe;
- printk("%s: Carrier Lost, trying %s\n",
- dev->name, lp->tpe?"TPE":"AUI");
+ printk(KERN_ERR "%s: Carrier Lost, "
+ "trying %s\n", dev->name,
+ lp->tpe?"TPE":"AUI");
/* Stop the lance */
ll->rap = LE_CSR0;
ll->rdp = LE_C0_STOP;
@@ -390,8 +392,8 @@
if (status & (LE_T3_BUF|LE_T3_UFL)) {
lp->stats.tx_fifo_errors++;
- printk ("%s: Tx: ERR_BUF|ERR_UFL, restarting\n",
- dev->name);
+ printk(KERN_ERR "%s: Tx: ERR_BUF|ERR_UFL, "
+ "restarting\n", dev->name);
/* Stop the lance */
ll->rap = LE_CSR0;
ll->rdp = LE_C0_STOP;
@@ -464,7 +466,8 @@
if (csr0 & LE_C0_MISS)
lp->stats.rx_errors++; /* Missed a Rx frame. */
if (csr0 & LE_C0_MERR) {
- printk("%s: Bus master arbitration failure, status %4.4x.\n", dev->name, csr0);
+ printk(KERN_ERR "%s: Bus master arbitration failure, status "
+ "%4.4x.\n", dev->name, csr0);
/* Restart the chip. */
ll->rdp = LE_C0_STRT;
}
@@ -539,7 +542,7 @@
status = init_restart_lance (lp);
#ifdef DEBUG_DRIVER
- printk ("Lance restart=%d\n", status);
+ printk(KERN_DEBUG "Lance restart=%d\n", status);
#endif
return status;
}
@@ -589,9 +592,10 @@
for (i = 0; i < 64; i++) {
if ((i % 16) == 0)
- printk ("\n");
+ printk("\n" KERN_DEBUG);
printk ("%2.2x ", skb->data [i]);
}
+ printk("\n");
}
#endif
entry = lp->tx_new & lp->tx_ring_mod_mask;
@@ -803,7 +807,7 @@
}
zorro_set_drvdata(z, dev);
- printk("%s: A2065 at 0x%08lx, Ethernet Address "
+ printk(KERN_INFO "%s: A2065 at 0x%08lx, Ethernet Address "
"%02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, board,
dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 437] Amiga eth%d
2004-04-18 17:52 ` Geert Uytterhoeven
@ 2004-04-18 17:55 ` Geert Uytterhoeven
0 siblings, 0 replies; 7+ messages in thread
From: Geert Uytterhoeven @ 2004-04-18 17:55 UTC (permalink / raw)
To: Jeff Garzik
Cc: Andrew Morton, Linus Torvalds, Linux Kernel Development,
Linux/m68k
On Sun, 18 Apr 2004, Geert Uytterhoeven wrote:
> On Tue, 13 Apr 2004, Jeff Garzik wrote:
> > As a further change, can you please add KERN_xxx prefixes to those printk's?
>
> Do these look OK?
>
> To: akpm, linus, jeff
> Cc: lkml
> Subject: [PATCH] Amiga A2065 Ethernet KERN_*
>
> Amiga A2065 Ethernet: Add KERN_* prefixes to printk() messages
Oops, forgot you have to apply this one first:
To: akpm, linus, jeff
Cc: lkml
Subject: [PATCH] Amiga A2065 Ethernet debug
Amiga A2065 Ethernet: Add missing variable in debug code
--- linux-2.6.6-rc1/drivers/net/a2065.c 11 Apr 2004 11:49:17 -0000 1.14
+++ linux-m68k-2.6.6-rc1/drivers/net/a2065.c 16 Apr 2004 11:36:50 -0000
@@ -274,6 +274,7 @@
struct sk_buff *skb = 0; /* XXX shut up gcc warnings */
#ifdef TEST_HITS
+ int i;
printk ("[");
for (i = 0; i < RX_RING_SIZE; i++) {
if (i == lp->rx_new)
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 437] Amiga eth%d
2004-04-13 16:33 ` Jeff Garzik
2004-04-18 17:52 ` Geert Uytterhoeven
@ 2004-04-18 17:53 ` Geert Uytterhoeven
2004-04-18 17:54 ` Geert Uytterhoeven
2004-04-18 17:54 ` Geert Uytterhoeven
3 siblings, 0 replies; 7+ messages in thread
From: Geert Uytterhoeven @ 2004-04-18 17:53 UTC (permalink / raw)
To: Jeff Garzik
Cc: Andrew Morton, Linus Torvalds, Linux Kernel Development,
Linux/m68k
On Tue, 13 Apr 2004, Jeff Garzik wrote:
> As a further change, can you please add KERN_xxx prefixes to those printk's?
To: akpm, linus, jeff
Cc: lkml
Subject: [PATCH] Amiga Ariadne Ethernet KERN_*
Amiga Ariadne Ethernet: Add KERN_* prefixes to printk() messages
--- linux-2.6.6-rc1/drivers/net/ariadne.c 2004-04-15 11:44:13.000000000 +0200
+++ linux-m68k-2.6.6-rc1/drivers/net/ariadne.c 2004-04-16 13:38:01.000000000 +0200
@@ -216,7 +216,7 @@
}
zorro_set_drvdata(z, dev);
- printk("%s: Ariadne at 0x%08lx, Ethernet Address "
+ printk(KERN_INFO "%s: Ariadne at 0x%08lx, Ethernet Address "
"%02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, board,
dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
@@ -245,16 +245,16 @@
lance->RAP = CSR89; /* Chip ID */
version |= swapw(lance->RDP)<<16;
if ((version & 0x00000fff) != 0x00000003) {
- printk("ariadne_open: Couldn't find AMD Ethernet Chip\n");
+ printk(KERN_WARNING "ariadne_open: Couldn't find AMD Ethernet Chip\n");
return -EAGAIN;
}
if ((version & 0x0ffff000) != 0x00003000) {
- printk("ariadne_open: Couldn't find Am79C960 (Wrong part number = %ld)\n",
- (version & 0x0ffff000)>>12);
+ printk(KERN_WARNING "ariadne_open: Couldn't find Am79C960 (Wrong part "
+ "number = %ld)\n", (version & 0x0ffff000)>>12);
return -EAGAIN;
}
#if 0
- printk("ariadne_open: Am79C960 (PCnet-ISA) Revision %ld\n",
+ printk(KERN_DEBUG "ariadne_open: Am79C960 (PCnet-ISA) Revision %ld\n",
(version & 0xf0000000)>>28);
#endif
@@ -354,8 +354,8 @@
priv->tx_ring[i] = &lancedata->tx_ring[i];
priv->tx_buff[i] = lancedata->tx_buff[i];
#if 0
- printk("TX Entry %2d at %p, Buf at %p\n", i, &lancedata->tx_ring[i],
- lancedata->tx_buff[i]);
+ printk(KERN_DEBUG "TX Entry %2d at %p, Buf at %p\n", i,
+ &lancedata->tx_ring[i], lancedata->tx_buff[i]);
#endif
}
@@ -370,8 +370,8 @@
priv->rx_ring[i] = &lancedata->rx_ring[i];
priv->rx_buff[i] = lancedata->rx_buff[i];
#if 0
- printk("RX Entry %2d at %p, Buf at %p\n", i, &lancedata->rx_ring[i],
- lancedata->rx_buff[i]);
+ printk(KERN_DEBUG "RX Entry %2d at %p, Buf at %p\n", i,
+ &lancedata->rx_ring[i], lancedata->rx_buff[i]);
#endif
}
}
@@ -389,9 +389,9 @@
lance->RAP = CSR0; /* PCnet-ISA Controller Status */
if (ariadne_debug > 1) {
- printk("%s: Shutting down ethercard, status was %2.2x.\n", dev->name,
- lance->RDP);
- printk("%s: %lu packets missed\n", dev->name,
+ printk(KERN_DEBUG "%s: Shutting down ethercard, status was %2.2x.\n",
+ dev->name, lance->RDP);
+ printk(KERN_DEBUG "%s: %lu packets missed\n", dev->name,
priv->stats.rx_missed_errors);
}
@@ -425,7 +425,7 @@
int handled = 0;
if (dev == NULL) {
- printk("ariadne_interrupt(): irq for unknown device.\n");
+ printk(KERN_WARNING "ariadne_interrupt(): irq for unknown device.\n");
return IRQ_NONE;
}
@@ -443,8 +443,8 @@
#if 0
if (ariadne_debug > 5) {
- printk("%s: interrupt csr0=%#2.2x new csr=%#2.2x.", dev->name,
- csr0, lance->RDP);
+ printk(KERN_DEBUG "%s: interrupt csr0=%#2.2x new csr=%#2.2x.",
+ dev->name, csr0, lance->RDP);
printk("[");
if (csr0 & INTR)
printk(" INTR");
@@ -514,8 +514,8 @@
/* Ackk! On FIFO errors the Tx unit is turned off! */
priv->stats.tx_fifo_errors++;
/* Remove this verbosity later! */
- printk("%s: Tx FIFO error! Status %4.4x.\n", dev->name,
- csr0);
+ printk(KERN_ERR "%s: Tx FIFO error! Status %4.4x.\n",
+ dev->name, csr0);
/* Restart the chip. */
lance->RDP = STRT;
}
@@ -529,8 +529,8 @@
#ifndef final_version
if (priv->cur_tx - dirty_tx >= TX_RING_SIZE) {
- printk("out-of-sync dirty pointer, %d vs. %d, full=%d.\n",
- dirty_tx, priv->cur_tx, priv->tx_full);
+ printk(KERN_ERR "out-of-sync dirty pointer, %d vs. %d, "
+ "full=%d.\n", dirty_tx, priv->cur_tx, priv->tx_full);
dirty_tx += TX_RING_SIZE;
}
#endif
@@ -556,8 +556,8 @@
}
if (csr0 & MERR) {
handled = 1;
- printk("%s: Bus master arbitration failure, status %4.4x.\n",
- dev->name, csr0);
+ printk(KERN_ERR "%s: Bus master arbitration failure, status "
+ "%4.4x.\n", dev->name, csr0);
/* Restart the chip. */
lance->RDP = STRT;
}
@@ -569,8 +569,8 @@
#if 0
if (ariadne_debug > 4)
- printk("%s: exiting interrupt, csr%d=%#4.4x.\n", dev->name, lance->RAP,
- lance->RDP);
+ printk(KERN_DEBUG "%s: exiting interrupt, csr%d=%#4.4x.\n", dev->name,
+ lance->RAP, lance->RDP);
#endif
return IRQ_RETVAL(handled);
}
@@ -598,8 +598,8 @@
#if 0
if (ariadne_debug > 3) {
lance->RAP = CSR0; /* PCnet-ISA Controller Status */
- printk("%s: ariadne_start_xmit() called, csr0 %4.4x.\n", dev->name,
- lance->RDP);
+ printk(KERN_DEBUG "%s: ariadne_start_xmit() called, csr0 %4.4x.\n",
+ dev->name, lance->RDP);
lance->RDP = 0x0000;
}
#endif
@@ -616,7 +616,7 @@
/* Fill in a Tx ring entry */
#if 0
- printk("TX pkt type 0x%04x from ", ((u_short *)skb->data)[6]);
+ printk(KERN_DEBUG "TX pkt type 0x%04x from ", ((u_short *)skb->data)[6]);
{
int i;
u_char *ptr = &((u_char *)skb->data)[6];
@@ -652,7 +652,7 @@
len >>= 1;
for (i = 0; i < len; i += 8) {
int j;
- printk("%04x:", i);
+ printk(KERN_DEBUG "%04x:", i);
for (j = 0; (j < 8) && ((i+j) < len); j++) {
if (!(j & 1))
printk(" ");
@@ -671,8 +671,8 @@
if ((priv->cur_tx >= TX_RING_SIZE) && (priv->dirty_tx >= TX_RING_SIZE)) {
#if 0
- printk("*** Subtracting TX_RING_SIZE from cur_tx (%d) and dirty_tx (%d)\n",
- priv->cur_tx, priv->dirty_tx);
+ printk(KERN_DEBUG "*** Subtracting TX_RING_SIZE from cur_tx (%d) and "
+ "dirty_tx (%d)\n", priv->cur_tx, priv->dirty_tx);
#endif
priv->cur_tx -= TX_RING_SIZE;
@@ -729,7 +729,8 @@
skb = dev_alloc_skb(pkt_len+2);
if (skb == NULL) {
- printk("%s: Memory squeeze, deferring packet.\n", dev->name);
+ printk(KERN_WARNING "%s: Memory squeeze, deferring packet.\n",
+ dev->name);
for (i = 0; i < RX_RING_SIZE; i++)
if (lowb(priv->rx_ring[(entry+i) % RX_RING_SIZE]->RMD1) & RF_OWN)
break;
@@ -749,7 +750,8 @@
eth_copy_and_sum(skb, (char *)priv->rx_buff[entry], pkt_len,0);
skb->protocol=eth_type_trans(skb,dev);
#if 0
- printk("RX pkt type 0x%04x from ", ((u_short *)skb->data)[6]);
+ printk(KERN_DEBUG "RX pkt type 0x%04x from ",
+ ((u_short *)skb->data)[6]);
{
int i;
u_char *ptr = &((u_char *)skb->data)[6];
@@ -825,7 +827,7 @@
if (dev->flags & IFF_PROMISC) {
/* Log any net taps. */
- printk("%s: Promiscuous mode enabled.\n", dev->name);
+ printk(KERN_INFO "%s: Promiscuous mode enabled.\n", dev->name);
lance->RAP = CSR15; /* Mode Register */
lance->RDP = PROM; /* Set promiscuous mode */
} else {
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 437] Amiga eth%d
2004-04-13 16:33 ` Jeff Garzik
2004-04-18 17:52 ` Geert Uytterhoeven
2004-04-18 17:53 ` Geert Uytterhoeven
@ 2004-04-18 17:54 ` Geert Uytterhoeven
2004-04-18 17:54 ` Geert Uytterhoeven
3 siblings, 0 replies; 7+ messages in thread
From: Geert Uytterhoeven @ 2004-04-18 17:54 UTC (permalink / raw)
To: Jeff Garzik
Cc: Andrew Morton, Linus Torvalds, Linux Kernel Development,
Linux/m68k
On Tue, 13 Apr 2004, Jeff Garzik wrote:
> As a further change, can you please add KERN_xxx prefixes to those printk's?
To: akpm, linus, jeff
Cc: lkml
Subject: [PATCH] Amiga Hydra Ethernet KERN_*
Amiga Hydra Ethernet: Add KERN_* prefixes to printk() messages
--- linux-2.6.6-rc1/drivers/net/hydra.c 2004-04-15 11:44:14.000000000 +0200
+++ linux-m68k-2.6.6-rc1/drivers/net/hydra.c 2004-04-16 13:24:08.000000000 +0200
@@ -153,10 +153,11 @@
zorro_set_drvdata(z, dev);
- printk("%s: Hydra at 0x%08lx, address %02x:%02x:%02x:%02x:%02x:%02x "
- "(hydra.c " HYDRA_VERSION ")\n", dev->name, z->resource.start,
- dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
- dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+ printk(KERN_INFO "%s: Hydra at 0x%08lx, address "
+ "%02x:%02x:%02x:%02x:%02x:%02x (hydra.c " HYDRA_VERSION ")\n",
+ dev->name, z->resource.start, dev->dev_addr[0], dev->dev_addr[1],
+ dev->dev_addr[2], dev->dev_addr[3], dev->dev_addr[4],
+ dev->dev_addr[5]);
return 0;
}
@@ -170,14 +171,14 @@
static int hydra_close(struct net_device *dev)
{
if (ei_debug > 1)
- printk("%s: Shutting down ethercard.\n", dev->name);
+ printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name);
ei_close(dev);
return 0;
}
static void hydra_reset_8390(struct net_device *dev)
{
- printk("Hydra hw reset not there\n");
+ printk(KERN_INFO "Hydra hw reset not there\n");
}
static void hydra_get_8390_hdr(struct net_device *dev,
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 437] Amiga eth%d
2004-04-13 16:33 ` Jeff Garzik
` (2 preceding siblings ...)
2004-04-18 17:54 ` Geert Uytterhoeven
@ 2004-04-18 17:54 ` Geert Uytterhoeven
3 siblings, 0 replies; 7+ messages in thread
From: Geert Uytterhoeven @ 2004-04-18 17:54 UTC (permalink / raw)
To: Jeff Garzik
Cc: Andrew Morton, Linus Torvalds, Linux Kernel Development,
Linux/m68k
On Tue, 13 Apr 2004, Jeff Garzik wrote:
> As a further change, can you please add KERN_xxx prefixes to those printk's?
To: akpm, linus, jeff
Cc: lkml
Subject: [PATCH] Amiga Zorro8390 Ethernet KERN_*
Amiga Zorro8390 Ethernet: Add KERN_* prefixes to printk() messages
--- linux-2.6.6-rc1/drivers/net/zorro8390.c 2004-04-15 20:40:55.000000000 +0200
+++ linux-m68k-2.6.6-rc1/drivers/net/zorro8390.c 2004-04-16 13:38:09.000000000 +0200
@@ -150,7 +150,7 @@
while ((z_readb(ioaddr + NE_EN0_ISR) & ENISR_RESET) == 0)
if (jiffies - reset_start_time > 2*HZ/100) {
- printk(" not found (no reset ack).\n");
+ printk(KERN_WARNING " not found (no reset ack).\n");
return -ENODEV;
}
@@ -233,7 +233,7 @@
return err;
}
- printk("%s: %s at 0x%08lx, Ethernet Address "
+ printk(KERN_INFO "%s: %s at 0x%08lx, Ethernet Address "
"%02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, name, board,
dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
@@ -250,7 +250,7 @@
static int zorro8390_close(struct net_device *dev)
{
if (ei_debug > 1)
- printk("%s: Shutting down ethercard.\n", dev->name);
+ printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name);
ei_close(dev);
return 0;
}
@@ -262,7 +262,7 @@
unsigned long reset_start_time = jiffies;
if (ei_debug > 1)
- printk("resetting the 8390 t=%ld...", jiffies);
+ printk(KERN_DEBUG "resetting the 8390 t=%ld...\n", jiffies);
z_writeb(z_readb(NE_BASE + NE_RESET), NE_BASE + NE_RESET);
@@ -272,7 +272,8 @@
/* This check _should_not_ be necessary, omit eventually. */
while ((z_readb(NE_BASE+NE_EN0_ISR) & ENISR_RESET) == 0)
if (jiffies - reset_start_time > 2*HZ/100) {
- printk("%s: ne_reset_8390() did not complete.\n", dev->name);
+ printk(KERN_WARNING "%s: ne_reset_8390() did not complete.\n",
+ dev->name);
break;
}
z_writeb(ENISR_RESET, NE_BASE + NE_EN0_ISR); /* Ack intr. */
@@ -291,7 +292,7 @@
/* This *shouldn't* happen. If it does, it's the last thing you'll see */
if (ei_status.dmaing) {
- printk("%s: DMAing conflict in ne_get_8390_hdr "
+ printk(KERN_ERR "%s: DMAing conflict in ne_get_8390_hdr "
"[DMAstat:%d][irqlock:%d].\n", dev->name, ei_status.dmaing,
ei_status.irqlock);
return;
@@ -332,7 +333,7 @@
/* This *shouldn't* happen. If it does, it's the last thing you'll see */
if (ei_status.dmaing) {
- printk("%s: DMAing conflict in ne_block_input "
+ printk(KERN_ERR "%s: DMAing conflict in ne_block_input "
"[DMAstat:%d][irqlock:%d].\n",
dev->name, ei_status.dmaing, ei_status.irqlock);
return;
@@ -372,7 +373,7 @@
/* This *shouldn't* happen. If it does, it's the last thing you'll see */
if (ei_status.dmaing) {
- printk("%s: DMAing conflict in ne_block_output."
+ printk(KERN_ERR "%s: DMAing conflict in ne_block_output."
"[DMAstat:%d][irqlock:%d]\n", dev->name, ei_status.dmaing,
ei_status.irqlock);
return;
@@ -398,7 +399,8 @@
while ((z_readb(NE_BASE + NE_EN0_ISR) & ENISR_RDC) == 0)
if (jiffies - dma_start > 2*HZ/100) { /* 20ms */
- printk("%s: timeout waiting for Tx RDC.\n", dev->name);
+ printk(KERN_ERR "%s: timeout waiting for Tx RDC.\n",
+ dev->name);
zorro8390_reset_8390(dev);
NS8390_init(dev,1);
break;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 7+ messages in thread