* [PATCH net-next 1/4] tulip: xircom_cb: Convert #ifdef DEBUG blocks and enter/leave uses
2011-05-07 2:08 [PATCH net-next 0/4] tulip: logging cleanups Joe Perches
@ 2011-05-07 2:08 ` Joe Perches
2011-05-12 3:36 ` Grant Grundler
2011-05-07 2:08 ` [PATCH net-next 2/4] tulip: Convert printks to netdev_<level> Joe Perches
` (3 subsequent siblings)
4 siblings, 1 reply; 15+ messages in thread
From: Joe Perches @ 2011-05-07 2:08 UTC (permalink / raw)
To: Grant Grundler; +Cc: netdev, linux-kernel
Change the blocks that are guarded by #if DEBUG to
be #if defined DEBUG && DEBUG > 1 so that pr_debug
can be used later.
Rename enter/leave macros to func_enter and func_exit.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/tulip/xircom_cb.c | 152 ++++++++++++++++++++--------------------
1 files changed, 76 insertions(+), 76 deletions(-)
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 5a73752..4436865 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -37,12 +37,12 @@
#include <asm/irq.h>
#endif
-#ifdef DEBUG
-#define enter(x) printk("Enter: %s, %s line %i\n",x,__FILE__,__LINE__)
-#define leave(x) printk("Leave: %s, %s line %i\n",x,__FILE__,__LINE__)
+#if defined DEBUG && DEBUG > 1
+#define func_enter(x) pr_debug("Enter: %s\n", __func__)
+#define func_exit(x) pr_debug("Exit: %s\n", __func__)
#else
-#define enter(x) do {} while (0)
-#define leave(x) do {} while (0)
+#define func_enter(x) no_printk(KERN_DEBUG "Enter: %s\n", __func__)
+#define func_exit(x) no_printk(KERN_DEBUG "Exit: %s\n", __func__)
#endif
@@ -161,7 +161,7 @@ static struct pci_driver xircom_ops = {
};
-#ifdef DEBUG
+#if defined DEBUG && DEBUG > 1
static void print_binary(unsigned int number)
{
int i,i2;
@@ -176,7 +176,7 @@ static void print_binary(unsigned int number)
if ((i&3)==0)
buffer[i2++]=' ';
}
- printk("%s\n",buffer);
+ pr_debug("%s\n",buffer);
}
#endif
@@ -205,7 +205,7 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
struct xircom_private *private;
unsigned long flags;
unsigned short tmp16;
- enter("xircom_probe");
+ func_enter();
/* First do the PCI initialisation */
@@ -285,7 +285,7 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
trigger_receive(private);
- leave("xircom_probe");
+ func_exit();
return 0;
reg_fail:
@@ -310,7 +310,7 @@ static void __devexit xircom_remove(struct pci_dev *pdev)
struct net_device *dev = pci_get_drvdata(pdev);
struct xircom_private *card = netdev_priv(dev);
- enter("xircom_remove");
+ func_enter();
pci_free_consistent(pdev,8192,card->rx_buffer,card->rx_dma_handle);
pci_free_consistent(pdev,8192,card->tx_buffer,card->tx_dma_handle);
@@ -318,7 +318,7 @@ static void __devexit xircom_remove(struct pci_dev *pdev)
unregister_netdev(dev);
free_netdev(dev);
pci_set_drvdata(pdev, NULL);
- leave("xircom_remove");
+ func_exit();
}
static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
@@ -328,17 +328,17 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
unsigned int status;
int i;
- enter("xircom_interrupt\n");
+ func_enter();
spin_lock(&card->lock);
status = inl(card->io_port+CSR5);
-#ifdef DEBUG
+#if defined DEBUG && DEBUG > 1
print_binary(status);
- printk("tx status 0x%08x 0x%08x\n",
- card->tx_buffer[0], card->tx_buffer[4]);
- printk("rx status 0x%08x 0x%08x\n",
- card->rx_buffer[0], card->rx_buffer[4]);
+ pr_debug("tx status 0x%08x 0x%08x\n",
+ card->tx_buffer[0], card->tx_buffer[4]);
+ pr_debug("rx status 0x%08x 0x%08x\n",
+ card->rx_buffer[0], card->rx_buffer[4]);
#endif
/* Handle shared irq and hotplug */
if (status == 0 || status == 0xffffffff) {
@@ -371,7 +371,7 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
spin_unlock(&card->lock);
- leave("xircom_interrupt");
+ func_exit();
return IRQ_HANDLED;
}
@@ -382,7 +382,7 @@ static netdev_tx_t xircom_start_xmit(struct sk_buff *skb,
unsigned long flags;
int nextdescriptor;
int desc;
- enter("xircom_start_xmit");
+ func_enter();
card = netdev_priv(dev);
spin_lock_irqsave(&card->lock,flags);
@@ -424,7 +424,7 @@ static netdev_tx_t xircom_start_xmit(struct sk_buff *skb,
netif_stop_queue(dev);
}
card->transmit_used = nextdescriptor;
- leave("xircom-start_xmit - sent");
+ func_exit();
spin_unlock_irqrestore(&card->lock,flags);
return NETDEV_TX_OK;
}
@@ -446,18 +446,18 @@ static int xircom_open(struct net_device *dev)
{
struct xircom_private *xp = netdev_priv(dev);
int retval;
- enter("xircom_open");
+ func_enter();
pr_info("xircom cardbus adaptor found, registering as %s, using irq %i\n",
dev->name, dev->irq);
retval = request_irq(dev->irq, xircom_interrupt, IRQF_SHARED, dev->name, dev);
if (retval) {
- leave("xircom_open - No IRQ");
+ func_exit();
return retval;
}
xircom_up(xp);
xp->open = 1;
- leave("xircom_open");
+ func_exit();
return 0;
}
@@ -466,7 +466,7 @@ static int xircom_close(struct net_device *dev)
struct xircom_private *card;
unsigned long flags;
- enter("xircom_close");
+ func_enter();
card = netdev_priv(dev);
netif_stop_queue(dev); /* we don't want new packets */
@@ -486,7 +486,7 @@ static int xircom_close(struct net_device *dev)
card->open = 0;
free_irq(dev->irq,dev);
- leave("xircom_close");
+ func_exit();
return 0;
@@ -507,7 +507,7 @@ static void initialize_card(struct xircom_private *card)
{
unsigned int val;
unsigned long flags;
- enter("initialize_card");
+ func_enter();
spin_lock_irqsave(&card->lock, flags);
@@ -535,7 +535,7 @@ static void initialize_card(struct xircom_private *card)
spin_unlock_irqrestore(&card->lock, flags);
- leave("initialize_card");
+ func_exit();
}
/*
@@ -547,12 +547,12 @@ ignored; I chose zero.
static void trigger_transmit(struct xircom_private *card)
{
unsigned int val;
- enter("trigger_transmit");
+ func_enter();
val = 0;
outl(val, card->io_port + CSR1);
- leave("trigger_transmit");
+ func_exit();
}
/*
@@ -565,12 +565,12 @@ ignored; I chose zero.
static void trigger_receive(struct xircom_private *card)
{
unsigned int val;
- enter("trigger_receive");
+ func_enter();
val = 0;
outl(val, card->io_port + CSR2);
- leave("trigger_receive");
+ func_exit();
}
/*
@@ -581,7 +581,7 @@ static void setup_descriptors(struct xircom_private *card)
{
u32 address;
int i;
- enter("setup_descriptors");
+ func_enter();
BUG_ON(card->rx_buffer == NULL);
@@ -637,7 +637,7 @@ static void setup_descriptors(struct xircom_private *card)
address = card->tx_dma_handle;
outl(address, card->io_port + CSR4); /* xmit descr list address */
- leave("setup_descriptors");
+ func_exit();
}
/*
@@ -647,13 +647,13 @@ valid by setting the address in the card to 0x00.
static void remove_descriptors(struct xircom_private *card)
{
unsigned int val;
- enter("remove_descriptors");
+ func_enter();
val = 0;
outl(val, card->io_port + CSR3); /* Receive descriptor address */
outl(val, card->io_port + CSR4); /* Send descriptor address */
- leave("remove_descriptors");
+ func_exit();
}
/*
@@ -665,12 +665,12 @@ This function also clears the status-bit.
static int link_status_changed(struct xircom_private *card)
{
unsigned int val;
- enter("link_status_changed");
+ func_enter();
val = inl(card->io_port + CSR5); /* Status register */
if ((val & (1 << 27)) == 0) { /* no change */
- leave("link_status_changed - nochange");
+ func_exit();
return 0;
}
@@ -679,7 +679,7 @@ static int link_status_changed(struct xircom_private *card)
val = (1 << 27);
outl(val, card->io_port + CSR5);
- leave("link_status_changed - changed");
+ func_exit();
return 1;
}
@@ -691,16 +691,16 @@ in a non-stopped state.
static int transmit_active(struct xircom_private *card)
{
unsigned int val;
- enter("transmit_active");
+ func_enter();
val = inl(card->io_port + CSR5); /* Status register */
if ((val & (7 << 20)) == 0) { /* transmitter disabled */
- leave("transmit_active - inactive");
+ func_exit();
return 0;
}
- leave("transmit_active - active");
+ func_exit();
return 1;
}
@@ -711,17 +711,17 @@ in a non-stopped state.
static int receive_active(struct xircom_private *card)
{
unsigned int val;
- enter("receive_active");
+ func_enter();
val = inl(card->io_port + CSR5); /* Status register */
if ((val & (7 << 17)) == 0) { /* receiver disabled */
- leave("receive_active - inactive");
+ func_exit();
return 0;
}
- leave("receive_active - active");
+ func_exit();
return 1;
}
@@ -739,7 +739,7 @@ static void activate_receiver(struct xircom_private *card)
{
unsigned int val;
int counter;
- enter("activate_receiver");
+ func_enter();
val = inl(card->io_port + CSR6); /* Operation mode */
@@ -781,7 +781,7 @@ static void activate_receiver(struct xircom_private *card)
pr_err("Receiver failed to re-activate\n");
}
- leave("activate_receiver");
+ func_exit();
}
/*
@@ -795,7 +795,7 @@ static void deactivate_receiver(struct xircom_private *card)
{
unsigned int val;
int counter;
- enter("deactivate_receiver");
+ func_enter();
val = inl(card->io_port + CSR6); /* Operation mode */
val = val & ~2; /* disable the receiver */
@@ -813,7 +813,7 @@ static void deactivate_receiver(struct xircom_private *card)
}
- leave("deactivate_receiver");
+ func_exit();
}
@@ -831,7 +831,7 @@ static void activate_transmitter(struct xircom_private *card)
{
unsigned int val;
int counter;
- enter("activate_transmitter");
+ func_enter();
val = inl(card->io_port + CSR6); /* Operation mode */
@@ -872,7 +872,7 @@ static void activate_transmitter(struct xircom_private *card)
pr_err("Transmitter failed to re-activate\n");
}
- leave("activate_transmitter");
+ func_exit();
}
/*
@@ -886,7 +886,7 @@ static void deactivate_transmitter(struct xircom_private *card)
{
unsigned int val;
int counter;
- enter("deactivate_transmitter");
+ func_enter();
val = inl(card->io_port + CSR6); /* Operation mode */
val = val & ~2; /* disable the transmitter */
@@ -904,7 +904,7 @@ static void deactivate_transmitter(struct xircom_private *card)
}
- leave("deactivate_transmitter");
+ func_exit();
}
@@ -916,13 +916,13 @@ must be called with the lock held and interrupts disabled.
static void enable_transmit_interrupt(struct xircom_private *card)
{
unsigned int val;
- enter("enable_transmit_interrupt");
+ func_enter();
val = inl(card->io_port + CSR7); /* Interrupt enable register */
val |= 1; /* enable the transmit interrupt */
outl(val, card->io_port + CSR7);
- leave("enable_transmit_interrupt");
+ func_exit();
}
@@ -934,13 +934,13 @@ must be called with the lock held and interrupts disabled.
static void enable_receive_interrupt(struct xircom_private *card)
{
unsigned int val;
- enter("enable_receive_interrupt");
+ func_enter();
val = inl(card->io_port + CSR7); /* Interrupt enable register */
val = val | (1 << 6); /* enable the receive interrupt */
outl(val, card->io_port + CSR7);
- leave("enable_receive_interrupt");
+ func_exit();
}
/*
@@ -951,13 +951,13 @@ must be called with the lock held and interrupts disabled.
static void enable_link_interrupt(struct xircom_private *card)
{
unsigned int val;
- enter("enable_link_interrupt");
+ func_enter();
val = inl(card->io_port + CSR7); /* Interrupt enable register */
val = val | (1 << 27); /* enable the link status chage interrupt */
outl(val, card->io_port + CSR7);
- leave("enable_link_interrupt");
+ func_exit();
}
@@ -970,12 +970,12 @@ must be called with the lock held and interrupts disabled.
static void disable_all_interrupts(struct xircom_private *card)
{
unsigned int val;
- enter("enable_all_interrupts");
+ func_enter();
val = 0; /* disable all interrupts */
outl(val, card->io_port + CSR7);
- leave("disable_all_interrupts");
+ func_exit();
}
/*
@@ -986,7 +986,7 @@ must be called with the lock held and interrupts disabled.
static void enable_common_interrupts(struct xircom_private *card)
{
unsigned int val;
- enter("enable_link_interrupt");
+ func_enter();
val = inl(card->io_port + CSR7); /* Interrupt enable register */
val |= (1<<16); /* Normal Interrupt Summary */
@@ -999,7 +999,7 @@ static void enable_common_interrupts(struct xircom_private *card)
val |= (1<<1); /* Transmit Process Stopped */
outl(val, card->io_port + CSR7);
- leave("enable_link_interrupt");
+ func_exit();
}
/*
@@ -1010,13 +1010,13 @@ must be called with the lock held and interrupts disabled.
static int enable_promisc(struct xircom_private *card)
{
unsigned int val;
- enter("enable_promisc");
+ func_enter();
val = inl(card->io_port + CSR6);
val = val | (1 << 6);
outl(val, card->io_port + CSR6);
- leave("enable_promisc");
+ func_exit();
return 1;
}
@@ -1031,7 +1031,7 @@ Must be called in locked state with interrupts disabled
static int link_status(struct xircom_private *card)
{
unsigned int val;
- enter("link_status");
+ func_enter();
val = inb(card->io_port + CSR12);
@@ -1042,7 +1042,7 @@ static int link_status(struct xircom_private *card)
/* If we get here -> no link at all */
- leave("link_status");
+ func_exit();
return 0;
}
@@ -1061,7 +1061,7 @@ static void read_mac_address(struct xircom_private *card)
unsigned long flags;
int i;
- enter("read_mac_address");
+ func_enter();
spin_lock_irqsave(&card->lock, flags);
@@ -1090,7 +1090,7 @@ static void read_mac_address(struct xircom_private *card)
}
spin_unlock_irqrestore(&card->lock, flags);
pr_debug(" %pM\n", card->dev->dev_addr);
- leave("read_mac_address");
+ func_exit();
}
@@ -1103,7 +1103,7 @@ static void transceiver_voodoo(struct xircom_private *card)
{
unsigned long flags;
- enter("transceiver_voodoo");
+ func_enter();
/* disable all powermanagement */
pci_write_config_dword(card->pdev, PCI_POWERMGMT, 0x0000);
@@ -1122,7 +1122,7 @@ static void transceiver_voodoo(struct xircom_private *card)
spin_unlock_irqrestore(&card->lock, flags);
netif_start_queue(card->dev);
- leave("transceiver_voodoo");
+ func_exit();
}
@@ -1131,7 +1131,7 @@ static void xircom_up(struct xircom_private *card)
unsigned long flags;
int i;
- enter("xircom_up");
+ func_enter();
/* disable all powermanagement */
pci_write_config_dword(card->pdev, PCI_POWERMGMT, 0x0000);
@@ -1156,7 +1156,7 @@ static void xircom_up(struct xircom_private *card)
trigger_receive(card);
trigger_transmit(card);
netif_start_queue(card->dev);
- leave("xircom_up");
+ func_exit();
}
/* Bufferoffset is in BYTES */
@@ -1164,7 +1164,7 @@ static void investigate_read_descriptor(struct net_device *dev,struct xircom_pri
{
int status;
- enter("investigate_read_descriptor");
+ func_enter();
status = le32_to_cpu(card->rx_buffer[4*descnr]);
if ((status > 0)) { /* packet received */
@@ -1198,7 +1198,7 @@ static void investigate_read_descriptor(struct net_device *dev,struct xircom_pri
trigger_receive(card);
}
- leave("investigate_read_descriptor");
+ func_exit();
}
@@ -1208,7 +1208,7 @@ static void investigate_write_descriptor(struct net_device *dev, struct xircom_p
{
int status;
- enter("investigate_write_descriptor");
+ func_enter();
status = le32_to_cpu(card->tx_buffer[4*descnr]);
#if 0
@@ -1232,7 +1232,7 @@ static void investigate_write_descriptor(struct net_device *dev, struct xircom_p
dev->stats.tx_packets++;
}
- leave("investigate_write_descriptor");
+ func_exit();
}
--
1.7.5.rc3.dirty
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH net-next 1/4] tulip: xircom_cb: Convert #ifdef DEBUG blocks and enter/leave uses
2011-05-07 2:08 ` [PATCH net-next 1/4] tulip: xircom_cb: Convert #ifdef DEBUG blocks and enter/leave uses Joe Perches
@ 2011-05-12 3:36 ` Grant Grundler
0 siblings, 0 replies; 15+ messages in thread
From: Grant Grundler @ 2011-05-12 3:36 UTC (permalink / raw)
To: Joe Perches; +Cc: netdev, linux-kernel
On Fri, May 06, 2011 at 07:08:42PM -0700, Joe Perches wrote:
> Change the blocks that are guarded by #if DEBUG to
> be #if defined DEBUG && DEBUG > 1 so that pr_debug
> can be used later.
>
> Rename enter/leave macros to func_enter and func_exit.
>
> Signed-off-by: Joe Perches <joe@perches.com>
Good cleanups. :)
Acked-by: Grant Grundler <grundler@parisc-linux.org>
thanks!
grant
> ---
> drivers/net/tulip/xircom_cb.c | 152 ++++++++++++++++++++--------------------
> 1 files changed, 76 insertions(+), 76 deletions(-)
>
> diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
> index 5a73752..4436865 100644
> --- a/drivers/net/tulip/xircom_cb.c
> +++ b/drivers/net/tulip/xircom_cb.c
> @@ -37,12 +37,12 @@
> #include <asm/irq.h>
> #endif
>
> -#ifdef DEBUG
> -#define enter(x) printk("Enter: %s, %s line %i\n",x,__FILE__,__LINE__)
> -#define leave(x) printk("Leave: %s, %s line %i\n",x,__FILE__,__LINE__)
> +#if defined DEBUG && DEBUG > 1
> +#define func_enter(x) pr_debug("Enter: %s\n", __func__)
> +#define func_exit(x) pr_debug("Exit: %s\n", __func__)
> #else
> -#define enter(x) do {} while (0)
> -#define leave(x) do {} while (0)
> +#define func_enter(x) no_printk(KERN_DEBUG "Enter: %s\n", __func__)
> +#define func_exit(x) no_printk(KERN_DEBUG "Exit: %s\n", __func__)
> #endif
>
>
> @@ -161,7 +161,7 @@ static struct pci_driver xircom_ops = {
> };
>
>
> -#ifdef DEBUG
> +#if defined DEBUG && DEBUG > 1
> static void print_binary(unsigned int number)
> {
> int i,i2;
> @@ -176,7 +176,7 @@ static void print_binary(unsigned int number)
> if ((i&3)==0)
> buffer[i2++]=' ';
> }
> - printk("%s\n",buffer);
> + pr_debug("%s\n",buffer);
> }
> #endif
>
> @@ -205,7 +205,7 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
> struct xircom_private *private;
> unsigned long flags;
> unsigned short tmp16;
> - enter("xircom_probe");
> + func_enter();
>
> /* First do the PCI initialisation */
>
> @@ -285,7 +285,7 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
>
> trigger_receive(private);
>
> - leave("xircom_probe");
> + func_exit();
> return 0;
>
> reg_fail:
> @@ -310,7 +310,7 @@ static void __devexit xircom_remove(struct pci_dev *pdev)
> struct net_device *dev = pci_get_drvdata(pdev);
> struct xircom_private *card = netdev_priv(dev);
>
> - enter("xircom_remove");
> + func_enter();
> pci_free_consistent(pdev,8192,card->rx_buffer,card->rx_dma_handle);
> pci_free_consistent(pdev,8192,card->tx_buffer,card->tx_dma_handle);
>
> @@ -318,7 +318,7 @@ static void __devexit xircom_remove(struct pci_dev *pdev)
> unregister_netdev(dev);
> free_netdev(dev);
> pci_set_drvdata(pdev, NULL);
> - leave("xircom_remove");
> + func_exit();
> }
>
> static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
> @@ -328,17 +328,17 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
> unsigned int status;
> int i;
>
> - enter("xircom_interrupt\n");
> + func_enter();
>
> spin_lock(&card->lock);
> status = inl(card->io_port+CSR5);
>
> -#ifdef DEBUG
> +#if defined DEBUG && DEBUG > 1
> print_binary(status);
> - printk("tx status 0x%08x 0x%08x\n",
> - card->tx_buffer[0], card->tx_buffer[4]);
> - printk("rx status 0x%08x 0x%08x\n",
> - card->rx_buffer[0], card->rx_buffer[4]);
> + pr_debug("tx status 0x%08x 0x%08x\n",
> + card->tx_buffer[0], card->tx_buffer[4]);
> + pr_debug("rx status 0x%08x 0x%08x\n",
> + card->rx_buffer[0], card->rx_buffer[4]);
> #endif
> /* Handle shared irq and hotplug */
> if (status == 0 || status == 0xffffffff) {
> @@ -371,7 +371,7 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
>
>
> spin_unlock(&card->lock);
> - leave("xircom_interrupt");
> + func_exit();
> return IRQ_HANDLED;
> }
>
> @@ -382,7 +382,7 @@ static netdev_tx_t xircom_start_xmit(struct sk_buff *skb,
> unsigned long flags;
> int nextdescriptor;
> int desc;
> - enter("xircom_start_xmit");
> + func_enter();
>
> card = netdev_priv(dev);
> spin_lock_irqsave(&card->lock,flags);
> @@ -424,7 +424,7 @@ static netdev_tx_t xircom_start_xmit(struct sk_buff *skb,
> netif_stop_queue(dev);
> }
> card->transmit_used = nextdescriptor;
> - leave("xircom-start_xmit - sent");
> + func_exit();
> spin_unlock_irqrestore(&card->lock,flags);
> return NETDEV_TX_OK;
> }
> @@ -446,18 +446,18 @@ static int xircom_open(struct net_device *dev)
> {
> struct xircom_private *xp = netdev_priv(dev);
> int retval;
> - enter("xircom_open");
> + func_enter();
> pr_info("xircom cardbus adaptor found, registering as %s, using irq %i\n",
> dev->name, dev->irq);
> retval = request_irq(dev->irq, xircom_interrupt, IRQF_SHARED, dev->name, dev);
> if (retval) {
> - leave("xircom_open - No IRQ");
> + func_exit();
> return retval;
> }
>
> xircom_up(xp);
> xp->open = 1;
> - leave("xircom_open");
> + func_exit();
> return 0;
> }
>
> @@ -466,7 +466,7 @@ static int xircom_close(struct net_device *dev)
> struct xircom_private *card;
> unsigned long flags;
>
> - enter("xircom_close");
> + func_enter();
> card = netdev_priv(dev);
> netif_stop_queue(dev); /* we don't want new packets */
>
> @@ -486,7 +486,7 @@ static int xircom_close(struct net_device *dev)
> card->open = 0;
> free_irq(dev->irq,dev);
>
> - leave("xircom_close");
> + func_exit();
>
> return 0;
>
> @@ -507,7 +507,7 @@ static void initialize_card(struct xircom_private *card)
> {
> unsigned int val;
> unsigned long flags;
> - enter("initialize_card");
> + func_enter();
>
>
> spin_lock_irqsave(&card->lock, flags);
> @@ -535,7 +535,7 @@ static void initialize_card(struct xircom_private *card)
>
> spin_unlock_irqrestore(&card->lock, flags);
>
> - leave("initialize_card");
> + func_exit();
> }
>
> /*
> @@ -547,12 +547,12 @@ ignored; I chose zero.
> static void trigger_transmit(struct xircom_private *card)
> {
> unsigned int val;
> - enter("trigger_transmit");
> + func_enter();
>
> val = 0;
> outl(val, card->io_port + CSR1);
>
> - leave("trigger_transmit");
> + func_exit();
> }
>
> /*
> @@ -565,12 +565,12 @@ ignored; I chose zero.
> static void trigger_receive(struct xircom_private *card)
> {
> unsigned int val;
> - enter("trigger_receive");
> + func_enter();
>
> val = 0;
> outl(val, card->io_port + CSR2);
>
> - leave("trigger_receive");
> + func_exit();
> }
>
> /*
> @@ -581,7 +581,7 @@ static void setup_descriptors(struct xircom_private *card)
> {
> u32 address;
> int i;
> - enter("setup_descriptors");
> + func_enter();
>
>
> BUG_ON(card->rx_buffer == NULL);
> @@ -637,7 +637,7 @@ static void setup_descriptors(struct xircom_private *card)
> address = card->tx_dma_handle;
> outl(address, card->io_port + CSR4); /* xmit descr list address */
>
> - leave("setup_descriptors");
> + func_exit();
> }
>
> /*
> @@ -647,13 +647,13 @@ valid by setting the address in the card to 0x00.
> static void remove_descriptors(struct xircom_private *card)
> {
> unsigned int val;
> - enter("remove_descriptors");
> + func_enter();
>
> val = 0;
> outl(val, card->io_port + CSR3); /* Receive descriptor address */
> outl(val, card->io_port + CSR4); /* Send descriptor address */
>
> - leave("remove_descriptors");
> + func_exit();
> }
>
> /*
> @@ -665,12 +665,12 @@ This function also clears the status-bit.
> static int link_status_changed(struct xircom_private *card)
> {
> unsigned int val;
> - enter("link_status_changed");
> + func_enter();
>
> val = inl(card->io_port + CSR5); /* Status register */
>
> if ((val & (1 << 27)) == 0) { /* no change */
> - leave("link_status_changed - nochange");
> + func_exit();
> return 0;
> }
>
> @@ -679,7 +679,7 @@ static int link_status_changed(struct xircom_private *card)
> val = (1 << 27);
> outl(val, card->io_port + CSR5);
>
> - leave("link_status_changed - changed");
> + func_exit();
> return 1;
> }
>
> @@ -691,16 +691,16 @@ in a non-stopped state.
> static int transmit_active(struct xircom_private *card)
> {
> unsigned int val;
> - enter("transmit_active");
> + func_enter();
>
> val = inl(card->io_port + CSR5); /* Status register */
>
> if ((val & (7 << 20)) == 0) { /* transmitter disabled */
> - leave("transmit_active - inactive");
> + func_exit();
> return 0;
> }
>
> - leave("transmit_active - active");
> + func_exit();
> return 1;
> }
>
> @@ -711,17 +711,17 @@ in a non-stopped state.
> static int receive_active(struct xircom_private *card)
> {
> unsigned int val;
> - enter("receive_active");
> + func_enter();
>
>
> val = inl(card->io_port + CSR5); /* Status register */
>
> if ((val & (7 << 17)) == 0) { /* receiver disabled */
> - leave("receive_active - inactive");
> + func_exit();
> return 0;
> }
>
> - leave("receive_active - active");
> + func_exit();
> return 1;
> }
>
> @@ -739,7 +739,7 @@ static void activate_receiver(struct xircom_private *card)
> {
> unsigned int val;
> int counter;
> - enter("activate_receiver");
> + func_enter();
>
>
> val = inl(card->io_port + CSR6); /* Operation mode */
> @@ -781,7 +781,7 @@ static void activate_receiver(struct xircom_private *card)
> pr_err("Receiver failed to re-activate\n");
> }
>
> - leave("activate_receiver");
> + func_exit();
> }
>
> /*
> @@ -795,7 +795,7 @@ static void deactivate_receiver(struct xircom_private *card)
> {
> unsigned int val;
> int counter;
> - enter("deactivate_receiver");
> + func_enter();
>
> val = inl(card->io_port + CSR6); /* Operation mode */
> val = val & ~2; /* disable the receiver */
> @@ -813,7 +813,7 @@ static void deactivate_receiver(struct xircom_private *card)
> }
>
>
> - leave("deactivate_receiver");
> + func_exit();
> }
>
>
> @@ -831,7 +831,7 @@ static void activate_transmitter(struct xircom_private *card)
> {
> unsigned int val;
> int counter;
> - enter("activate_transmitter");
> + func_enter();
>
>
> val = inl(card->io_port + CSR6); /* Operation mode */
> @@ -872,7 +872,7 @@ static void activate_transmitter(struct xircom_private *card)
> pr_err("Transmitter failed to re-activate\n");
> }
>
> - leave("activate_transmitter");
> + func_exit();
> }
>
> /*
> @@ -886,7 +886,7 @@ static void deactivate_transmitter(struct xircom_private *card)
> {
> unsigned int val;
> int counter;
> - enter("deactivate_transmitter");
> + func_enter();
>
> val = inl(card->io_port + CSR6); /* Operation mode */
> val = val & ~2; /* disable the transmitter */
> @@ -904,7 +904,7 @@ static void deactivate_transmitter(struct xircom_private *card)
> }
>
>
> - leave("deactivate_transmitter");
> + func_exit();
> }
>
>
> @@ -916,13 +916,13 @@ must be called with the lock held and interrupts disabled.
> static void enable_transmit_interrupt(struct xircom_private *card)
> {
> unsigned int val;
> - enter("enable_transmit_interrupt");
> + func_enter();
>
> val = inl(card->io_port + CSR7); /* Interrupt enable register */
> val |= 1; /* enable the transmit interrupt */
> outl(val, card->io_port + CSR7);
>
> - leave("enable_transmit_interrupt");
> + func_exit();
> }
>
>
> @@ -934,13 +934,13 @@ must be called with the lock held and interrupts disabled.
> static void enable_receive_interrupt(struct xircom_private *card)
> {
> unsigned int val;
> - enter("enable_receive_interrupt");
> + func_enter();
>
> val = inl(card->io_port + CSR7); /* Interrupt enable register */
> val = val | (1 << 6); /* enable the receive interrupt */
> outl(val, card->io_port + CSR7);
>
> - leave("enable_receive_interrupt");
> + func_exit();
> }
>
> /*
> @@ -951,13 +951,13 @@ must be called with the lock held and interrupts disabled.
> static void enable_link_interrupt(struct xircom_private *card)
> {
> unsigned int val;
> - enter("enable_link_interrupt");
> + func_enter();
>
> val = inl(card->io_port + CSR7); /* Interrupt enable register */
> val = val | (1 << 27); /* enable the link status chage interrupt */
> outl(val, card->io_port + CSR7);
>
> - leave("enable_link_interrupt");
> + func_exit();
> }
>
>
> @@ -970,12 +970,12 @@ must be called with the lock held and interrupts disabled.
> static void disable_all_interrupts(struct xircom_private *card)
> {
> unsigned int val;
> - enter("enable_all_interrupts");
> + func_enter();
>
> val = 0; /* disable all interrupts */
> outl(val, card->io_port + CSR7);
>
> - leave("disable_all_interrupts");
> + func_exit();
> }
>
> /*
> @@ -986,7 +986,7 @@ must be called with the lock held and interrupts disabled.
> static void enable_common_interrupts(struct xircom_private *card)
> {
> unsigned int val;
> - enter("enable_link_interrupt");
> + func_enter();
>
> val = inl(card->io_port + CSR7); /* Interrupt enable register */
> val |= (1<<16); /* Normal Interrupt Summary */
> @@ -999,7 +999,7 @@ static void enable_common_interrupts(struct xircom_private *card)
> val |= (1<<1); /* Transmit Process Stopped */
> outl(val, card->io_port + CSR7);
>
> - leave("enable_link_interrupt");
> + func_exit();
> }
>
> /*
> @@ -1010,13 +1010,13 @@ must be called with the lock held and interrupts disabled.
> static int enable_promisc(struct xircom_private *card)
> {
> unsigned int val;
> - enter("enable_promisc");
> + func_enter();
>
> val = inl(card->io_port + CSR6);
> val = val | (1 << 6);
> outl(val, card->io_port + CSR6);
>
> - leave("enable_promisc");
> + func_exit();
> return 1;
> }
>
> @@ -1031,7 +1031,7 @@ Must be called in locked state with interrupts disabled
> static int link_status(struct xircom_private *card)
> {
> unsigned int val;
> - enter("link_status");
> + func_enter();
>
> val = inb(card->io_port + CSR12);
>
> @@ -1042,7 +1042,7 @@ static int link_status(struct xircom_private *card)
>
> /* If we get here -> no link at all */
>
> - leave("link_status");
> + func_exit();
> return 0;
> }
>
> @@ -1061,7 +1061,7 @@ static void read_mac_address(struct xircom_private *card)
> unsigned long flags;
> int i;
>
> - enter("read_mac_address");
> + func_enter();
>
> spin_lock_irqsave(&card->lock, flags);
>
> @@ -1090,7 +1090,7 @@ static void read_mac_address(struct xircom_private *card)
> }
> spin_unlock_irqrestore(&card->lock, flags);
> pr_debug(" %pM\n", card->dev->dev_addr);
> - leave("read_mac_address");
> + func_exit();
> }
>
>
> @@ -1103,7 +1103,7 @@ static void transceiver_voodoo(struct xircom_private *card)
> {
> unsigned long flags;
>
> - enter("transceiver_voodoo");
> + func_enter();
>
> /* disable all powermanagement */
> pci_write_config_dword(card->pdev, PCI_POWERMGMT, 0x0000);
> @@ -1122,7 +1122,7 @@ static void transceiver_voodoo(struct xircom_private *card)
> spin_unlock_irqrestore(&card->lock, flags);
>
> netif_start_queue(card->dev);
> - leave("transceiver_voodoo");
> + func_exit();
> }
>
>
> @@ -1131,7 +1131,7 @@ static void xircom_up(struct xircom_private *card)
> unsigned long flags;
> int i;
>
> - enter("xircom_up");
> + func_enter();
>
> /* disable all powermanagement */
> pci_write_config_dword(card->pdev, PCI_POWERMGMT, 0x0000);
> @@ -1156,7 +1156,7 @@ static void xircom_up(struct xircom_private *card)
> trigger_receive(card);
> trigger_transmit(card);
> netif_start_queue(card->dev);
> - leave("xircom_up");
> + func_exit();
> }
>
> /* Bufferoffset is in BYTES */
> @@ -1164,7 +1164,7 @@ static void investigate_read_descriptor(struct net_device *dev,struct xircom_pri
> {
> int status;
>
> - enter("investigate_read_descriptor");
> + func_enter();
> status = le32_to_cpu(card->rx_buffer[4*descnr]);
>
> if ((status > 0)) { /* packet received */
> @@ -1198,7 +1198,7 @@ static void investigate_read_descriptor(struct net_device *dev,struct xircom_pri
> trigger_receive(card);
> }
>
> - leave("investigate_read_descriptor");
> + func_exit();
>
> }
>
> @@ -1208,7 +1208,7 @@ static void investigate_write_descriptor(struct net_device *dev, struct xircom_p
> {
> int status;
>
> - enter("investigate_write_descriptor");
> + func_enter();
>
> status = le32_to_cpu(card->tx_buffer[4*descnr]);
> #if 0
> @@ -1232,7 +1232,7 @@ static void investigate_write_descriptor(struct net_device *dev, struct xircom_p
> dev->stats.tx_packets++;
> }
>
> - leave("investigate_write_descriptor");
> + func_exit();
>
> }
>
> --
> 1.7.5.rc3.dirty
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH net-next 2/4] tulip: Convert printks to netdev_<level>
2011-05-07 2:08 [PATCH net-next 0/4] tulip: logging cleanups Joe Perches
2011-05-07 2:08 ` [PATCH net-next 1/4] tulip: xircom_cb: Convert #ifdef DEBUG blocks and enter/leave uses Joe Perches
@ 2011-05-07 2:08 ` Joe Perches
2011-05-12 4:09 ` Grant Grundler
2011-05-07 2:08 ` [PATCH net-next 3/4] tulip: Convert uses of KERN_DEBUG Joe Perches
` (2 subsequent siblings)
4 siblings, 1 reply; 15+ messages in thread
From: Joe Perches @ 2011-05-07 2:08 UTC (permalink / raw)
To: Grant Grundler, Tobias Ringstrom; +Cc: netdev, linux-kernel
Use the current more descriptive logging styles.
Add pr_fmt and remove PFX where appropriate.
Use netif_<level>, netdev_<level>
Indent a few blocks in xircom_cb where appropriate.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/tulip/de2104x.c | 139 +++++++++++++++++---------------------
drivers/net/tulip/dmfe.c | 2 +-
drivers/net/tulip/eeprom.c | 4 +-
drivers/net/tulip/tulip_core.c | 25 +++----
drivers/net/tulip/uli526x.c | 42 +++++-------
drivers/net/tulip/winbond-840.c | 6 +-
drivers/net/tulip/xircom_cb.c | 140 +++++++++++++++++++++------------------
7 files changed, 174 insertions(+), 184 deletions(-)
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 46d5a1b..62883a0 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -27,6 +27,8 @@
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#define DRV_NAME "de2104x"
#define DRV_VERSION "0.7"
#define DRV_RELDATE "Mar 17, 2004"
@@ -73,8 +75,6 @@ static int rx_copybreak = 100;
module_param (rx_copybreak, int, 0);
MODULE_PARM_DESC (rx_copybreak, "de2104x Breakpoint at which Rx packets are copied");
-#define PFX DRV_NAME ": "
-
#define DE_DEF_MSG_ENABLE (NETIF_MSG_DRV | \
NETIF_MSG_PROBE | \
NETIF_MSG_LINK | \
@@ -377,18 +377,16 @@ static u16 t21041_csr15[] = { 0x0008, 0x0006, 0x000E, 0x0008, 0x0008, };
static void de_rx_err_acct (struct de_private *de, unsigned rx_tail,
u32 status, u32 len)
{
- if (netif_msg_rx_err (de))
- printk (KERN_DEBUG
- "%s: rx err, slot %d status 0x%x len %d\n",
- de->dev->name, rx_tail, status, len);
+ netif_printk(de, rx_err, KERN_DEBUG, de->dev,
+ "rx err, slot %d status 0x%x len %d\n",
+ rx_tail, status, len);
if ((status & 0x38000300) != 0x0300) {
/* Ingore earlier buffers. */
if ((status & 0xffff) != 0x7fff) {
- if (netif_msg_rx_err(de))
- dev_warn(&de->dev->dev,
- "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
- status);
+ netif_warn(de, rx_err, de->dev,
+ "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
+ status);
de->net_stats.rx_length_errors++;
}
} else if (status & RxError) {
@@ -491,7 +489,7 @@ rx_next:
}
if (!rx_work)
- dev_warn(&de->dev->dev, "rx work limit reached\n");
+ netdev_warn(de->dev, "rx work limit reached\n");
de->rx_tail = rx_tail;
}
@@ -534,9 +532,9 @@ static irqreturn_t de_interrupt (int irq, void *dev_instance)
pci_read_config_word(de->pdev, PCI_STATUS, &pci_status);
pci_write_config_word(de->pdev, PCI_STATUS, pci_status);
- dev_err(&de->dev->dev,
- "PCI bus error, status=%08x, PCI status=%04x\n",
- status, pci_status);
+ netdev_err(de->dev,
+ "PCI bus error, status=%08x, PCI status=%04x\n",
+ status, pci_status);
}
return IRQ_HANDLED;
@@ -873,7 +871,7 @@ static void de_stop_rxtx (struct de_private *de)
udelay(100);
}
- dev_warn(&de->dev->dev, "timeout expired stopping DMA\n");
+ netdev_warn(de->dev, "timeout expired, stopping DMA\n");
}
static inline void de_start_rxtx (struct de_private *de)
@@ -907,9 +905,8 @@ static void de_link_up(struct de_private *de)
{
if (!netif_carrier_ok(de->dev)) {
netif_carrier_on(de->dev);
- if (netif_msg_link(de))
- dev_info(&de->dev->dev, "link up, media %s\n",
- media_name[de->media_type]);
+ netif_info(de, link, de->dev, "link up, media %s\n",
+ media_name[de->media_type]);
}
}
@@ -917,8 +914,7 @@ static void de_link_down(struct de_private *de)
{
if (netif_carrier_ok(de->dev)) {
netif_carrier_off(de->dev);
- if (netif_msg_link(de))
- dev_info(&de->dev->dev, "link down\n");
+ netif_info(de, link, de->dev, "link down\n");
}
}
@@ -928,8 +924,7 @@ static void de_set_media (struct de_private *de)
u32 macmode = dr32(MacMode);
if (de_is_running(de))
- dev_warn(&de->dev->dev,
- "chip is running while changing media!\n");
+ netdev_warn(de->dev, "chip is running while changing media!\n");
if (de->de21040)
dw32(CSR11, FULL_DUPLEX_MAGIC);
@@ -948,18 +943,13 @@ static void de_set_media (struct de_private *de)
else
macmode &= ~FullDuplex;
- if (netif_msg_link(de))
- dev_info(&de->dev->dev, "set link %s\n", media_name[media]);
- if (netif_msg_hw(de)) {
- dev_info(&de->dev->dev, "mode 0x%x, sia 0x%x,0x%x,0x%x,0x%x\n",
- dr32(MacMode), dr32(SIAStatus),
- dr32(CSR13), dr32(CSR14), dr32(CSR15));
-
- dev_info(&de->dev->dev,
- "set mode 0x%x, set sia 0x%x,0x%x,0x%x\n",
- macmode, de->media[media].csr13,
- de->media[media].csr14, de->media[media].csr15);
- }
+ netif_info(de, link, de->dev, "set link %s\n", media_name[media]);
+ netif_info(de, hw, de->dev, "mode 0x%x, sia 0x%x,0x%x,0x%x,0x%x\n",
+ dr32(MacMode), dr32(SIAStatus),
+ dr32(CSR13), dr32(CSR14), dr32(CSR15));
+ netif_info(de, hw, de->dev, "set mode 0x%x, set sia 0x%x,0x%x,0x%x\n",
+ macmode, de->media[media].csr13,
+ de->media[media].csr14, de->media[media].csr15);
if (macmode != dr32(MacMode))
dw32(MacMode, macmode);
}
@@ -996,9 +986,8 @@ static void de21040_media_timer (unsigned long data)
if (!netif_carrier_ok(dev))
de_link_up(de);
else
- if (netif_msg_timer(de))
- dev_info(&dev->dev, "%s link ok, status %x\n",
- media_name[de->media_type], status);
+ netif_info(de, timer, dev, "%s link ok, status %x\n",
+ media_name[de->media_type], status);
return;
}
@@ -1025,9 +1014,8 @@ no_link_yet:
de->media_timer.expires = jiffies + DE_TIMER_NO_LINK;
add_timer(&de->media_timer);
- if (netif_msg_timer(de))
- dev_info(&dev->dev, "no link, trying media %s, status %x\n",
- media_name[de->media_type], status);
+ netif_info(de, timer, dev, "no link, trying media %s, status %x\n",
+ media_name[de->media_type], status);
}
static unsigned int de_ok_to_advertise (struct de_private *de, u32 new_media)
@@ -1085,11 +1073,10 @@ static void de21041_media_timer (unsigned long data)
if (!netif_carrier_ok(dev))
de_link_up(de);
else
- if (netif_msg_timer(de))
- dev_info(&dev->dev,
- "%s link ok, mode %x status %x\n",
- media_name[de->media_type],
- dr32(MacMode), status);
+ netif_info(de, timer, dev,
+ "%s link ok, mode %x status %x\n",
+ media_name[de->media_type],
+ dr32(MacMode), status);
return;
}
@@ -1163,9 +1150,8 @@ no_link_yet:
de->media_timer.expires = jiffies + DE_TIMER_NO_LINK;
add_timer(&de->media_timer);
- if (netif_msg_timer(de))
- dev_info(&dev->dev, "no link, trying media %s, status %x\n",
- media_name[de->media_type], status);
+ netif_info(de, timer, dev, "no link, trying media %s, status %x\n",
+ media_name[de->media_type], status);
}
static void de_media_interrupt (struct de_private *de, u32 status)
@@ -1401,14 +1387,13 @@ static int de_open (struct net_device *dev)
struct de_private *de = netdev_priv(dev);
int rc;
- if (netif_msg_ifup(de))
- printk(KERN_DEBUG "%s: enabling interface\n", dev->name);
+ netif_printk(de, ifup, KERN_DEBUG, dev, "enabling interface\n");
de->rx_buf_sz = (dev->mtu <= 1500 ? PKT_BUF_SZ : dev->mtu + 32);
rc = de_alloc_rings(de);
if (rc) {
- dev_err(&dev->dev, "ring allocation failure, err=%d\n", rc);
+ netdev_err(dev, "ring allocation failure, err=%d\n", rc);
return rc;
}
@@ -1416,14 +1401,14 @@ static int de_open (struct net_device *dev)
rc = request_irq(dev->irq, de_interrupt, IRQF_SHARED, dev->name, dev);
if (rc) {
- dev_err(&dev->dev, "IRQ %d request failure, err=%d\n",
- dev->irq, rc);
+ netdev_err(dev, "IRQ %d request failure, err=%d\n",
+ dev->irq, rc);
goto err_out_free;
}
rc = de_init_hw(de);
if (rc) {
- dev_err(&dev->dev, "h/w init failure, err=%d\n", rc);
+ netdev_err(dev, "h/w init failure, err=%d\n", rc);
goto err_out_free_irq;
}
@@ -1444,8 +1429,7 @@ static int de_close (struct net_device *dev)
struct de_private *de = netdev_priv(dev);
unsigned long flags;
- if (netif_msg_ifdown(de))
- printk(KERN_DEBUG "%s: disabling interface\n", dev->name);
+ netif_printk(de, ifdown, KERN_DEBUG, dev, "disabling interface\n");
del_timer_sync(&de->media_timer);
@@ -1466,9 +1450,10 @@ static void de_tx_timeout (struct net_device *dev)
{
struct de_private *de = netdev_priv(dev);
- printk(KERN_DEBUG "%s: NIC status %08x mode %08x sia %08x desc %u/%u/%u\n",
- dev->name, dr32(MacStatus), dr32(MacMode), dr32(SIAStatus),
- de->rx_tail, de->tx_head, de->tx_tail);
+ netdev_printk(KERN_DEBUG, dev,
+ "NIC status %08x mode %08x sia %08x desc %u/%u/%u\n",
+ dr32(MacStatus), dr32(MacMode), dr32(SIAStatus),
+ de->rx_tail, de->tx_head, de->tx_tail);
del_timer_sync(&de->media_timer);
@@ -1693,9 +1678,8 @@ static int de_nway_reset(struct net_device *dev)
status = dr32(SIAStatus);
dw32(SIAStatus, (status & ~NWayState) | NWayRestart);
- if (netif_msg_link(de))
- dev_info(&de->dev->dev, "link nway restart, status %x,%x\n",
- status, dr32(SIAStatus));
+ netif_info(de, link, dev, "link nway restart, status %x,%x\n",
+ status, dr32(SIAStatus));
return 0;
}
@@ -1740,7 +1724,8 @@ static void __devinit de21040_get_mac_address (struct de_private *de)
de->dev->dev_addr[i] = value;
udelay(1);
if (boguscnt <= 0)
- pr_warning(PFX "timeout reading 21040 MAC address byte %u\n", i);
+ pr_warn("timeout reading 21040 MAC address byte %u\n",
+ i);
}
}
@@ -1926,8 +1911,10 @@ static void __devinit de21041_get_srom_info (struct de_private *de)
de->media[idx].csr14,
de->media[idx].csr15);
- } else if (netif_msg_probe(de))
- pr_cont("\n");
+ } else {
+ if (netif_msg_probe(de))
+ pr_cont("\n");
+ }
if (bufp > ((void *)&ee_data[DE_EEPROM_SIZE - 3]))
break;
@@ -2038,7 +2025,7 @@ static int __devinit de_init_one (struct pci_dev *pdev,
/* check for invalid IRQ value */
if (pdev->irq < 2) {
rc = -EIO;
- pr_err(PFX "invalid irq (%d) for pci dev %s\n",
+ pr_err("invalid irq (%d) for pci dev %s\n",
pdev->irq, pci_name(pdev));
goto err_out_res;
}
@@ -2049,12 +2036,12 @@ static int __devinit de_init_one (struct pci_dev *pdev,
pciaddr = pci_resource_start(pdev, 1);
if (!pciaddr) {
rc = -EIO;
- pr_err(PFX "no MMIO resource for pci dev %s\n", pci_name(pdev));
+ pr_err("no MMIO resource for pci dev %s\n", pci_name(pdev));
goto err_out_res;
}
if (pci_resource_len(pdev, 1) < DE_REGS_SIZE) {
rc = -EIO;
- pr_err(PFX "MMIO resource (%llx) too small on pci dev %s\n",
+ pr_err("MMIO resource (%llx) too small on pci dev %s\n",
(unsigned long long)pci_resource_len(pdev, 1),
pci_name(pdev));
goto err_out_res;
@@ -2064,7 +2051,7 @@ static int __devinit de_init_one (struct pci_dev *pdev,
regs = ioremap_nocache(pciaddr, DE_REGS_SIZE);
if (!regs) {
rc = -EIO;
- pr_err(PFX "Cannot map PCI MMIO (%llx@%lx) on pci dev %s\n",
+ pr_err("Cannot map PCI MMIO (%llx@%lx) on pci dev %s\n",
(unsigned long long)pci_resource_len(pdev, 1),
pciaddr, pci_name(pdev));
goto err_out_res;
@@ -2077,7 +2064,7 @@ static int __devinit de_init_one (struct pci_dev *pdev,
/* make sure hardware is not running */
rc = de_reset_mac(de);
if (rc) {
- pr_err(PFX "Cannot reset MAC, pci dev %s\n", pci_name(pdev));
+ pr_err("Cannot reset MAC, pci dev %s\n", pci_name(pdev));
goto err_out_iomap;
}
@@ -2097,11 +2084,11 @@ static int __devinit de_init_one (struct pci_dev *pdev,
goto err_out_iomap;
/* print info about board and interface just registered */
- dev_info(&dev->dev, "%s at 0x%lx, %pM, IRQ %d\n",
- de->de21040 ? "21040" : "21041",
- dev->base_addr,
- dev->dev_addr,
- dev->irq);
+ netdev_info(dev, "%s at 0x%lx, %pM, IRQ %d\n",
+ de->de21040 ? "21040" : "21041",
+ dev->base_addr,
+ dev->dev_addr,
+ dev->irq);
pci_set_drvdata(pdev, dev);
@@ -2189,7 +2176,7 @@ static int de_resume (struct pci_dev *pdev)
if (!netif_running(dev))
goto out_attach;
if ((retval = pci_enable_device(pdev))) {
- dev_err(&dev->dev, "pci_enable_device failed in resume\n");
+ netdev_err(dev, "pci_enable_device failed in resume\n");
goto out;
}
pci_set_master(pdev);
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index fb07f48..96e8541 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -406,7 +406,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
SET_NETDEV_DEV(dev, &pdev->dev);
if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
- pr_warning("32-bit PCI DMA not available\n");
+ pr_warn("32-bit PCI DMA not available\n");
err = -ENODEV;
goto err_out_free;
}
diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
index 296486b..fa5eee9 100644
--- a/drivers/net/tulip/eeprom.c
+++ b/drivers/net/tulip/eeprom.c
@@ -222,8 +222,8 @@ subsequent_board:
/* there is no phy information, don't even try to build mtable */
if (count == 0) {
if (tulip_debug > 0)
- pr_warning("%s: no phy info, aborting mtable build\n",
- dev->name);
+ pr_warn("%s: no phy info, aborting mtable build\n",
+ dev->name);
return;
}
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 5c01e26..f46898a 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -12,6 +12,7 @@
Please submit bugs to http://bugzilla.kernel.org/ .
*/
+#define pr_fmt(fmt) "tulip: " fmt
#define DRV_NAME "tulip"
#ifdef CONFIG_TULIP_NAPI
@@ -119,8 +120,6 @@ module_param(csr0, int, 0);
module_param_array(options, int, NULL, 0);
module_param_array(full_duplex, int, NULL, 0);
-#define PFX DRV_NAME ": "
-
#ifdef TULIP_DEBUG
int tulip_debug = TULIP_DEBUG;
#else
@@ -1340,13 +1339,13 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
*/
if (pdev->subsystem_vendor == PCI_VENDOR_ID_LMC) {
- pr_err(PFX "skipping LMC card\n");
+ pr_err("skipping LMC card\n");
return -ENODEV;
} else if (pdev->subsystem_vendor == PCI_VENDOR_ID_SBE &&
(pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_T3E3 ||
pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_2T3E3_P0 ||
pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_2T3E3_P1)) {
- pr_err(PFX "skipping SBE T3E3 port\n");
+ pr_err("skipping SBE T3E3 port\n");
return -ENODEV;
}
@@ -1362,13 +1361,13 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
if (pdev->vendor == 0x1282 && pdev->device == 0x9100 &&
pdev->revision < 0x30) {
- pr_info(PFX "skipping early DM9100 with Crc bug (use dmfe)\n");
+ pr_info("skipping early DM9100 with Crc bug (use dmfe)\n");
return -ENODEV;
}
dp = pci_device_to_OF_node(pdev);
if (!(dp && of_get_property(dp, "local-mac-address", NULL))) {
- pr_info(PFX "skipping DM910x expansion card (use dmfe)\n");
+ pr_info("skipping DM910x expansion card (use dmfe)\n");
return -ENODEV;
}
}
@@ -1415,16 +1414,14 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
i = pci_enable_device(pdev);
if (i) {
- pr_err(PFX "Cannot enable tulip board #%d, aborting\n",
- board_idx);
+ pr_err("Cannot enable tulip board #%d, aborting\n", board_idx);
return i;
}
/* The chip will fail to enter a low-power state later unless
* first explicitly commanded into D0 */
if (pci_set_power_state(pdev, PCI_D0)) {
- printk (KERN_NOTICE PFX
- "Failed to set power state to D0\n");
+ pr_notice("Failed to set power state to D0\n");
}
irq = pdev->irq;
@@ -1432,13 +1429,13 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
/* alloc_etherdev ensures aligned and zeroed private structures */
dev = alloc_etherdev (sizeof (*tp));
if (!dev) {
- pr_err(PFX "ether device alloc failed, aborting\n");
+ pr_err("ether device alloc failed, aborting\n");
return -ENOMEM;
}
SET_NETDEV_DEV(dev, &pdev->dev);
if (pci_resource_len (pdev, 0) < tulip_tbl[chip_idx].io_size) {
- pr_err(PFX "%s: I/O region (0x%llx@0x%llx) too small, aborting\n",
+ pr_err("%s: I/O region (0x%llx@0x%llx) too small, aborting\n",
pci_name(pdev),
(unsigned long long)pci_resource_len (pdev, 0),
(unsigned long long)pci_resource_start (pdev, 0));
@@ -1905,12 +1902,12 @@ static int tulip_resume(struct pci_dev *pdev)
return 0;
if ((retval = pci_enable_device(pdev))) {
- pr_err(PFX "pci_enable_device failed in resume\n");
+ pr_err("pci_enable_device failed in resume\n");
return retval;
}
if ((retval = request_irq(dev->irq, tulip_interrupt, IRQF_SHARED, dev->name, dev))) {
- pr_err(PFX "request_irq failed in resume\n");
+ pr_err("request_irq failed in resume\n");
return retval;
}
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index a4375c4..92c00ee 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -292,7 +292,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
SET_NETDEV_DEV(dev, &pdev->dev);
if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
- pr_warning("32-bit PCI DMA not available\n");
+ pr_warn("32-bit PCI DMA not available\n");
err = -ENODEV;
goto err_out_free;
}
@@ -390,9 +390,9 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
if (err)
goto err_out_res;
- dev_info(&dev->dev, "ULi M%04lx at pci%s, %pM, irq %d\n",
- ent->driver_data >> 16, pci_name(pdev),
- dev->dev_addr, dev->irq);
+ netdev_info(dev, "ULi M%04lx at pci%s, %pM, irq %d\n",
+ ent->driver_data >> 16, pci_name(pdev),
+ dev->dev_addr, dev->irq);
pci_set_master(pdev);
@@ -524,7 +524,7 @@ static void uli526x_init(struct net_device *dev)
}
}
if(phy_tmp == 32)
- pr_warning("Can not find the phy address!!!");
+ pr_warn("Can not find the phy address!!!\n");
/* Parser SROM and media mode */
db->media_mode = uli526x_media_mode;
@@ -590,7 +590,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,
/* Too large packet check */
if (skb->len > MAX_PACKET_SIZE) {
- pr_err("big packet = %d\n", (u16)skb->len);
+ netdev_err(dev, "big packet = %d\n", (u16)skb->len);
dev_kfree_skb(skb);
return NETDEV_TX_OK;
}
@@ -600,7 +600,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,
/* No Tx resource check, it never happen nromally */
if (db->tx_packet_cnt >= TX_FREE_DESC_CNT) {
spin_unlock_irqrestore(&db->lock, flags);
- pr_err("No Tx resource %ld\n", db->tx_packet_cnt);
+ netdev_err(dev, "No Tx resource %ld\n", db->tx_packet_cnt);
return NETDEV_TX_BUSY;
}
@@ -1024,7 +1024,6 @@ static void uli526x_timer(unsigned long data)
struct net_device *dev = (struct net_device *) data;
struct uli526x_board_info *db = netdev_priv(dev);
unsigned long flags;
- u8 TmpSpeed=10;
//ULI526X_DBUG(0, "uli526x_timer()", 0);
spin_lock_irqsave(&db->lock, flags);
@@ -1070,7 +1069,7 @@ static void uli526x_timer(unsigned long data)
/* Link Failed */
ULI526X_DBUG(0, "Link Failed", tmp_cr12);
netif_carrier_off(dev);
- pr_info("%s NIC Link is Down\n",dev->name);
+ netdev_info(dev, "NIC Link is Down\n");
db->link_failed = 1;
/* For Force 10/100M Half/Full mode: Enable Auto-Nego mode */
@@ -1096,18 +1095,13 @@ static void uli526x_timer(unsigned long data)
if(db->link_failed==0)
{
- if(db->op_mode==ULI526X_100MHF || db->op_mode==ULI526X_100MFD)
- {
- TmpSpeed = 100;
- }
- if(db->op_mode==ULI526X_10MFD || db->op_mode==ULI526X_100MFD)
- {
- pr_info("%s NIC Link is Up %d Mbps Full duplex\n",dev->name,TmpSpeed);
- }
- else
- {
- pr_info("%s NIC Link is Up %d Mbps Half duplex\n",dev->name,TmpSpeed);
- }
+ netdev_info(dev, "NIC Link is Up %d Mbps %s duplex\n",
+ (db->op_mode == ULI526X_100MHF ||
+ db->op_mode == ULI526X_100MFD)
+ ? 100 : 10,
+ (db->op_mode == ULI526X_10MFD ||
+ db->op_mode == ULI526X_100MFD)
+ ? "Full" : "Half");
netif_carrier_on(dev);
}
/* SHOW_MEDIA_TYPE(db->op_mode); */
@@ -1116,7 +1110,7 @@ static void uli526x_timer(unsigned long data)
{
if(db->init==1)
{
- pr_info("%s NIC Link is Down\n",dev->name);
+ netdev_info(dev, "NIC Link is Down\n");
netif_carrier_off(dev);
}
}
@@ -1242,7 +1236,7 @@ static int uli526x_resume(struct pci_dev *pdev)
err = pci_set_power_state(pdev, PCI_D0);
if (err) {
- dev_warn(&dev->dev, "Could not put device into D0\n");
+ netdev_warn(dev, "Could not put device into D0\n");
return err;
}
@@ -1443,7 +1437,7 @@ static void send_filter_frame(struct net_device *dev, int mc_cnt)
update_cr6(db->cr6_data, dev->base_addr);
dev->trans_start = jiffies;
} else
- pr_err("No Tx resource - Send_filter_frame!\n");
+ netdev_err(dev, "No Tx resource - Send_filter_frame!\n");
}
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index f0b2310..939c96e 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -44,6 +44,8 @@
* Wake-On-LAN
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#define DRV_NAME "winbond-840"
#define DRV_VERSION "1.01-e"
#define DRV_RELDATE "Sep-11-2006"
@@ -375,8 +377,8 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,
irq = pdev->irq;
if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
- pr_warning("Winbond-840: Device %s disabled due to DMA limitations\n",
- pci_name(pdev));
+ pr_warn("Device %s disabled due to DMA limitations\n",
+ pci_name(pdev));
return -EIO;
}
dev = alloc_etherdev(sizeof(*np));
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 4436865..abfe2e3 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -272,8 +272,8 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
goto reg_fail;
}
- dev_info(&dev->dev, "Xircom cardbus revision %i at irq %i\n",
- pdev->revision, pdev->irq);
+ netdev_info(dev, "Xircom cardbus revision %i at irq %i\n",
+ pdev->revision, pdev->irq);
/* start the transmitter to get a heartbeat */
/* TODO: send 2 dummy packets here */
transceiver_voodoo(private);
@@ -350,7 +350,7 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
int newlink;
printk(KERN_DEBUG "xircom_cb: Link status has changed\n");
newlink = link_status(card);
- dev_info(&dev->dev, "Link is %i mbit\n", newlink);
+ netdev_info(dev, "Link is %d mbit\n", newlink);
if (newlink)
netif_carrier_on(dev);
else
@@ -447,8 +447,8 @@ static int xircom_open(struct net_device *dev)
struct xircom_private *xp = netdev_priv(dev);
int retval;
func_enter();
- pr_info("xircom cardbus adaptor found, registering as %s, using irq %i\n",
- dev->name, dev->irq);
+ netdev_info(dev, "xircom cardbus adaptor found, using irq %i\n",
+ dev->irq);
retval = request_irq(dev->irq, xircom_interrupt, IRQF_SHARED, dev->name, dev);
if (retval) {
func_exit();
@@ -761,7 +761,7 @@ static void activate_receiver(struct xircom_private *card)
udelay(50);
counter--;
if (counter <= 0)
- pr_err("Receiver failed to deactivate\n");
+ netdev_err(card->dev, "Receiver failed to deactivate\n");
}
/* enable the receiver */
@@ -778,7 +778,8 @@ static void activate_receiver(struct xircom_private *card)
udelay(50);
counter--;
if (counter <= 0)
- pr_err("Receiver failed to re-activate\n");
+ netdev_err(card->dev,
+ "Receiver failed to re-activate\n");
}
func_exit();
@@ -809,7 +810,7 @@ static void deactivate_receiver(struct xircom_private *card)
udelay(50);
counter--;
if (counter <= 0)
- pr_err("Receiver failed to deactivate\n");
+ netdev_err(card->dev, "Receiver failed to deactivate\n");
}
@@ -852,7 +853,8 @@ static void activate_transmitter(struct xircom_private *card)
udelay(50);
counter--;
if (counter <= 0)
- pr_err("Transmitter failed to deactivate\n");
+ netdev_err(card->dev,
+ "Transmitter failed to deactivate\n");
}
/* enable the transmitter */
@@ -869,7 +871,8 @@ static void activate_transmitter(struct xircom_private *card)
udelay(50);
counter--;
if (counter <= 0)
- pr_err("Transmitter failed to re-activate\n");
+ netdev_err(card->dev,
+ "Transmitter failed to re-activate\n");
}
func_exit();
@@ -900,7 +903,8 @@ static void deactivate_transmitter(struct xircom_private *card)
udelay(50);
counter--;
if (counter <= 0)
- pr_err("Transmitter failed to deactivate\n");
+ netdev_err(card->dev,
+ "Transmitter failed to deactivate\n");
}
@@ -1160,80 +1164,86 @@ static void xircom_up(struct xircom_private *card)
}
/* Bufferoffset is in BYTES */
-static void investigate_read_descriptor(struct net_device *dev,struct xircom_private *card, int descnr, unsigned int bufferoffset)
+static void
+investigate_read_descriptor(struct net_device *dev, struct xircom_private *card,
+ int descnr, unsigned int bufferoffset)
{
- int status;
+ int status;
- func_enter();
- status = le32_to_cpu(card->rx_buffer[4*descnr]);
-
- if ((status > 0)) { /* packet received */
+ func_enter();
- /* TODO: discard error packets */
+ status = le32_to_cpu(card->rx_buffer[4*descnr]);
+ if (status > 0) { /* packet received */
- short pkt_len = ((status >> 16) & 0x7ff) - 4; /* minus 4, we don't want the CRC */
- struct sk_buff *skb;
+ /* TODO: discard error packets */
- if (pkt_len > 1518) {
- pr_err("Packet length %i is bogus\n", pkt_len);
- pkt_len = 1518;
- }
+ short pkt_len = ((status >> 16) & 0x7ff) - 4;
+ /* minus 4, we don't want the CRC */
+ struct sk_buff *skb;
- skb = dev_alloc_skb(pkt_len + 2);
- if (skb == NULL) {
- dev->stats.rx_dropped++;
- goto out;
- }
- skb_reserve(skb, 2);
- skb_copy_to_linear_data(skb, (unsigned char*)&card->rx_buffer[bufferoffset / 4], pkt_len);
- skb_put(skb, pkt_len);
- skb->protocol = eth_type_trans(skb, dev);
- netif_rx(skb);
- dev->stats.rx_packets++;
- dev->stats.rx_bytes += pkt_len;
-
- out:
- /* give the buffer back to the card */
- card->rx_buffer[4*descnr] = cpu_to_le32(0x80000000);
- trigger_receive(card);
+ if (pkt_len > 1518) {
+ netdev_err(dev, "Packet length %i is bogus\n", pkt_len);
+ pkt_len = 1518;
}
- func_exit();
+ skb = dev_alloc_skb(pkt_len + 2);
+ if (skb == NULL) {
+ dev->stats.rx_dropped++;
+ goto out;
+ }
+ skb_reserve(skb, 2);
+ skb_copy_to_linear_data(skb,
+ &card->rx_buffer[bufferoffset / 4],
+ pkt_len);
+ skb_put(skb, pkt_len);
+ skb->protocol = eth_type_trans(skb, dev);
+ netif_rx(skb);
+ dev->stats.rx_packets++;
+ dev->stats.rx_bytes += pkt_len;
+
+out:
+ /* give the buffer back to the card */
+ card->rx_buffer[4*descnr] = cpu_to_le32(0x80000000);
+ trigger_receive(card);
+ }
+ func_exit();
}
/* Bufferoffset is in BYTES */
-static void investigate_write_descriptor(struct net_device *dev, struct xircom_private *card, int descnr, unsigned int bufferoffset)
+static void
+investigate_write_descriptor(struct net_device *dev,
+ struct xircom_private *card,
+ int descnr, unsigned int bufferoffset)
{
- int status;
+ int status;
- func_enter();
+ func_enter();
- status = le32_to_cpu(card->tx_buffer[4*descnr]);
+ status = le32_to_cpu(card->tx_buffer[4*descnr]);
#if 0
- if (status & 0x8000) { /* Major error */
- pr_err("Major transmit error status %x\n", status);
- card->tx_buffer[4*descnr] = 0;
- netif_wake_queue (dev);
- }
+ if (status & 0x8000) { /* Major error */
+ netdev_err(dev, "Major transmit error status %x\n", status);
+ card->tx_buffer[4*descnr] = 0;
+ netif_wake_queue(dev);
+ }
#endif
- if (status > 0) { /* bit 31 is 0 when done */
- if (card->tx_skb[descnr]!=NULL) {
- dev->stats.tx_bytes += card->tx_skb[descnr]->len;
- dev_kfree_skb_irq(card->tx_skb[descnr]);
- }
- card->tx_skb[descnr] = NULL;
- /* Bit 8 in the status field is 1 if there was a collision */
- if (status&(1<<8))
- dev->stats.collisions++;
- card->tx_buffer[4*descnr] = 0; /* descriptor is free again */
- netif_wake_queue (dev);
- dev->stats.tx_packets++;
+ if (status > 0) { /* bit 31 is 0 when done */
+ if (card->tx_skb[descnr] != NULL) {
+ dev->stats.tx_bytes += card->tx_skb[descnr]->len;
+ dev_kfree_skb_irq(card->tx_skb[descnr]);
}
+ card->tx_skb[descnr] = NULL;
+ /* Bit 8 in the status field is 1 if there was a collision */
+ if (status&(1<<8))
+ dev->stats.collisions++;
+ card->tx_buffer[4*descnr] = 0; /* descriptor is free again */
+ netif_wake_queue(dev);
+ dev->stats.tx_packets++;
+ }
- func_exit();
-
+ func_exit();
}
--
1.7.5.rc3.dirty
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH net-next 2/4] tulip: Convert printks to netdev_<level>
2011-05-07 2:08 ` [PATCH net-next 2/4] tulip: Convert printks to netdev_<level> Joe Perches
@ 2011-05-12 4:09 ` Grant Grundler
2011-05-12 4:59 ` Joe Perches
0 siblings, 1 reply; 15+ messages in thread
From: Grant Grundler @ 2011-05-12 4:09 UTC (permalink / raw)
To: Joe Perches; +Cc: Tobias Ringstrom, netdev, linux-kernel
On Fri, May 06, 2011 at 07:08:43PM -0700, Joe Perches wrote:
> Use the current more descriptive logging styles.
>
> Add pr_fmt and remove PFX where appropriate.
> Use netif_<level>, netdev_<level>
> Indent a few blocks in xircom_cb where appropriate.
>
> Signed-off-by: Joe Perches <joe@perches.com>
Ack-by: Grant Grundler <grundler@parisc-linux.org>
Some additional clean ups to consider in a future patch:
o replace "if (skb == NULL)" with "if (!skb)"
o in general, HW doesn't return signed integer values. Where possible,
I prefer to see "unsigned int status;" and "if (status)".
thanks,
grant
> ---
> drivers/net/tulip/de2104x.c | 139 +++++++++++++++++---------------------
> drivers/net/tulip/dmfe.c | 2 +-
> drivers/net/tulip/eeprom.c | 4 +-
> drivers/net/tulip/tulip_core.c | 25 +++----
> drivers/net/tulip/uli526x.c | 42 +++++-------
> drivers/net/tulip/winbond-840.c | 6 +-
> drivers/net/tulip/xircom_cb.c | 140 +++++++++++++++++++++------------------
> 7 files changed, 174 insertions(+), 184 deletions(-)
>
> diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
> index 46d5a1b..62883a0 100644
> --- a/drivers/net/tulip/de2104x.c
> +++ b/drivers/net/tulip/de2104x.c
> @@ -27,6 +27,8 @@
>
> */
>
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> #define DRV_NAME "de2104x"
> #define DRV_VERSION "0.7"
> #define DRV_RELDATE "Mar 17, 2004"
> @@ -73,8 +75,6 @@ static int rx_copybreak = 100;
> module_param (rx_copybreak, int, 0);
> MODULE_PARM_DESC (rx_copybreak, "de2104x Breakpoint at which Rx packets are copied");
>
> -#define PFX DRV_NAME ": "
> -
> #define DE_DEF_MSG_ENABLE (NETIF_MSG_DRV | \
> NETIF_MSG_PROBE | \
> NETIF_MSG_LINK | \
> @@ -377,18 +377,16 @@ static u16 t21041_csr15[] = { 0x0008, 0x0006, 0x000E, 0x0008, 0x0008, };
> static void de_rx_err_acct (struct de_private *de, unsigned rx_tail,
> u32 status, u32 len)
> {
> - if (netif_msg_rx_err (de))
> - printk (KERN_DEBUG
> - "%s: rx err, slot %d status 0x%x len %d\n",
> - de->dev->name, rx_tail, status, len);
> + netif_printk(de, rx_err, KERN_DEBUG, de->dev,
> + "rx err, slot %d status 0x%x len %d\n",
> + rx_tail, status, len);
>
> if ((status & 0x38000300) != 0x0300) {
> /* Ingore earlier buffers. */
> if ((status & 0xffff) != 0x7fff) {
> - if (netif_msg_rx_err(de))
> - dev_warn(&de->dev->dev,
> - "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
> - status);
> + netif_warn(de, rx_err, de->dev,
> + "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
> + status);
> de->net_stats.rx_length_errors++;
> }
> } else if (status & RxError) {
> @@ -491,7 +489,7 @@ rx_next:
> }
>
> if (!rx_work)
> - dev_warn(&de->dev->dev, "rx work limit reached\n");
> + netdev_warn(de->dev, "rx work limit reached\n");
>
> de->rx_tail = rx_tail;
> }
> @@ -534,9 +532,9 @@ static irqreturn_t de_interrupt (int irq, void *dev_instance)
>
> pci_read_config_word(de->pdev, PCI_STATUS, &pci_status);
> pci_write_config_word(de->pdev, PCI_STATUS, pci_status);
> - dev_err(&de->dev->dev,
> - "PCI bus error, status=%08x, PCI status=%04x\n",
> - status, pci_status);
> + netdev_err(de->dev,
> + "PCI bus error, status=%08x, PCI status=%04x\n",
> + status, pci_status);
> }
>
> return IRQ_HANDLED;
> @@ -873,7 +871,7 @@ static void de_stop_rxtx (struct de_private *de)
> udelay(100);
> }
>
> - dev_warn(&de->dev->dev, "timeout expired stopping DMA\n");
> + netdev_warn(de->dev, "timeout expired, stopping DMA\n");
> }
>
> static inline void de_start_rxtx (struct de_private *de)
> @@ -907,9 +905,8 @@ static void de_link_up(struct de_private *de)
> {
> if (!netif_carrier_ok(de->dev)) {
> netif_carrier_on(de->dev);
> - if (netif_msg_link(de))
> - dev_info(&de->dev->dev, "link up, media %s\n",
> - media_name[de->media_type]);
> + netif_info(de, link, de->dev, "link up, media %s\n",
> + media_name[de->media_type]);
> }
> }
>
> @@ -917,8 +914,7 @@ static void de_link_down(struct de_private *de)
> {
> if (netif_carrier_ok(de->dev)) {
> netif_carrier_off(de->dev);
> - if (netif_msg_link(de))
> - dev_info(&de->dev->dev, "link down\n");
> + netif_info(de, link, de->dev, "link down\n");
> }
> }
>
> @@ -928,8 +924,7 @@ static void de_set_media (struct de_private *de)
> u32 macmode = dr32(MacMode);
>
> if (de_is_running(de))
> - dev_warn(&de->dev->dev,
> - "chip is running while changing media!\n");
> + netdev_warn(de->dev, "chip is running while changing media!\n");
>
> if (de->de21040)
> dw32(CSR11, FULL_DUPLEX_MAGIC);
> @@ -948,18 +943,13 @@ static void de_set_media (struct de_private *de)
> else
> macmode &= ~FullDuplex;
>
> - if (netif_msg_link(de))
> - dev_info(&de->dev->dev, "set link %s\n", media_name[media]);
> - if (netif_msg_hw(de)) {
> - dev_info(&de->dev->dev, "mode 0x%x, sia 0x%x,0x%x,0x%x,0x%x\n",
> - dr32(MacMode), dr32(SIAStatus),
> - dr32(CSR13), dr32(CSR14), dr32(CSR15));
> -
> - dev_info(&de->dev->dev,
> - "set mode 0x%x, set sia 0x%x,0x%x,0x%x\n",
> - macmode, de->media[media].csr13,
> - de->media[media].csr14, de->media[media].csr15);
> - }
> + netif_info(de, link, de->dev, "set link %s\n", media_name[media]);
> + netif_info(de, hw, de->dev, "mode 0x%x, sia 0x%x,0x%x,0x%x,0x%x\n",
> + dr32(MacMode), dr32(SIAStatus),
> + dr32(CSR13), dr32(CSR14), dr32(CSR15));
> + netif_info(de, hw, de->dev, "set mode 0x%x, set sia 0x%x,0x%x,0x%x\n",
> + macmode, de->media[media].csr13,
> + de->media[media].csr14, de->media[media].csr15);
> if (macmode != dr32(MacMode))
> dw32(MacMode, macmode);
> }
> @@ -996,9 +986,8 @@ static void de21040_media_timer (unsigned long data)
> if (!netif_carrier_ok(dev))
> de_link_up(de);
> else
> - if (netif_msg_timer(de))
> - dev_info(&dev->dev, "%s link ok, status %x\n",
> - media_name[de->media_type], status);
> + netif_info(de, timer, dev, "%s link ok, status %x\n",
> + media_name[de->media_type], status);
> return;
> }
>
> @@ -1025,9 +1014,8 @@ no_link_yet:
> de->media_timer.expires = jiffies + DE_TIMER_NO_LINK;
> add_timer(&de->media_timer);
>
> - if (netif_msg_timer(de))
> - dev_info(&dev->dev, "no link, trying media %s, status %x\n",
> - media_name[de->media_type], status);
> + netif_info(de, timer, dev, "no link, trying media %s, status %x\n",
> + media_name[de->media_type], status);
> }
>
> static unsigned int de_ok_to_advertise (struct de_private *de, u32 new_media)
> @@ -1085,11 +1073,10 @@ static void de21041_media_timer (unsigned long data)
> if (!netif_carrier_ok(dev))
> de_link_up(de);
> else
> - if (netif_msg_timer(de))
> - dev_info(&dev->dev,
> - "%s link ok, mode %x status %x\n",
> - media_name[de->media_type],
> - dr32(MacMode), status);
> + netif_info(de, timer, dev,
> + "%s link ok, mode %x status %x\n",
> + media_name[de->media_type],
> + dr32(MacMode), status);
> return;
> }
>
> @@ -1163,9 +1150,8 @@ no_link_yet:
> de->media_timer.expires = jiffies + DE_TIMER_NO_LINK;
> add_timer(&de->media_timer);
>
> - if (netif_msg_timer(de))
> - dev_info(&dev->dev, "no link, trying media %s, status %x\n",
> - media_name[de->media_type], status);
> + netif_info(de, timer, dev, "no link, trying media %s, status %x\n",
> + media_name[de->media_type], status);
> }
>
> static void de_media_interrupt (struct de_private *de, u32 status)
> @@ -1401,14 +1387,13 @@ static int de_open (struct net_device *dev)
> struct de_private *de = netdev_priv(dev);
> int rc;
>
> - if (netif_msg_ifup(de))
> - printk(KERN_DEBUG "%s: enabling interface\n", dev->name);
> + netif_printk(de, ifup, KERN_DEBUG, dev, "enabling interface\n");
>
> de->rx_buf_sz = (dev->mtu <= 1500 ? PKT_BUF_SZ : dev->mtu + 32);
>
> rc = de_alloc_rings(de);
> if (rc) {
> - dev_err(&dev->dev, "ring allocation failure, err=%d\n", rc);
> + netdev_err(dev, "ring allocation failure, err=%d\n", rc);
> return rc;
> }
>
> @@ -1416,14 +1401,14 @@ static int de_open (struct net_device *dev)
>
> rc = request_irq(dev->irq, de_interrupt, IRQF_SHARED, dev->name, dev);
> if (rc) {
> - dev_err(&dev->dev, "IRQ %d request failure, err=%d\n",
> - dev->irq, rc);
> + netdev_err(dev, "IRQ %d request failure, err=%d\n",
> + dev->irq, rc);
> goto err_out_free;
> }
>
> rc = de_init_hw(de);
> if (rc) {
> - dev_err(&dev->dev, "h/w init failure, err=%d\n", rc);
> + netdev_err(dev, "h/w init failure, err=%d\n", rc);
> goto err_out_free_irq;
> }
>
> @@ -1444,8 +1429,7 @@ static int de_close (struct net_device *dev)
> struct de_private *de = netdev_priv(dev);
> unsigned long flags;
>
> - if (netif_msg_ifdown(de))
> - printk(KERN_DEBUG "%s: disabling interface\n", dev->name);
> + netif_printk(de, ifdown, KERN_DEBUG, dev, "disabling interface\n");
>
> del_timer_sync(&de->media_timer);
>
> @@ -1466,9 +1450,10 @@ static void de_tx_timeout (struct net_device *dev)
> {
> struct de_private *de = netdev_priv(dev);
>
> - printk(KERN_DEBUG "%s: NIC status %08x mode %08x sia %08x desc %u/%u/%u\n",
> - dev->name, dr32(MacStatus), dr32(MacMode), dr32(SIAStatus),
> - de->rx_tail, de->tx_head, de->tx_tail);
> + netdev_printk(KERN_DEBUG, dev,
> + "NIC status %08x mode %08x sia %08x desc %u/%u/%u\n",
> + dr32(MacStatus), dr32(MacMode), dr32(SIAStatus),
> + de->rx_tail, de->tx_head, de->tx_tail);
>
> del_timer_sync(&de->media_timer);
>
> @@ -1693,9 +1678,8 @@ static int de_nway_reset(struct net_device *dev)
>
> status = dr32(SIAStatus);
> dw32(SIAStatus, (status & ~NWayState) | NWayRestart);
> - if (netif_msg_link(de))
> - dev_info(&de->dev->dev, "link nway restart, status %x,%x\n",
> - status, dr32(SIAStatus));
> + netif_info(de, link, dev, "link nway restart, status %x,%x\n",
> + status, dr32(SIAStatus));
> return 0;
> }
>
> @@ -1740,7 +1724,8 @@ static void __devinit de21040_get_mac_address (struct de_private *de)
> de->dev->dev_addr[i] = value;
> udelay(1);
> if (boguscnt <= 0)
> - pr_warning(PFX "timeout reading 21040 MAC address byte %u\n", i);
> + pr_warn("timeout reading 21040 MAC address byte %u\n",
> + i);
> }
> }
>
> @@ -1926,8 +1911,10 @@ static void __devinit de21041_get_srom_info (struct de_private *de)
> de->media[idx].csr14,
> de->media[idx].csr15);
>
> - } else if (netif_msg_probe(de))
> - pr_cont("\n");
> + } else {
> + if (netif_msg_probe(de))
> + pr_cont("\n");
> + }
>
> if (bufp > ((void *)&ee_data[DE_EEPROM_SIZE - 3]))
> break;
> @@ -2038,7 +2025,7 @@ static int __devinit de_init_one (struct pci_dev *pdev,
> /* check for invalid IRQ value */
> if (pdev->irq < 2) {
> rc = -EIO;
> - pr_err(PFX "invalid irq (%d) for pci dev %s\n",
> + pr_err("invalid irq (%d) for pci dev %s\n",
> pdev->irq, pci_name(pdev));
> goto err_out_res;
> }
> @@ -2049,12 +2036,12 @@ static int __devinit de_init_one (struct pci_dev *pdev,
> pciaddr = pci_resource_start(pdev, 1);
> if (!pciaddr) {
> rc = -EIO;
> - pr_err(PFX "no MMIO resource for pci dev %s\n", pci_name(pdev));
> + pr_err("no MMIO resource for pci dev %s\n", pci_name(pdev));
> goto err_out_res;
> }
> if (pci_resource_len(pdev, 1) < DE_REGS_SIZE) {
> rc = -EIO;
> - pr_err(PFX "MMIO resource (%llx) too small on pci dev %s\n",
> + pr_err("MMIO resource (%llx) too small on pci dev %s\n",
> (unsigned long long)pci_resource_len(pdev, 1),
> pci_name(pdev));
> goto err_out_res;
> @@ -2064,7 +2051,7 @@ static int __devinit de_init_one (struct pci_dev *pdev,
> regs = ioremap_nocache(pciaddr, DE_REGS_SIZE);
> if (!regs) {
> rc = -EIO;
> - pr_err(PFX "Cannot map PCI MMIO (%llx@%lx) on pci dev %s\n",
> + pr_err("Cannot map PCI MMIO (%llx@%lx) on pci dev %s\n",
> (unsigned long long)pci_resource_len(pdev, 1),
> pciaddr, pci_name(pdev));
> goto err_out_res;
> @@ -2077,7 +2064,7 @@ static int __devinit de_init_one (struct pci_dev *pdev,
> /* make sure hardware is not running */
> rc = de_reset_mac(de);
> if (rc) {
> - pr_err(PFX "Cannot reset MAC, pci dev %s\n", pci_name(pdev));
> + pr_err("Cannot reset MAC, pci dev %s\n", pci_name(pdev));
> goto err_out_iomap;
> }
>
> @@ -2097,11 +2084,11 @@ static int __devinit de_init_one (struct pci_dev *pdev,
> goto err_out_iomap;
>
> /* print info about board and interface just registered */
> - dev_info(&dev->dev, "%s at 0x%lx, %pM, IRQ %d\n",
> - de->de21040 ? "21040" : "21041",
> - dev->base_addr,
> - dev->dev_addr,
> - dev->irq);
> + netdev_info(dev, "%s at 0x%lx, %pM, IRQ %d\n",
> + de->de21040 ? "21040" : "21041",
> + dev->base_addr,
> + dev->dev_addr,
> + dev->irq);
>
> pci_set_drvdata(pdev, dev);
>
> @@ -2189,7 +2176,7 @@ static int de_resume (struct pci_dev *pdev)
> if (!netif_running(dev))
> goto out_attach;
> if ((retval = pci_enable_device(pdev))) {
> - dev_err(&dev->dev, "pci_enable_device failed in resume\n");
> + netdev_err(dev, "pci_enable_device failed in resume\n");
> goto out;
> }
> pci_set_master(pdev);
> diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
> index fb07f48..96e8541 100644
> --- a/drivers/net/tulip/dmfe.c
> +++ b/drivers/net/tulip/dmfe.c
> @@ -406,7 +406,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
> SET_NETDEV_DEV(dev, &pdev->dev);
>
> if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
> - pr_warning("32-bit PCI DMA not available\n");
> + pr_warn("32-bit PCI DMA not available\n");
> err = -ENODEV;
> goto err_out_free;
> }
> diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
> index 296486b..fa5eee9 100644
> --- a/drivers/net/tulip/eeprom.c
> +++ b/drivers/net/tulip/eeprom.c
> @@ -222,8 +222,8 @@ subsequent_board:
> /* there is no phy information, don't even try to build mtable */
> if (count == 0) {
> if (tulip_debug > 0)
> - pr_warning("%s: no phy info, aborting mtable build\n",
> - dev->name);
> + pr_warn("%s: no phy info, aborting mtable build\n",
> + dev->name);
> return;
> }
>
> diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
> index 5c01e26..f46898a 100644
> --- a/drivers/net/tulip/tulip_core.c
> +++ b/drivers/net/tulip/tulip_core.c
> @@ -12,6 +12,7 @@
> Please submit bugs to http://bugzilla.kernel.org/ .
> */
>
> +#define pr_fmt(fmt) "tulip: " fmt
>
> #define DRV_NAME "tulip"
> #ifdef CONFIG_TULIP_NAPI
> @@ -119,8 +120,6 @@ module_param(csr0, int, 0);
> module_param_array(options, int, NULL, 0);
> module_param_array(full_duplex, int, NULL, 0);
>
> -#define PFX DRV_NAME ": "
> -
> #ifdef TULIP_DEBUG
> int tulip_debug = TULIP_DEBUG;
> #else
> @@ -1340,13 +1339,13 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
> */
>
> if (pdev->subsystem_vendor == PCI_VENDOR_ID_LMC) {
> - pr_err(PFX "skipping LMC card\n");
> + pr_err("skipping LMC card\n");
> return -ENODEV;
> } else if (pdev->subsystem_vendor == PCI_VENDOR_ID_SBE &&
> (pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_T3E3 ||
> pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_2T3E3_P0 ||
> pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_2T3E3_P1)) {
> - pr_err(PFX "skipping SBE T3E3 port\n");
> + pr_err("skipping SBE T3E3 port\n");
> return -ENODEV;
> }
>
> @@ -1362,13 +1361,13 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
>
> if (pdev->vendor == 0x1282 && pdev->device == 0x9100 &&
> pdev->revision < 0x30) {
> - pr_info(PFX "skipping early DM9100 with Crc bug (use dmfe)\n");
> + pr_info("skipping early DM9100 with Crc bug (use dmfe)\n");
> return -ENODEV;
> }
>
> dp = pci_device_to_OF_node(pdev);
> if (!(dp && of_get_property(dp, "local-mac-address", NULL))) {
> - pr_info(PFX "skipping DM910x expansion card (use dmfe)\n");
> + pr_info("skipping DM910x expansion card (use dmfe)\n");
> return -ENODEV;
> }
> }
> @@ -1415,16 +1414,14 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
>
> i = pci_enable_device(pdev);
> if (i) {
> - pr_err(PFX "Cannot enable tulip board #%d, aborting\n",
> - board_idx);
> + pr_err("Cannot enable tulip board #%d, aborting\n", board_idx);
> return i;
> }
>
> /* The chip will fail to enter a low-power state later unless
> * first explicitly commanded into D0 */
> if (pci_set_power_state(pdev, PCI_D0)) {
> - printk (KERN_NOTICE PFX
> - "Failed to set power state to D0\n");
> + pr_notice("Failed to set power state to D0\n");
> }
>
> irq = pdev->irq;
> @@ -1432,13 +1429,13 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
> /* alloc_etherdev ensures aligned and zeroed private structures */
> dev = alloc_etherdev (sizeof (*tp));
> if (!dev) {
> - pr_err(PFX "ether device alloc failed, aborting\n");
> + pr_err("ether device alloc failed, aborting\n");
> return -ENOMEM;
> }
>
> SET_NETDEV_DEV(dev, &pdev->dev);
> if (pci_resource_len (pdev, 0) < tulip_tbl[chip_idx].io_size) {
> - pr_err(PFX "%s: I/O region (0x%llx@0x%llx) too small, aborting\n",
> + pr_err("%s: I/O region (0x%llx@0x%llx) too small, aborting\n",
> pci_name(pdev),
> (unsigned long long)pci_resource_len (pdev, 0),
> (unsigned long long)pci_resource_start (pdev, 0));
> @@ -1905,12 +1902,12 @@ static int tulip_resume(struct pci_dev *pdev)
> return 0;
>
> if ((retval = pci_enable_device(pdev))) {
> - pr_err(PFX "pci_enable_device failed in resume\n");
> + pr_err("pci_enable_device failed in resume\n");
> return retval;
> }
>
> if ((retval = request_irq(dev->irq, tulip_interrupt, IRQF_SHARED, dev->name, dev))) {
> - pr_err(PFX "request_irq failed in resume\n");
> + pr_err("request_irq failed in resume\n");
> return retval;
> }
>
> diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
> index a4375c4..92c00ee 100644
> --- a/drivers/net/tulip/uli526x.c
> +++ b/drivers/net/tulip/uli526x.c
> @@ -292,7 +292,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
> SET_NETDEV_DEV(dev, &pdev->dev);
>
> if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
> - pr_warning("32-bit PCI DMA not available\n");
> + pr_warn("32-bit PCI DMA not available\n");
> err = -ENODEV;
> goto err_out_free;
> }
> @@ -390,9 +390,9 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
> if (err)
> goto err_out_res;
>
> - dev_info(&dev->dev, "ULi M%04lx at pci%s, %pM, irq %d\n",
> - ent->driver_data >> 16, pci_name(pdev),
> - dev->dev_addr, dev->irq);
> + netdev_info(dev, "ULi M%04lx at pci%s, %pM, irq %d\n",
> + ent->driver_data >> 16, pci_name(pdev),
> + dev->dev_addr, dev->irq);
>
> pci_set_master(pdev);
>
> @@ -524,7 +524,7 @@ static void uli526x_init(struct net_device *dev)
> }
> }
> if(phy_tmp == 32)
> - pr_warning("Can not find the phy address!!!");
> + pr_warn("Can not find the phy address!!!\n");
> /* Parser SROM and media mode */
> db->media_mode = uli526x_media_mode;
>
> @@ -590,7 +590,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,
>
> /* Too large packet check */
> if (skb->len > MAX_PACKET_SIZE) {
> - pr_err("big packet = %d\n", (u16)skb->len);
> + netdev_err(dev, "big packet = %d\n", (u16)skb->len);
> dev_kfree_skb(skb);
> return NETDEV_TX_OK;
> }
> @@ -600,7 +600,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,
> /* No Tx resource check, it never happen nromally */
> if (db->tx_packet_cnt >= TX_FREE_DESC_CNT) {
> spin_unlock_irqrestore(&db->lock, flags);
> - pr_err("No Tx resource %ld\n", db->tx_packet_cnt);
> + netdev_err(dev, "No Tx resource %ld\n", db->tx_packet_cnt);
> return NETDEV_TX_BUSY;
> }
>
> @@ -1024,7 +1024,6 @@ static void uli526x_timer(unsigned long data)
> struct net_device *dev = (struct net_device *) data;
> struct uli526x_board_info *db = netdev_priv(dev);
> unsigned long flags;
> - u8 TmpSpeed=10;
>
> //ULI526X_DBUG(0, "uli526x_timer()", 0);
> spin_lock_irqsave(&db->lock, flags);
> @@ -1070,7 +1069,7 @@ static void uli526x_timer(unsigned long data)
> /* Link Failed */
> ULI526X_DBUG(0, "Link Failed", tmp_cr12);
> netif_carrier_off(dev);
> - pr_info("%s NIC Link is Down\n",dev->name);
> + netdev_info(dev, "NIC Link is Down\n");
> db->link_failed = 1;
>
> /* For Force 10/100M Half/Full mode: Enable Auto-Nego mode */
> @@ -1096,18 +1095,13 @@ static void uli526x_timer(unsigned long data)
>
> if(db->link_failed==0)
> {
> - if(db->op_mode==ULI526X_100MHF || db->op_mode==ULI526X_100MFD)
> - {
> - TmpSpeed = 100;
> - }
> - if(db->op_mode==ULI526X_10MFD || db->op_mode==ULI526X_100MFD)
> - {
> - pr_info("%s NIC Link is Up %d Mbps Full duplex\n",dev->name,TmpSpeed);
> - }
> - else
> - {
> - pr_info("%s NIC Link is Up %d Mbps Half duplex\n",dev->name,TmpSpeed);
> - }
> + netdev_info(dev, "NIC Link is Up %d Mbps %s duplex\n",
> + (db->op_mode == ULI526X_100MHF ||
> + db->op_mode == ULI526X_100MFD)
> + ? 100 : 10,
> + (db->op_mode == ULI526X_10MFD ||
> + db->op_mode == ULI526X_100MFD)
> + ? "Full" : "Half");
> netif_carrier_on(dev);
> }
> /* SHOW_MEDIA_TYPE(db->op_mode); */
> @@ -1116,7 +1110,7 @@ static void uli526x_timer(unsigned long data)
> {
> if(db->init==1)
> {
> - pr_info("%s NIC Link is Down\n",dev->name);
> + netdev_info(dev, "NIC Link is Down\n");
> netif_carrier_off(dev);
> }
> }
> @@ -1242,7 +1236,7 @@ static int uli526x_resume(struct pci_dev *pdev)
>
> err = pci_set_power_state(pdev, PCI_D0);
> if (err) {
> - dev_warn(&dev->dev, "Could not put device into D0\n");
> + netdev_warn(dev, "Could not put device into D0\n");
> return err;
> }
>
> @@ -1443,7 +1437,7 @@ static void send_filter_frame(struct net_device *dev, int mc_cnt)
> update_cr6(db->cr6_data, dev->base_addr);
> dev->trans_start = jiffies;
> } else
> - pr_err("No Tx resource - Send_filter_frame!\n");
> + netdev_err(dev, "No Tx resource - Send_filter_frame!\n");
> }
>
>
> diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
> index f0b2310..939c96e 100644
> --- a/drivers/net/tulip/winbond-840.c
> +++ b/drivers/net/tulip/winbond-840.c
> @@ -44,6 +44,8 @@
> * Wake-On-LAN
> */
>
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> #define DRV_NAME "winbond-840"
> #define DRV_VERSION "1.01-e"
> #define DRV_RELDATE "Sep-11-2006"
> @@ -375,8 +377,8 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,
> irq = pdev->irq;
>
> if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
> - pr_warning("Winbond-840: Device %s disabled due to DMA limitations\n",
> - pci_name(pdev));
> + pr_warn("Device %s disabled due to DMA limitations\n",
> + pci_name(pdev));
> return -EIO;
> }
> dev = alloc_etherdev(sizeof(*np));
> diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
> index 4436865..abfe2e3 100644
> --- a/drivers/net/tulip/xircom_cb.c
> +++ b/drivers/net/tulip/xircom_cb.c
> @@ -272,8 +272,8 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
> goto reg_fail;
> }
>
> - dev_info(&dev->dev, "Xircom cardbus revision %i at irq %i\n",
> - pdev->revision, pdev->irq);
> + netdev_info(dev, "Xircom cardbus revision %i at irq %i\n",
> + pdev->revision, pdev->irq);
> /* start the transmitter to get a heartbeat */
> /* TODO: send 2 dummy packets here */
> transceiver_voodoo(private);
> @@ -350,7 +350,7 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
> int newlink;
> printk(KERN_DEBUG "xircom_cb: Link status has changed\n");
> newlink = link_status(card);
> - dev_info(&dev->dev, "Link is %i mbit\n", newlink);
> + netdev_info(dev, "Link is %d mbit\n", newlink);
> if (newlink)
> netif_carrier_on(dev);
> else
> @@ -447,8 +447,8 @@ static int xircom_open(struct net_device *dev)
> struct xircom_private *xp = netdev_priv(dev);
> int retval;
> func_enter();
> - pr_info("xircom cardbus adaptor found, registering as %s, using irq %i\n",
> - dev->name, dev->irq);
> + netdev_info(dev, "xircom cardbus adaptor found, using irq %i\n",
> + dev->irq);
> retval = request_irq(dev->irq, xircom_interrupt, IRQF_SHARED, dev->name, dev);
> if (retval) {
> func_exit();
> @@ -761,7 +761,7 @@ static void activate_receiver(struct xircom_private *card)
> udelay(50);
> counter--;
> if (counter <= 0)
> - pr_err("Receiver failed to deactivate\n");
> + netdev_err(card->dev, "Receiver failed to deactivate\n");
> }
>
> /* enable the receiver */
> @@ -778,7 +778,8 @@ static void activate_receiver(struct xircom_private *card)
> udelay(50);
> counter--;
> if (counter <= 0)
> - pr_err("Receiver failed to re-activate\n");
> + netdev_err(card->dev,
> + "Receiver failed to re-activate\n");
> }
>
> func_exit();
> @@ -809,7 +810,7 @@ static void deactivate_receiver(struct xircom_private *card)
> udelay(50);
> counter--;
> if (counter <= 0)
> - pr_err("Receiver failed to deactivate\n");
> + netdev_err(card->dev, "Receiver failed to deactivate\n");
> }
>
>
> @@ -852,7 +853,8 @@ static void activate_transmitter(struct xircom_private *card)
> udelay(50);
> counter--;
> if (counter <= 0)
> - pr_err("Transmitter failed to deactivate\n");
> + netdev_err(card->dev,
> + "Transmitter failed to deactivate\n");
> }
>
> /* enable the transmitter */
> @@ -869,7 +871,8 @@ static void activate_transmitter(struct xircom_private *card)
> udelay(50);
> counter--;
> if (counter <= 0)
> - pr_err("Transmitter failed to re-activate\n");
> + netdev_err(card->dev,
> + "Transmitter failed to re-activate\n");
> }
>
> func_exit();
> @@ -900,7 +903,8 @@ static void deactivate_transmitter(struct xircom_private *card)
> udelay(50);
> counter--;
> if (counter <= 0)
> - pr_err("Transmitter failed to deactivate\n");
> + netdev_err(card->dev,
> + "Transmitter failed to deactivate\n");
> }
>
>
> @@ -1160,80 +1164,86 @@ static void xircom_up(struct xircom_private *card)
> }
>
> /* Bufferoffset is in BYTES */
> -static void investigate_read_descriptor(struct net_device *dev,struct xircom_private *card, int descnr, unsigned int bufferoffset)
> +static void
> +investigate_read_descriptor(struct net_device *dev, struct xircom_private *card,
> + int descnr, unsigned int bufferoffset)
> {
> - int status;
> + int status;
>
> - func_enter();
> - status = le32_to_cpu(card->rx_buffer[4*descnr]);
> -
> - if ((status > 0)) { /* packet received */
> + func_enter();
>
> - /* TODO: discard error packets */
> + status = le32_to_cpu(card->rx_buffer[4*descnr]);
> + if (status > 0) { /* packet received */
>
> - short pkt_len = ((status >> 16) & 0x7ff) - 4; /* minus 4, we don't want the CRC */
> - struct sk_buff *skb;
> + /* TODO: discard error packets */
>
> - if (pkt_len > 1518) {
> - pr_err("Packet length %i is bogus\n", pkt_len);
> - pkt_len = 1518;
> - }
> + short pkt_len = ((status >> 16) & 0x7ff) - 4;
> + /* minus 4, we don't want the CRC */
> + struct sk_buff *skb;
>
> - skb = dev_alloc_skb(pkt_len + 2);
> - if (skb == NULL) {
> - dev->stats.rx_dropped++;
> - goto out;
> - }
> - skb_reserve(skb, 2);
> - skb_copy_to_linear_data(skb, (unsigned char*)&card->rx_buffer[bufferoffset / 4], pkt_len);
> - skb_put(skb, pkt_len);
> - skb->protocol = eth_type_trans(skb, dev);
> - netif_rx(skb);
> - dev->stats.rx_packets++;
> - dev->stats.rx_bytes += pkt_len;
> -
> - out:
> - /* give the buffer back to the card */
> - card->rx_buffer[4*descnr] = cpu_to_le32(0x80000000);
> - trigger_receive(card);
> + if (pkt_len > 1518) {
> + netdev_err(dev, "Packet length %i is bogus\n", pkt_len);
> + pkt_len = 1518;
> }
>
> - func_exit();
> + skb = dev_alloc_skb(pkt_len + 2);
> + if (skb == NULL) {
> + dev->stats.rx_dropped++;
> + goto out;
> + }
> + skb_reserve(skb, 2);
> + skb_copy_to_linear_data(skb,
> + &card->rx_buffer[bufferoffset / 4],
> + pkt_len);
> + skb_put(skb, pkt_len);
> + skb->protocol = eth_type_trans(skb, dev);
> + netif_rx(skb);
> + dev->stats.rx_packets++;
> + dev->stats.rx_bytes += pkt_len;
> +
> +out:
> + /* give the buffer back to the card */
> + card->rx_buffer[4*descnr] = cpu_to_le32(0x80000000);
> + trigger_receive(card);
> + }
>
> + func_exit();
> }
>
>
> /* Bufferoffset is in BYTES */
> -static void investigate_write_descriptor(struct net_device *dev, struct xircom_private *card, int descnr, unsigned int bufferoffset)
> +static void
> +investigate_write_descriptor(struct net_device *dev,
> + struct xircom_private *card,
> + int descnr, unsigned int bufferoffset)
> {
> - int status;
> + int status;
>
> - func_enter();
> + func_enter();
>
> - status = le32_to_cpu(card->tx_buffer[4*descnr]);
> + status = le32_to_cpu(card->tx_buffer[4*descnr]);
> #if 0
> - if (status & 0x8000) { /* Major error */
> - pr_err("Major transmit error status %x\n", status);
> - card->tx_buffer[4*descnr] = 0;
> - netif_wake_queue (dev);
> - }
> + if (status & 0x8000) { /* Major error */
> + netdev_err(dev, "Major transmit error status %x\n", status);
> + card->tx_buffer[4*descnr] = 0;
> + netif_wake_queue(dev);
> + }
> #endif
> - if (status > 0) { /* bit 31 is 0 when done */
> - if (card->tx_skb[descnr]!=NULL) {
> - dev->stats.tx_bytes += card->tx_skb[descnr]->len;
> - dev_kfree_skb_irq(card->tx_skb[descnr]);
> - }
> - card->tx_skb[descnr] = NULL;
> - /* Bit 8 in the status field is 1 if there was a collision */
> - if (status&(1<<8))
> - dev->stats.collisions++;
> - card->tx_buffer[4*descnr] = 0; /* descriptor is free again */
> - netif_wake_queue (dev);
> - dev->stats.tx_packets++;
> + if (status > 0) { /* bit 31 is 0 when done */
> + if (card->tx_skb[descnr] != NULL) {
> + dev->stats.tx_bytes += card->tx_skb[descnr]->len;
> + dev_kfree_skb_irq(card->tx_skb[descnr]);
> }
> + card->tx_skb[descnr] = NULL;
> + /* Bit 8 in the status field is 1 if there was a collision */
> + if (status&(1<<8))
> + dev->stats.collisions++;
> + card->tx_buffer[4*descnr] = 0; /* descriptor is free again */
> + netif_wake_queue(dev);
> + dev->stats.tx_packets++;
> + }
>
> - func_exit();
> -
> + func_exit();
> }
>
>
> --
> 1.7.5.rc3.dirty
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH net-next 2/4] tulip: Convert printks to netdev_<level>
2011-05-12 4:09 ` Grant Grundler
@ 2011-05-12 4:59 ` Joe Perches
2011-05-14 20:30 ` Grant Grundler
0 siblings, 1 reply; 15+ messages in thread
From: Joe Perches @ 2011-05-12 4:59 UTC (permalink / raw)
To: Grant Grundler; +Cc: Tobias Ringstrom, netdev, linux-kernel
On Wed, 2011-05-11 at 22:09 -0600, Grant Grundler wrote:
> Some additional clean ups to consider in a future patch:
> o replace "if (skb == NULL)" with "if (!skb)"
Hey Grant.
I generally don't change those.
While I prefer (!ptr), others prefer explicit comparisons.
I do have a script that does the conversion though.
(de4x5.c is a mess and I didn't change it)
Here's the output with hoisted assigns from if too.
(and a spelling fix I noticed)
drivers/net/tulip/de2104x.c | 3 ++-
drivers/net/tulip/dmfe.c | 11 ++++++-----
drivers/net/tulip/eeprom.c | 6 +++---
drivers/net/tulip/interrupt.c | 18 +++++++++---------
drivers/net/tulip/timer.c | 2 +-
drivers/net/tulip/tulip_core.c | 15 +++++++++------
drivers/net/tulip/uli526x.c | 15 +++++++--------
drivers/net/tulip/winbond-840.c | 14 ++++++++------
drivers/net/tulip/xircom_cb.c | 12 ++++++------
9 files changed, 51 insertions(+), 45 deletions(-)
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index e2f6923..45a4843 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -2170,7 +2170,8 @@ static int de_resume (struct pci_dev *pdev)
goto out;
if (!netif_running(dev))
goto out_attach;
- if ((retval = pci_enable_device(pdev))) {
+ retval = pci_enable_device(pdev);
+ if (retval) {
netdev_err(dev, "pci_enable_device failed in resume\n");
goto out;
}
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 4685127..588d6b4 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -400,7 +400,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
/* Init network device */
dev = alloc_etherdev(sizeof(*db));
- if (dev == NULL)
+ if (!dev)
return -ENOMEM;
SET_NETDEV_DEV(dev, &pdev->dev);
@@ -1009,10 +1009,10 @@ static void dmfe_rx_packet(struct DEVICE *dev, struct dmfe_board_info * db)
db->dm910x_chk_mode = 3;
} else {
/* Good packet, send to upper layer */
- /* Shorst packet used new SKB */
+ /* Short packet used new SKB */
if ((rxlen < RX_COPY_SIZE) &&
- ((newskb = dev_alloc_skb(rxlen + 2))
- != NULL)) {
+ (newskb =
+ dev_alloc_skb(rxlen + 2))) {
skb = newskb;
/* size less than COPY_SIZE, allocate a rxlen SKB */
@@ -1561,7 +1561,8 @@ static void allocate_rx_buffer(struct dmfe_board_info *db)
rxptr = db->rx_insert_ptr;
while(db->rx_avail_cnt < RX_DESC_CNT) {
- if ( ( skb = dev_alloc_skb(RX_ALLOC_SIZE) ) == NULL )
+ skb = dev_alloc_skb(RX_ALLOC_SIZE);
+ if (!skb)
break;
rxptr->rx_skb_ptr = skb; /* FIXME (?) */
rxptr->rdes2 = cpu_to_le32( pci_map_single(db->pdev, skb->data,
diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
index fa5eee9..a11eb73 100644
--- a/drivers/net/tulip/eeprom.c
+++ b/drivers/net/tulip/eeprom.c
@@ -123,7 +123,7 @@ static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp)
tp->mtable = kmalloc(sizeof(struct mediatable) +
sizeof(struct medialeaf), GFP_KERNEL);
- if (tp->mtable == NULL)
+ if (!tp->mtable)
return; /* Horrible, impossible failure. */
tp->mtable->defaultmedia = 0x800;
@@ -192,7 +192,7 @@ void __devinit tulip_parse_eeprom(struct net_device *dev)
break;
}
}
- if (eeprom_fixups[i].name == NULL) { /* No fixup found. */
+ if (!eeprom_fixups[i].name) { /* No fixup found. */
pr_info("%s: Old style EEPROM with no media selection information\n",
dev->name);
return;
@@ -230,7 +230,7 @@ subsequent_board:
mtable = kmalloc(sizeof(struct mediatable) +
count * sizeof(struct medialeaf),
GFP_KERNEL);
- if (mtable == NULL)
+ if (!mtable)
return; /* Horrible, impossible failure. */
last_mediatable = tp->mtable = mtable;
mtable->defaultmedia = media;
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c
index 5350d75..1a1bff5 100644
--- a/drivers/net/tulip/interrupt.c
+++ b/drivers/net/tulip/interrupt.c
@@ -68,12 +68,12 @@ int tulip_refill_rx(struct net_device *dev)
/* Refill the Rx ring buffers. */
for (; tp->cur_rx - tp->dirty_rx > 0; tp->dirty_rx++) {
entry = tp->dirty_rx % RX_RING_SIZE;
- if (tp->rx_buffers[entry].skb == NULL) {
+ if (!tp->rx_buffers[entry].skb) {
struct sk_buff *skb;
dma_addr_t mapping;
skb = tp->rx_buffers[entry].skb = dev_alloc_skb(PKT_BUF_SZ);
- if (skb == NULL)
+ if (!skb)
break;
mapping = pci_map_single(tp->pdev, skb->data, PKT_BUF_SZ,
@@ -205,7 +205,7 @@ int tulip_poll(struct napi_struct *napi, int budget)
/* Check if the packet is long enough to accept without copying
to a minimally-sized skbuff. */
if (pkt_len < tulip_rx_copybreak &&
- (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+ (skb = dev_alloc_skb(pkt_len + 2))) {
skb_reserve(skb, 2); /* 16 byte align the IP header */
pci_dma_sync_single_for_cpu(tp->pdev,
tp->rx_buffers[entry].mapping,
@@ -311,7 +311,7 @@ int tulip_poll(struct napi_struct *napi, int budget)
tulip_refill_rx(dev);
/* If RX ring is not full we are out of memory. */
- if (tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb == NULL)
+ if (!tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb)
goto oom;
/* Remove us from polling list and enable RX intr. */
@@ -334,10 +334,10 @@ int tulip_poll(struct napi_struct *napi, int budget)
not_done:
if (tp->cur_rx - tp->dirty_rx > RX_RING_SIZE/2 ||
- tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb == NULL)
+ !tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb)
tulip_refill_rx(dev);
- if (tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb == NULL)
+ if (!tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb)
goto oom;
return work_done;
@@ -431,7 +431,7 @@ static int tulip_rx(struct net_device *dev)
/* Check if the packet is long enough to accept without copying
to a minimally-sized skbuff. */
if (pkt_len < tulip_rx_copybreak &&
- (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+ (skb = dev_alloc_skb(pkt_len + 2))) {
skb_reserve(skb, 2); /* 16 byte align the IP header */
pci_dma_sync_single_for_cpu(tp->pdev,
tp->rx_buffers[entry].mapping,
@@ -591,7 +591,7 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
break; /* It still has not been Txed */
/* Check for Rx filter setup frames. */
- if (tp->tx_buffers[entry].skb == NULL) {
+ if (!tp->tx_buffers[entry].skb) {
/* test because dummy frames not mapped */
if (tp->tx_buffers[entry].mapping)
pci_unmap_single(tp->pdev,
@@ -775,7 +775,7 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
/* check if the card is in suspend mode */
entry = tp->dirty_rx % RX_RING_SIZE;
- if (tp->rx_buffers[entry].skb == NULL) {
+ if (!tp->rx_buffers[entry].skb) {
if (tulip_debug > 1)
dev_warn(&dev->dev,
"in rx suspend mode: (%lu) (tp->cur_rx = %u, ttimer = %d, rx = %d) go/stay in suspend mode\n",
diff --git a/drivers/net/tulip/timer.c b/drivers/net/tulip/timer.c
index 2017faf..afc5445 100644
--- a/drivers/net/tulip/timer.c
+++ b/drivers/net/tulip/timer.c
@@ -43,7 +43,7 @@ void tulip_media_task(struct work_struct *work)
default: {
struct medialeaf *mleaf;
unsigned char *p;
- if (tp->mtable == NULL) { /* No EEPROM info, use generic code. */
+ if (!tp->mtable) { /* No EEPROM info, use generic code. */
/* Not much that can be done.
Assume this a generic MII or SYM transceiver. */
next_tick = 60*HZ;
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 82f8764..0ab2465 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -384,7 +384,7 @@ static void tulip_up(struct net_device *dev)
/* Allow selecting a default media. */
i = 0;
- if (tp->mtable == NULL)
+ if (!tp->mtable)
goto media_picked;
if (dev->if_port) {
int looking_for = tulip_media_cap[dev->if_port] & MediaIsMII ? 11 :
@@ -642,7 +642,7 @@ static void tulip_init_ring(struct net_device *dev)
use skb_reserve() to align the IP header! */
struct sk_buff *skb = dev_alloc_skb(PKT_BUF_SZ);
tp->rx_buffers[i].skb = skb;
- if (skb == NULL)
+ if (!skb)
break;
mapping = pci_map_single(tp->pdev, skb->data,
PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
@@ -728,7 +728,7 @@ static void tulip_clean_tx_ring(struct tulip_private *tp)
}
/* Check for Tx filter setup frames. */
- if (tp->tx_buffers[entry].skb == NULL) {
+ if (!tp->tx_buffers[entry].skb) {
/* test because dummy frames not mapped */
if (tp->tx_buffers[entry].mapping)
pci_unmap_single(tp->pdev,
@@ -821,7 +821,7 @@ static void tulip_free_ring (struct net_device *dev)
for (i = 0; i < TX_RING_SIZE; i++) {
struct sk_buff *skb = tp->tx_buffers[i].skb;
- if (skb != NULL) {
+ if (skb) {
pci_unmap_single(tp->pdev, tp->tx_buffers[i].mapping,
skb->len, PCI_DMA_TODEVICE);
dev_kfree_skb (skb);
@@ -1900,12 +1900,15 @@ static int tulip_resume(struct pci_dev *pdev)
if (!netif_running(dev))
return 0;
- if ((retval = pci_enable_device(pdev))) {
+ retval = pci_enable_device(pdev);
+ if (retval) {
pr_err("pci_enable_device failed in resume\n");
return retval;
}
- if ((retval = request_irq(dev->irq, tulip_interrupt, IRQF_SHARED, dev->name, dev))) {
+ retval = request_irq(dev->irq, tulip_interrupt, IRQF_SHARED,
+ dev->name, dev);
+ if (retval) {
pr_err("request_irq failed in resume\n");
return retval;
}
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 9e63f40..a6f6a9e 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -286,7 +286,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
/* Init network device */
dev = alloc_etherdev(sizeof(*db));
- if (dev == NULL)
+ if (!dev)
return -ENOMEM;
SET_NETDEV_DEV(dev, &pdev->dev);
@@ -324,14 +324,12 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
/* Allocate Tx/Rx descriptor memory */
db->desc_pool_ptr = pci_alloc_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20, &db->desc_pool_dma_ptr);
- if(db->desc_pool_ptr == NULL)
- {
+ if (!db->desc_pool_ptr) {
err = -ENOMEM;
goto err_out_nomem;
}
db->buf_pool_ptr = pci_alloc_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4, &db->buf_pool_dma_ptr);
- if(db->buf_pool_ptr == NULL)
- {
+ if (!db->buf_pool_ptr) {
err = -ENOMEM;
goto err_out_nomem;
}
@@ -404,7 +402,7 @@ err_out_nomem:
pci_free_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,
db->desc_pool_ptr, db->desc_pool_dma_ptr);
- if(db->buf_pool_ptr != NULL)
+ if (db->buf_pool_ptr)
pci_free_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,
db->buf_pool_ptr, db->buf_pool_dma_ptr);
err_out_disable:
@@ -844,7 +842,7 @@ static void uli526x_rx_packet(struct net_device *dev, struct uli526x_board_info
/* Good packet, send to upper layer */
/* Shorst packet used new SKB */
if ((rxlen < RX_COPY_SIZE) &&
- (((new_skb = dev_alloc_skb(rxlen + 2)) != NULL))) {
+ (new_skb = dev_alloc_skb(rxlen + 2))) {
skb = new_skb;
/* size less than COPY_SIZE, allocate a rxlen SKB */
skb_reserve(skb, 2); /* 16byte align */
@@ -1440,7 +1438,8 @@ static void allocate_rx_buffer(struct uli526x_board_info *db)
rxptr = db->rx_insert_ptr;
while(db->rx_avail_cnt < RX_DESC_CNT) {
- if ( ( skb = dev_alloc_skb(RX_ALLOC_SIZE) ) == NULL )
+ skb = dev_alloc_skb(RX_ALLOC_SIZE);
+ if (!skb)
break;
rxptr->rx_skb_ptr = skb; /* FIXME (?) */
rxptr->rdes2 = cpu_to_le32(pci_map_single(db->pdev,
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 862eadf..a957e72 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -647,7 +647,8 @@ static int netdev_open(struct net_device *dev)
if (debug > 1)
netdev_dbg(dev, "w89c840_open() irq %d\n", dev->irq);
- if((i=alloc_ringdesc(dev)))
+ i = alloc_ringdesc(dev);
+ if (i)
goto out_err;
spin_lock_irq(&np->lock);
@@ -817,7 +818,7 @@ static void init_rxtx_rings(struct net_device *dev)
for (i = 0; i < RX_RING_SIZE; i++) {
struct sk_buff *skb = dev_alloc_skb(np->rx_buf_sz);
np->rx_skbuff[i] = skb;
- if (skb == NULL)
+ if (!skb)
break;
np->rx_addr[i] = pci_map_single(np->pci_dev,skb->data,
np->rx_buf_sz,PCI_DMA_FROMDEVICE);
@@ -1231,7 +1232,7 @@ static int netdev_rx(struct net_device *dev)
/* Check if the packet is long enough to accept without copying
to a minimally-sized skbuff. */
if (pkt_len < rx_copybreak &&
- (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+ (skb = dev_alloc_skb(pkt_len + 2))) {
skb_reserve(skb, 2); /* 16 byte align the IP header */
pci_dma_sync_single_for_cpu(np->pci_dev,np->rx_addr[entry],
np->rx_skbuff[entry]->len,
@@ -1269,10 +1270,10 @@ static int netdev_rx(struct net_device *dev)
for (; np->cur_rx - np->dirty_rx > 0; np->dirty_rx++) {
struct sk_buff *skb;
entry = np->dirty_rx % RX_RING_SIZE;
- if (np->rx_skbuff[entry] == NULL) {
+ if (!np->rx_skbuff[entry]) {
skb = dev_alloc_skb(np->rx_buf_sz);
np->rx_skbuff[entry] = skb;
- if (skb == NULL)
+ if (!skb)
break; /* Better luck next round. */
np->rx_addr[entry] = pci_map_single(np->pci_dev,
skb->data,
@@ -1618,7 +1619,8 @@ static int w840_resume (struct pci_dev *pdev)
if (netif_device_present(dev))
goto out; /* device not suspended */
if (netif_running(dev)) {
- if ((retval = pci_enable_device(pdev))) {
+ retval = pci_enable_device(pdev);
+ if (retval) {
dev_err(&dev->dev,
"pci_enable_device failed in resume\n");
goto out;
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 988b8eb..1cb7208 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -230,12 +230,12 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
/* Allocate the send/receive buffers */
private->rx_buffer = pci_alloc_consistent(pdev,8192,&private->rx_dma_handle);
- if (private->rx_buffer == NULL) {
+ if (!private->rx_buffer) {
pr_err("%s: no memory for rx buffer\n", __func__);
goto rx_buf_fail;
}
private->tx_buffer = pci_alloc_consistent(pdev,8192,&private->tx_dma_handle);
- if (private->tx_buffer == NULL) {
+ if (!private->tx_buffer) {
pr_err("%s: no memory for tx buffer\n", __func__);
goto tx_buf_fail;
}
@@ -546,8 +546,8 @@ static void setup_descriptors(struct xircom_private *card)
u32 address;
int i;
- BUG_ON(card->rx_buffer == NULL);
- BUG_ON(card->tx_buffer == NULL);
+ BUG_ON(!card->rx_buffer);
+ BUG_ON(!card->tx_buffer);
/* Receive descriptors */
memset(card->rx_buffer, 0, 128); /* clear the descriptors */
@@ -1086,7 +1086,7 @@ investigate_read_descriptor(struct net_device *dev, struct xircom_private *card,
}
skb = dev_alloc_skb(pkt_len + 2);
- if (skb == NULL) {
+ if (!skb) {
dev->stats.rx_dropped++;
goto out;
}
@@ -1125,7 +1125,7 @@ investigate_write_descriptor(struct net_device *dev,
}
#endif
if (status > 0) { /* bit 31 is 0 when done */
- if (card->tx_skb[descnr]!=NULL) {
+ if (card->tx_skb[descnr]) {
dev->stats.tx_bytes += card->tx_skb[descnr]->len;
dev_kfree_skb_irq(card->tx_skb[descnr]);
}
> o in general, HW doesn't return signed integer values. Where possible,
> I prefer to see "unsigned int status;" and "if (status)".
That one is yours to change if you want.
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH net-next 2/4] tulip: Convert printks to netdev_<level>
2011-05-12 4:59 ` Joe Perches
@ 2011-05-14 20:30 ` Grant Grundler
0 siblings, 0 replies; 15+ messages in thread
From: Grant Grundler @ 2011-05-14 20:30 UTC (permalink / raw)
To: Joe Perches; +Cc: Tobias Ringstrom, netdev, linux-kernel
On Wed, May 11, 2011 at 09:59:31PM -0700, Joe Perches wrote:
> On Wed, 2011-05-11 at 22:09 -0600, Grant Grundler wrote:
> > Some additional clean ups to consider in a future patch:
> > o replace "if (skb == NULL)" with "if (!skb)"
>
> Hey Grant.
>
> I generally don't change those.
> While I prefer (!ptr), others prefer explicit comparisons.
> I do have a script that does the conversion though.
> (de4x5.c is a mess and I didn't change it)
>
> Here's the output with hoisted assigns from if too.
> (and a spelling fix I noticed)
LGTM. :)
Please repost with Signed-off-by, my
"Acked-By: Grant Grundler <grundler@parisc-linux.org>"
and davem can apply.
I can't test these at the moment because I haven't figured out how to
update my parisc machine (parisc was dropped from debian testing).
I'm trying to build a gentoo chroot today though. We'll see.
thanks,
grant
>
> drivers/net/tulip/de2104x.c | 3 ++-
> drivers/net/tulip/dmfe.c | 11 ++++++-----
> drivers/net/tulip/eeprom.c | 6 +++---
> drivers/net/tulip/interrupt.c | 18 +++++++++---------
> drivers/net/tulip/timer.c | 2 +-
> drivers/net/tulip/tulip_core.c | 15 +++++++++------
> drivers/net/tulip/uli526x.c | 15 +++++++--------
> drivers/net/tulip/winbond-840.c | 14 ++++++++------
> drivers/net/tulip/xircom_cb.c | 12 ++++++------
> 9 files changed, 51 insertions(+), 45 deletions(-)
>
> diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
> index e2f6923..45a4843 100644
> --- a/drivers/net/tulip/de2104x.c
> +++ b/drivers/net/tulip/de2104x.c
> @@ -2170,7 +2170,8 @@ static int de_resume (struct pci_dev *pdev)
> goto out;
> if (!netif_running(dev))
> goto out_attach;
> - if ((retval = pci_enable_device(pdev))) {
> + retval = pci_enable_device(pdev);
> + if (retval) {
> netdev_err(dev, "pci_enable_device failed in resume\n");
> goto out;
> }
> diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
> index 4685127..588d6b4 100644
> --- a/drivers/net/tulip/dmfe.c
> +++ b/drivers/net/tulip/dmfe.c
> @@ -400,7 +400,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
>
> /* Init network device */
> dev = alloc_etherdev(sizeof(*db));
> - if (dev == NULL)
> + if (!dev)
> return -ENOMEM;
> SET_NETDEV_DEV(dev, &pdev->dev);
>
> @@ -1009,10 +1009,10 @@ static void dmfe_rx_packet(struct DEVICE *dev, struct dmfe_board_info * db)
> db->dm910x_chk_mode = 3;
> } else {
> /* Good packet, send to upper layer */
> - /* Shorst packet used new SKB */
> + /* Short packet used new SKB */
> if ((rxlen < RX_COPY_SIZE) &&
> - ((newskb = dev_alloc_skb(rxlen + 2))
> - != NULL)) {
> + (newskb =
> + dev_alloc_skb(rxlen + 2))) {
>
> skb = newskb;
> /* size less than COPY_SIZE, allocate a rxlen SKB */
> @@ -1561,7 +1561,8 @@ static void allocate_rx_buffer(struct dmfe_board_info *db)
> rxptr = db->rx_insert_ptr;
>
> while(db->rx_avail_cnt < RX_DESC_CNT) {
> - if ( ( skb = dev_alloc_skb(RX_ALLOC_SIZE) ) == NULL )
> + skb = dev_alloc_skb(RX_ALLOC_SIZE);
> + if (!skb)
> break;
> rxptr->rx_skb_ptr = skb; /* FIXME (?) */
> rxptr->rdes2 = cpu_to_le32( pci_map_single(db->pdev, skb->data,
> diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
> index fa5eee9..a11eb73 100644
> --- a/drivers/net/tulip/eeprom.c
> +++ b/drivers/net/tulip/eeprom.c
> @@ -123,7 +123,7 @@ static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp)
> tp->mtable = kmalloc(sizeof(struct mediatable) +
> sizeof(struct medialeaf), GFP_KERNEL);
>
> - if (tp->mtable == NULL)
> + if (!tp->mtable)
> return; /* Horrible, impossible failure. */
>
> tp->mtable->defaultmedia = 0x800;
> @@ -192,7 +192,7 @@ void __devinit tulip_parse_eeprom(struct net_device *dev)
> break;
> }
> }
> - if (eeprom_fixups[i].name == NULL) { /* No fixup found. */
> + if (!eeprom_fixups[i].name) { /* No fixup found. */
> pr_info("%s: Old style EEPROM with no media selection information\n",
> dev->name);
> return;
> @@ -230,7 +230,7 @@ subsequent_board:
> mtable = kmalloc(sizeof(struct mediatable) +
> count * sizeof(struct medialeaf),
> GFP_KERNEL);
> - if (mtable == NULL)
> + if (!mtable)
> return; /* Horrible, impossible failure. */
> last_mediatable = tp->mtable = mtable;
> mtable->defaultmedia = media;
> diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c
> index 5350d75..1a1bff5 100644
> --- a/drivers/net/tulip/interrupt.c
> +++ b/drivers/net/tulip/interrupt.c
> @@ -68,12 +68,12 @@ int tulip_refill_rx(struct net_device *dev)
> /* Refill the Rx ring buffers. */
> for (; tp->cur_rx - tp->dirty_rx > 0; tp->dirty_rx++) {
> entry = tp->dirty_rx % RX_RING_SIZE;
> - if (tp->rx_buffers[entry].skb == NULL) {
> + if (!tp->rx_buffers[entry].skb) {
> struct sk_buff *skb;
> dma_addr_t mapping;
>
> skb = tp->rx_buffers[entry].skb = dev_alloc_skb(PKT_BUF_SZ);
> - if (skb == NULL)
> + if (!skb)
> break;
>
> mapping = pci_map_single(tp->pdev, skb->data, PKT_BUF_SZ,
> @@ -205,7 +205,7 @@ int tulip_poll(struct napi_struct *napi, int budget)
> /* Check if the packet is long enough to accept without copying
> to a minimally-sized skbuff. */
> if (pkt_len < tulip_rx_copybreak &&
> - (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
> + (skb = dev_alloc_skb(pkt_len + 2))) {
> skb_reserve(skb, 2); /* 16 byte align the IP header */
> pci_dma_sync_single_for_cpu(tp->pdev,
> tp->rx_buffers[entry].mapping,
> @@ -311,7 +311,7 @@ int tulip_poll(struct napi_struct *napi, int budget)
> tulip_refill_rx(dev);
>
> /* If RX ring is not full we are out of memory. */
> - if (tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb == NULL)
> + if (!tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb)
> goto oom;
>
> /* Remove us from polling list and enable RX intr. */
> @@ -334,10 +334,10 @@ int tulip_poll(struct napi_struct *napi, int budget)
>
> not_done:
> if (tp->cur_rx - tp->dirty_rx > RX_RING_SIZE/2 ||
> - tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb == NULL)
> + !tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb)
> tulip_refill_rx(dev);
>
> - if (tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb == NULL)
> + if (!tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb)
> goto oom;
>
> return work_done;
> @@ -431,7 +431,7 @@ static int tulip_rx(struct net_device *dev)
> /* Check if the packet is long enough to accept without copying
> to a minimally-sized skbuff. */
> if (pkt_len < tulip_rx_copybreak &&
> - (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
> + (skb = dev_alloc_skb(pkt_len + 2))) {
> skb_reserve(skb, 2); /* 16 byte align the IP header */
> pci_dma_sync_single_for_cpu(tp->pdev,
> tp->rx_buffers[entry].mapping,
> @@ -591,7 +591,7 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
> break; /* It still has not been Txed */
>
> /* Check for Rx filter setup frames. */
> - if (tp->tx_buffers[entry].skb == NULL) {
> + if (!tp->tx_buffers[entry].skb) {
> /* test because dummy frames not mapped */
> if (tp->tx_buffers[entry].mapping)
> pci_unmap_single(tp->pdev,
> @@ -775,7 +775,7 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
>
> /* check if the card is in suspend mode */
> entry = tp->dirty_rx % RX_RING_SIZE;
> - if (tp->rx_buffers[entry].skb == NULL) {
> + if (!tp->rx_buffers[entry].skb) {
> if (tulip_debug > 1)
> dev_warn(&dev->dev,
> "in rx suspend mode: (%lu) (tp->cur_rx = %u, ttimer = %d, rx = %d) go/stay in suspend mode\n",
> diff --git a/drivers/net/tulip/timer.c b/drivers/net/tulip/timer.c
> index 2017faf..afc5445 100644
> --- a/drivers/net/tulip/timer.c
> +++ b/drivers/net/tulip/timer.c
> @@ -43,7 +43,7 @@ void tulip_media_task(struct work_struct *work)
> default: {
> struct medialeaf *mleaf;
> unsigned char *p;
> - if (tp->mtable == NULL) { /* No EEPROM info, use generic code. */
> + if (!tp->mtable) { /* No EEPROM info, use generic code. */
> /* Not much that can be done.
> Assume this a generic MII or SYM transceiver. */
> next_tick = 60*HZ;
> diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
> index 82f8764..0ab2465 100644
> --- a/drivers/net/tulip/tulip_core.c
> +++ b/drivers/net/tulip/tulip_core.c
> @@ -384,7 +384,7 @@ static void tulip_up(struct net_device *dev)
>
> /* Allow selecting a default media. */
> i = 0;
> - if (tp->mtable == NULL)
> + if (!tp->mtable)
> goto media_picked;
> if (dev->if_port) {
> int looking_for = tulip_media_cap[dev->if_port] & MediaIsMII ? 11 :
> @@ -642,7 +642,7 @@ static void tulip_init_ring(struct net_device *dev)
> use skb_reserve() to align the IP header! */
> struct sk_buff *skb = dev_alloc_skb(PKT_BUF_SZ);
> tp->rx_buffers[i].skb = skb;
> - if (skb == NULL)
> + if (!skb)
> break;
> mapping = pci_map_single(tp->pdev, skb->data,
> PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
> @@ -728,7 +728,7 @@ static void tulip_clean_tx_ring(struct tulip_private *tp)
> }
>
> /* Check for Tx filter setup frames. */
> - if (tp->tx_buffers[entry].skb == NULL) {
> + if (!tp->tx_buffers[entry].skb) {
> /* test because dummy frames not mapped */
> if (tp->tx_buffers[entry].mapping)
> pci_unmap_single(tp->pdev,
> @@ -821,7 +821,7 @@ static void tulip_free_ring (struct net_device *dev)
> for (i = 0; i < TX_RING_SIZE; i++) {
> struct sk_buff *skb = tp->tx_buffers[i].skb;
>
> - if (skb != NULL) {
> + if (skb) {
> pci_unmap_single(tp->pdev, tp->tx_buffers[i].mapping,
> skb->len, PCI_DMA_TODEVICE);
> dev_kfree_skb (skb);
> @@ -1900,12 +1900,15 @@ static int tulip_resume(struct pci_dev *pdev)
> if (!netif_running(dev))
> return 0;
>
> - if ((retval = pci_enable_device(pdev))) {
> + retval = pci_enable_device(pdev);
> + if (retval) {
> pr_err("pci_enable_device failed in resume\n");
> return retval;
> }
>
> - if ((retval = request_irq(dev->irq, tulip_interrupt, IRQF_SHARED, dev->name, dev))) {
> + retval = request_irq(dev->irq, tulip_interrupt, IRQF_SHARED,
> + dev->name, dev);
> + if (retval) {
> pr_err("request_irq failed in resume\n");
> return retval;
> }
> diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
> index 9e63f40..a6f6a9e 100644
> --- a/drivers/net/tulip/uli526x.c
> +++ b/drivers/net/tulip/uli526x.c
> @@ -286,7 +286,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
>
> /* Init network device */
> dev = alloc_etherdev(sizeof(*db));
> - if (dev == NULL)
> + if (!dev)
> return -ENOMEM;
> SET_NETDEV_DEV(dev, &pdev->dev);
>
> @@ -324,14 +324,12 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
>
> /* Allocate Tx/Rx descriptor memory */
> db->desc_pool_ptr = pci_alloc_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20, &db->desc_pool_dma_ptr);
> - if(db->desc_pool_ptr == NULL)
> - {
> + if (!db->desc_pool_ptr) {
> err = -ENOMEM;
> goto err_out_nomem;
> }
> db->buf_pool_ptr = pci_alloc_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4, &db->buf_pool_dma_ptr);
> - if(db->buf_pool_ptr == NULL)
> - {
> + if (!db->buf_pool_ptr) {
> err = -ENOMEM;
> goto err_out_nomem;
> }
> @@ -404,7 +402,7 @@ err_out_nomem:
> pci_free_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,
> db->desc_pool_ptr, db->desc_pool_dma_ptr);
>
> - if(db->buf_pool_ptr != NULL)
> + if (db->buf_pool_ptr)
> pci_free_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,
> db->buf_pool_ptr, db->buf_pool_dma_ptr);
> err_out_disable:
> @@ -844,7 +842,7 @@ static void uli526x_rx_packet(struct net_device *dev, struct uli526x_board_info
> /* Good packet, send to upper layer */
> /* Shorst packet used new SKB */
> if ((rxlen < RX_COPY_SIZE) &&
> - (((new_skb = dev_alloc_skb(rxlen + 2)) != NULL))) {
> + (new_skb = dev_alloc_skb(rxlen + 2))) {
> skb = new_skb;
> /* size less than COPY_SIZE, allocate a rxlen SKB */
> skb_reserve(skb, 2); /* 16byte align */
> @@ -1440,7 +1438,8 @@ static void allocate_rx_buffer(struct uli526x_board_info *db)
> rxptr = db->rx_insert_ptr;
>
> while(db->rx_avail_cnt < RX_DESC_CNT) {
> - if ( ( skb = dev_alloc_skb(RX_ALLOC_SIZE) ) == NULL )
> + skb = dev_alloc_skb(RX_ALLOC_SIZE);
> + if (!skb)
> break;
> rxptr->rx_skb_ptr = skb; /* FIXME (?) */
> rxptr->rdes2 = cpu_to_le32(pci_map_single(db->pdev,
> diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
> index 862eadf..a957e72 100644
> --- a/drivers/net/tulip/winbond-840.c
> +++ b/drivers/net/tulip/winbond-840.c
> @@ -647,7 +647,8 @@ static int netdev_open(struct net_device *dev)
> if (debug > 1)
> netdev_dbg(dev, "w89c840_open() irq %d\n", dev->irq);
>
> - if((i=alloc_ringdesc(dev)))
> + i = alloc_ringdesc(dev);
> + if (i)
> goto out_err;
>
> spin_lock_irq(&np->lock);
> @@ -817,7 +818,7 @@ static void init_rxtx_rings(struct net_device *dev)
> for (i = 0; i < RX_RING_SIZE; i++) {
> struct sk_buff *skb = dev_alloc_skb(np->rx_buf_sz);
> np->rx_skbuff[i] = skb;
> - if (skb == NULL)
> + if (!skb)
> break;
> np->rx_addr[i] = pci_map_single(np->pci_dev,skb->data,
> np->rx_buf_sz,PCI_DMA_FROMDEVICE);
> @@ -1231,7 +1232,7 @@ static int netdev_rx(struct net_device *dev)
> /* Check if the packet is long enough to accept without copying
> to a minimally-sized skbuff. */
> if (pkt_len < rx_copybreak &&
> - (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
> + (skb = dev_alloc_skb(pkt_len + 2))) {
> skb_reserve(skb, 2); /* 16 byte align the IP header */
> pci_dma_sync_single_for_cpu(np->pci_dev,np->rx_addr[entry],
> np->rx_skbuff[entry]->len,
> @@ -1269,10 +1270,10 @@ static int netdev_rx(struct net_device *dev)
> for (; np->cur_rx - np->dirty_rx > 0; np->dirty_rx++) {
> struct sk_buff *skb;
> entry = np->dirty_rx % RX_RING_SIZE;
> - if (np->rx_skbuff[entry] == NULL) {
> + if (!np->rx_skbuff[entry]) {
> skb = dev_alloc_skb(np->rx_buf_sz);
> np->rx_skbuff[entry] = skb;
> - if (skb == NULL)
> + if (!skb)
> break; /* Better luck next round. */
> np->rx_addr[entry] = pci_map_single(np->pci_dev,
> skb->data,
> @@ -1618,7 +1619,8 @@ static int w840_resume (struct pci_dev *pdev)
> if (netif_device_present(dev))
> goto out; /* device not suspended */
> if (netif_running(dev)) {
> - if ((retval = pci_enable_device(pdev))) {
> + retval = pci_enable_device(pdev);
> + if (retval) {
> dev_err(&dev->dev,
> "pci_enable_device failed in resume\n");
> goto out;
> diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
> index 988b8eb..1cb7208 100644
> --- a/drivers/net/tulip/xircom_cb.c
> +++ b/drivers/net/tulip/xircom_cb.c
> @@ -230,12 +230,12 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
>
> /* Allocate the send/receive buffers */
> private->rx_buffer = pci_alloc_consistent(pdev,8192,&private->rx_dma_handle);
> - if (private->rx_buffer == NULL) {
> + if (!private->rx_buffer) {
> pr_err("%s: no memory for rx buffer\n", __func__);
> goto rx_buf_fail;
> }
> private->tx_buffer = pci_alloc_consistent(pdev,8192,&private->tx_dma_handle);
> - if (private->tx_buffer == NULL) {
> + if (!private->tx_buffer) {
> pr_err("%s: no memory for tx buffer\n", __func__);
> goto tx_buf_fail;
> }
> @@ -546,8 +546,8 @@ static void setup_descriptors(struct xircom_private *card)
> u32 address;
> int i;
>
> - BUG_ON(card->rx_buffer == NULL);
> - BUG_ON(card->tx_buffer == NULL);
> + BUG_ON(!card->rx_buffer);
> + BUG_ON(!card->tx_buffer);
>
> /* Receive descriptors */
> memset(card->rx_buffer, 0, 128); /* clear the descriptors */
> @@ -1086,7 +1086,7 @@ investigate_read_descriptor(struct net_device *dev, struct xircom_private *card,
> }
>
> skb = dev_alloc_skb(pkt_len + 2);
> - if (skb == NULL) {
> + if (!skb) {
> dev->stats.rx_dropped++;
> goto out;
> }
> @@ -1125,7 +1125,7 @@ investigate_write_descriptor(struct net_device *dev,
> }
> #endif
> if (status > 0) { /* bit 31 is 0 when done */
> - if (card->tx_skb[descnr]!=NULL) {
> + if (card->tx_skb[descnr]) {
> dev->stats.tx_bytes += card->tx_skb[descnr]->len;
> dev_kfree_skb_irq(card->tx_skb[descnr]);
> }
>
> > o in general, HW doesn't return signed integer values. Where possible,
> > I prefer to see "unsigned int status;" and "if (status)".
>
> That one is yours to change if you want.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH net-next 3/4] tulip: Convert uses of KERN_DEBUG
2011-05-07 2:08 [PATCH net-next 0/4] tulip: logging cleanups Joe Perches
2011-05-07 2:08 ` [PATCH net-next 1/4] tulip: xircom_cb: Convert #ifdef DEBUG blocks and enter/leave uses Joe Perches
2011-05-07 2:08 ` [PATCH net-next 2/4] tulip: Convert printks to netdev_<level> Joe Perches
@ 2011-05-07 2:08 ` Joe Perches
2011-05-07 2:08 ` [PATCH net-next 4/4] tulip: Use pr_<level> where appropriate Joe Perches
2011-05-09 18:47 ` [PATCH net-next 0/4] tulip: logging cleanups David Miller
4 siblings, 0 replies; 15+ messages in thread
From: Joe Perches @ 2011-05-07 2:08 UTC (permalink / raw)
To: Grant Grundler; +Cc: netdev, linux-kernel
Convert logging messages to more current styles.
Added -DDEBUG to Makefile to maintain current message logging.
This could be converted to a specific CONFIG_TULIP_DEBUG option.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/tulip/21142.c | 14 ++++----
drivers/net/tulip/Makefile | 2 +
drivers/net/tulip/de2104x.c | 47 +++++++++++--------------
drivers/net/tulip/interrupt.c | 48 +++++++++++++-------------
drivers/net/tulip/media.c | 49 +++++++++++++-------------
drivers/net/tulip/pnic.c | 22 ++++++------
drivers/net/tulip/pnic2.c | 16 ++++----
drivers/net/tulip/timer.c | 47 ++++++++++++-------------
drivers/net/tulip/tulip.h | 8 ++---
drivers/net/tulip/tulip_core.c | 20 +++++------
drivers/net/tulip/winbond-840.c | 73 ++++++++++++++++++---------------------
drivers/net/tulip/xircom_cb.c | 2 +-
12 files changed, 166 insertions(+), 182 deletions(-)
diff --git a/drivers/net/tulip/21142.c b/drivers/net/tulip/21142.c
index 007d8e7..092c3fa 100644
--- a/drivers/net/tulip/21142.c
+++ b/drivers/net/tulip/21142.c
@@ -122,8 +122,8 @@ void t21142_start_nway(struct net_device *dev)
tp->nway = tp->mediasense = 1;
tp->nwayset = tp->lpar = 0;
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: Restarting 21143 autonegotiation, csr14=%08x\n",
- dev->name, csr14);
+ netdev_dbg(dev, "Restarting 21143 autonegotiation, csr14=%08x\n",
+ csr14);
iowrite32(0x0001, ioaddr + CSR13);
udelay(100);
iowrite32(csr14, ioaddr + CSR14);
@@ -206,14 +206,14 @@ void t21142_lnk_change(struct net_device *dev, int csr5)
#if 0 /* Restart shouldn't be needed. */
iowrite32(tp->csr6 | RxOn, ioaddr + CSR6);
if (tulip_debug > 2)
- printk(KERN_DEBUG "%s: Restarting Tx and Rx, CSR5 is %08x\n",
- dev->name, ioread32(ioaddr + CSR5));
+ netdev_dbg(dev, " Restarting Tx and Rx, CSR5 is %08x\n",
+ ioread32(ioaddr + CSR5));
#endif
tulip_start_rxtx(tp);
if (tulip_debug > 2)
- printk(KERN_DEBUG "%s: Setting CSR6 %08x/%x CSR12 %08x\n",
- dev->name, tp->csr6, ioread32(ioaddr + CSR6),
- ioread32(ioaddr + CSR12));
+ netdev_dbg(dev, " Setting CSR6 %08x/%x CSR12 %08x\n",
+ tp->csr6, ioread32(ioaddr + CSR6),
+ ioread32(ioaddr + CSR12));
} else if ((tp->nwayset && (csr5 & 0x08000000) &&
(dev->if_port == 3 || dev->if_port == 5) &&
(csr12 & 2) == 2) ||
diff --git a/drivers/net/tulip/Makefile b/drivers/net/tulip/Makefile
index 200cbf7..5e8be38 100644
--- a/drivers/net/tulip/Makefile
+++ b/drivers/net/tulip/Makefile
@@ -2,6 +2,8 @@
# Makefile for the Linux "Tulip" family network device drivers.
#
+ccflags-$(CONFIG_NET_TULIP) := -DDEBUG
+
obj-$(CONFIG_PCMCIA_XIRCOM) += xircom_cb.o
obj-$(CONFIG_DM9102) += dmfe.o
obj-$(CONFIG_WINBOND_840) += winbond-840.o
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 62883a0..e925c1e 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -377,9 +377,9 @@ static u16 t21041_csr15[] = { 0x0008, 0x0006, 0x000E, 0x0008, 0x0008, };
static void de_rx_err_acct (struct de_private *de, unsigned rx_tail,
u32 status, u32 len)
{
- netif_printk(de, rx_err, KERN_DEBUG, de->dev,
- "rx err, slot %d status 0x%x len %d\n",
- rx_tail, status, len);
+ netif_dbg(de, rx_err, de->dev,
+ "rx err, slot %d status 0x%x len %d\n",
+ rx_tail, status, len);
if ((status & 0x38000300) != 0x0300) {
/* Ingore earlier buffers. */
@@ -433,10 +433,9 @@ static void de_rx (struct de_private *de)
copying_skb = (len <= rx_copybreak);
- if (unlikely(netif_msg_rx_status(de)))
- printk(KERN_DEBUG "%s: rx slot %d status 0x%x len %d copying? %d\n",
- de->dev->name, rx_tail, status, len,
- copying_skb);
+ netif_dbg(de, rx_status, de->dev,
+ "rx slot %d status 0x%x len %d copying? %d\n",
+ rx_tail, status, len, copying_skb);
buflen = copying_skb ? (len + RX_OFFSET) : de->rx_buf_sz;
copy_skb = dev_alloc_skb (buflen);
@@ -504,10 +503,9 @@ static irqreturn_t de_interrupt (int irq, void *dev_instance)
if ((!(status & (IntrOK|IntrErr))) || (status == 0xFFFF))
return IRQ_NONE;
- if (netif_msg_intr(de))
- printk(KERN_DEBUG "%s: intr, status %08x mode %08x desc %u/%u/%u\n",
- dev->name, status, dr32(MacMode),
- de->rx_tail, de->tx_head, de->tx_tail);
+ netif_dbg(de, intr, dev, "intr, status %08x mode %08x desc %u/%u/%u\n",
+ status, dr32(MacMode),
+ de->rx_tail, de->tx_head, de->tx_tail);
dw32(MacStatus, status);
@@ -570,9 +568,9 @@ static void de_tx (struct de_private *de)
if (status & LastFrag) {
if (status & TxError) {
- if (netif_msg_tx_err(de))
- printk(KERN_DEBUG "%s: tx err, status 0x%x\n",
- de->dev->name, status);
+ netif_dbg(de, tx_err, de->dev,
+ "tx err, status 0x%x\n",
+ status);
de->net_stats.tx_errors++;
if (status & TxOWC)
de->net_stats.tx_window_errors++;
@@ -585,9 +583,8 @@ static void de_tx (struct de_private *de)
} else {
de->net_stats.tx_packets++;
de->net_stats.tx_bytes += skb->len;
- if (netif_msg_tx_done(de))
- printk(KERN_DEBUG "%s: tx done, slot %d\n",
- de->dev->name, tx_tail);
+ netif_dbg(de, tx_done, de->dev,
+ "tx done, slot %d\n", tx_tail);
}
dev_kfree_skb_irq(skb);
}
@@ -644,9 +641,8 @@ static netdev_tx_t de_start_xmit (struct sk_buff *skb,
wmb();
de->tx_head = NEXT_TX(entry);
- if (netif_msg_tx_queued(de))
- printk(KERN_DEBUG "%s: tx queued, slot %d, skblen %d\n",
- dev->name, entry, skb->len);
+ netif_dbg(de, tx_queued, dev, "tx queued, slot %d, skblen %d\n",
+ entry, skb->len);
if (tx_free == 0)
netif_stop_queue(dev);
@@ -1387,7 +1383,7 @@ static int de_open (struct net_device *dev)
struct de_private *de = netdev_priv(dev);
int rc;
- netif_printk(de, ifup, KERN_DEBUG, dev, "enabling interface\n");
+ netif_dbg(de, ifup, dev, "enabling interface\n");
de->rx_buf_sz = (dev->mtu <= 1500 ? PKT_BUF_SZ : dev->mtu + 32);
@@ -1429,7 +1425,7 @@ static int de_close (struct net_device *dev)
struct de_private *de = netdev_priv(dev);
unsigned long flags;
- netif_printk(de, ifdown, KERN_DEBUG, dev, "disabling interface\n");
+ netif_dbg(de, ifdown, dev, "disabling interface\n");
del_timer_sync(&de->media_timer);
@@ -1450,10 +1446,9 @@ static void de_tx_timeout (struct net_device *dev)
{
struct de_private *de = netdev_priv(dev);
- netdev_printk(KERN_DEBUG, dev,
- "NIC status %08x mode %08x sia %08x desc %u/%u/%u\n",
- dr32(MacStatus), dr32(MacMode), dr32(SIAStatus),
- de->rx_tail, de->tx_head, de->tx_tail);
+ netdev_dbg(dev, "NIC status %08x mode %08x sia %08x desc %u/%u/%u\n",
+ dr32(MacStatus), dr32(MacMode), dr32(SIAStatus),
+ de->rx_tail, de->tx_head, de->tx_tail);
del_timer_sync(&de->media_timer);
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c
index 0013642..5350d75 100644
--- a/drivers/net/tulip/interrupt.c
+++ b/drivers/net/tulip/interrupt.c
@@ -125,12 +125,12 @@ int tulip_poll(struct napi_struct *napi, int budget)
#endif
if (tulip_debug > 4)
- printk(KERN_DEBUG " In tulip_rx(), entry %d %08x\n",
- entry, tp->rx_ring[entry].status);
+ netdev_dbg(dev, " In tulip_rx(), entry %d %08x\n",
+ entry, tp->rx_ring[entry].status);
do {
if (ioread32(tp->base_addr + CSR5) == 0xffffffff) {
- printk(KERN_DEBUG " In tulip_poll(), hardware disappeared\n");
+ netdev_dbg(dev, " In tulip_poll(), hardware disappeared\n");
break;
}
/* Acknowledge current RX interrupt sources. */
@@ -145,9 +145,9 @@ int tulip_poll(struct napi_struct *napi, int budget)
if (tp->dirty_rx + RX_RING_SIZE == tp->cur_rx)
break;
- if (tulip_debug > 5)
- printk(KERN_DEBUG "%s: In tulip_rx(), entry %d %08x\n",
- dev->name, entry, status);
+ if (tulip_debug > 5)
+ netdev_dbg(dev, "In tulip_rx(), entry %d %08x\n",
+ entry, status);
if (++work_done >= budget)
goto not_done;
@@ -184,9 +184,9 @@ int tulip_poll(struct napi_struct *napi, int budget)
}
} else {
/* There was a fatal error. */
- if (tulip_debug > 2)
- printk(KERN_DEBUG "%s: Receive error, Rx status %08x\n",
- dev->name, status);
+ if (tulip_debug > 2)
+ netdev_dbg(dev, "Receive error, Rx status %08x\n",
+ status);
dev->stats.rx_errors++; /* end of a packet.*/
if (pkt_len > 1518 ||
(status & RxDescRunt))
@@ -367,16 +367,16 @@ static int tulip_rx(struct net_device *dev)
int received = 0;
if (tulip_debug > 4)
- printk(KERN_DEBUG " In tulip_rx(), entry %d %08x\n",
- entry, tp->rx_ring[entry].status);
+ netdev_dbg(dev, "In tulip_rx(), entry %d %08x\n",
+ entry, tp->rx_ring[entry].status);
/* If we own the next entry, it is a new packet. Send it up. */
while ( ! (tp->rx_ring[entry].status & cpu_to_le32(DescOwned))) {
s32 status = le32_to_cpu(tp->rx_ring[entry].status);
short pkt_len;
if (tulip_debug > 5)
- printk(KERN_DEBUG "%s: In tulip_rx(), entry %d %08x\n",
- dev->name, entry, status);
+ netdev_dbg(dev, "In tulip_rx(), entry %d %08x\n",
+ entry, status);
if (--rx_work_limit < 0)
break;
@@ -404,16 +404,16 @@ static int tulip_rx(struct net_device *dev)
/* Ingore earlier buffers. */
if ((status & 0xffff) != 0x7fff) {
if (tulip_debug > 1)
- dev_warn(&dev->dev,
- "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
- status);
+ netdev_warn(dev,
+ "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
+ status);
dev->stats.rx_length_errors++;
}
} else {
/* There was a fatal error. */
if (tulip_debug > 2)
- printk(KERN_DEBUG "%s: Receive error, Rx status %08x\n",
- dev->name, status);
+ netdev_dbg(dev, "Receive error, Rx status %08x\n",
+ status);
dev->stats.rx_errors++; /* end of a packet.*/
if (pkt_len > 1518 ||
(status & RxDescRunt))
@@ -573,8 +573,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
#endif /* CONFIG_TULIP_NAPI */
if (tulip_debug > 4)
- printk(KERN_DEBUG "%s: interrupt csr5=%#8.8x new csr5=%#8.8x\n",
- dev->name, csr5, ioread32(ioaddr + CSR5));
+ netdev_dbg(dev, "interrupt csr5=%#8.8x new csr5=%#8.8x\n",
+ csr5, ioread32(ioaddr + CSR5));
if (csr5 & (TxNoBuf | TxDied | TxIntr | TimerInt)) {
@@ -605,8 +605,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
/* There was an major error, log it. */
#ifndef final_version
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: Transmit error, Tx status %08x\n",
- dev->name, status);
+ netdev_dbg(dev, "Transmit error, Tx status %08x\n",
+ status);
#endif
dev->stats.tx_errors++;
if (status & 0x4104)
@@ -804,8 +804,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
}
if (tulip_debug > 4)
- printk(KERN_DEBUG "%s: exiting interrupt, csr5=%#04x\n",
- dev->name, ioread32(ioaddr + CSR5));
+ netdev_dbg(dev, "exiting interrupt, csr5=%#04x\n",
+ ioread32(ioaddr + CSR5));
return IRQ_HANDLED;
}
diff --git a/drivers/net/tulip/media.c b/drivers/net/tulip/media.c
index a0c770e..4bd1392 100644
--- a/drivers/net/tulip/media.c
+++ b/drivers/net/tulip/media.c
@@ -182,8 +182,8 @@ void tulip_select_media(struct net_device *dev, int startup)
switch (mleaf->type) {
case 0: /* 21140 non-MII xcvr. */
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: Using a 21140 non-MII transceiver with control setting %02x\n",
- dev->name, p[1]);
+ netdev_dbg(dev, "Using a 21140 non-MII transceiver with control setting %02x\n",
+ p[1]);
dev->if_port = p[0];
if (startup)
iowrite32(mtable->csr12dir | 0x100, ioaddr + CSR12);
@@ -204,15 +204,14 @@ void tulip_select_media(struct net_device *dev, int startup)
struct medialeaf *rleaf = &mtable->mleaf[mtable->has_reset];
unsigned char *rst = rleaf->leafdata;
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: Resetting the transceiver\n",
- dev->name);
+ netdev_dbg(dev, "Resetting the transceiver\n");
for (i = 0; i < rst[0]; i++)
iowrite32(get_u16(rst + 1 + (i<<1)) << 16, ioaddr + CSR15);
}
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: 21143 non-MII %s transceiver control %04x/%04x\n",
- dev->name, medianame[dev->if_port],
- setup[0], setup[1]);
+ netdev_dbg(dev, "21143 non-MII %s transceiver control %04x/%04x\n",
+ medianame[dev->if_port],
+ setup[0], setup[1]);
if (p[0] & 0x40) { /* SIA (CSR13-15) setup values are provided. */
csr13val = setup[0];
csr14val = setup[1];
@@ -239,8 +238,8 @@ void tulip_select_media(struct net_device *dev, int startup)
if (startup) iowrite32(csr13val, ioaddr + CSR13);
}
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: Setting CSR15 to %08x/%08x\n",
- dev->name, csr15dir, csr15val);
+ netdev_dbg(dev, "Setting CSR15 to %08x/%08x\n",
+ csr15dir, csr15val);
if (mleaf->type == 4)
new_csr6 = 0x82020000 | ((setup[2] & 0x71) << 18);
else
@@ -316,9 +315,9 @@ void tulip_select_media(struct net_device *dev, int startup)
if (tp->mii_advertise == 0)
tp->mii_advertise = tp->advertising[phy_num];
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: Advertising %04x on MII %d\n",
- dev->name, tp->mii_advertise,
- tp->phys[phy_num]);
+ netdev_dbg(dev, " Advertising %04x on MII %d\n",
+ tp->mii_advertise,
+ tp->phys[phy_num]);
tulip_mdio_write(dev, tp->phys[phy_num], 4, tp->mii_advertise);
}
break;
@@ -335,8 +334,7 @@ void tulip_select_media(struct net_device *dev, int startup)
struct medialeaf *rleaf = &mtable->mleaf[mtable->has_reset];
unsigned char *rst = rleaf->leafdata;
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: Resetting the transceiver\n",
- dev->name);
+ netdev_dbg(dev, "Resetting the transceiver\n");
for (i = 0; i < rst[0]; i++)
iowrite32(get_u16(rst + 1 + (i<<1)) << 16, ioaddr + CSR15);
}
@@ -344,20 +342,21 @@ void tulip_select_media(struct net_device *dev, int startup)
break;
}
default:
- printk(KERN_DEBUG "%s: Invalid media table selection %d\n",
- dev->name, mleaf->type);
+ netdev_dbg(dev, " Invalid media table selection %d\n",
+ mleaf->type);
new_csr6 = 0x020E0000;
}
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: Using media type %s, CSR12 is %02x\n",
- dev->name, medianame[dev->if_port],
+ netdev_dbg(dev, "Using media type %s, CSR12 is %02x\n",
+ medianame[dev->if_port],
ioread32(ioaddr + CSR12) & 0xff);
} else if (tp->chip_id == LC82C168) {
if (startup && ! tp->medialock)
dev->if_port = tp->mii_cnt ? 11 : 0;
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: PNIC PHY status is %3.3x, media %s\n",
- dev->name, ioread32(ioaddr + 0xB8), medianame[dev->if_port]);
+ netdev_dbg(dev, "PNIC PHY status is %3.3x, media %s\n",
+ ioread32(ioaddr + 0xB8),
+ medianame[dev->if_port]);
if (tp->mii_cnt) {
new_csr6 = 0x810C0000;
iowrite32(0x0001, ioaddr + CSR15);
@@ -388,9 +387,9 @@ void tulip_select_media(struct net_device *dev, int startup)
} else
new_csr6 = 0x03860000;
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: No media description table, assuming %s transceiver, CSR12 %02x\n",
- dev->name, medianame[dev->if_port],
- ioread32(ioaddr + CSR12));
+ netdev_dbg(dev, "No media description table, assuming %s transceiver, CSR12 %02x\n",
+ medianame[dev->if_port],
+ ioread32(ioaddr + CSR12));
}
tp->csr6 = new_csr6 | (tp->csr6 & 0xfdff) | (tp->full_duplex ? 0x0200 : 0);
@@ -504,8 +503,8 @@ void __devinit tulip_find_mii (struct net_device *dev, int board_idx)
/* Fixup for DLink with miswired PHY. */
if (mii_advert != to_advert) {
- printk(KERN_DEBUG "tulip%d: Advertising %04x on PHY %d, previously advertising %04x\n",
- board_idx, to_advert, phy, mii_advert);
+ pr_debug("tulip%d: Advertising %04x on PHY %d, previously advertising %04x\n",
+ board_idx, to_advert, phy, mii_advert);
tulip_mdio_write (dev, phy, 4, to_advert);
}
diff --git a/drivers/net/tulip/pnic.c b/drivers/net/tulip/pnic.c
index a63e64b..aa4d9da 100644
--- a/drivers/net/tulip/pnic.c
+++ b/drivers/net/tulip/pnic.c
@@ -40,8 +40,8 @@ void pnic_do_nway(struct net_device *dev)
new_csr6 |= 0x00000200;
}
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: PNIC autonegotiated status %08x, %s\n",
- dev->name, phy_reg, medianame[dev->if_port]);
+ netdev_dbg(dev, "PNIC autonegotiated status %08x, %s\n",
+ phy_reg, medianame[dev->if_port]);
if (tp->csr6 != new_csr6) {
tp->csr6 = new_csr6;
/* Restart Tx */
@@ -58,8 +58,8 @@ void pnic_lnk_change(struct net_device *dev, int csr5)
int phy_reg = ioread32(ioaddr + 0xB8);
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: PNIC link changed state %08x, CSR5 %08x\n",
- dev->name, phy_reg, csr5);
+ netdev_dbg(dev, "PNIC link changed state %08x, CSR5 %08x\n",
+ phy_reg, csr5);
if (ioread32(ioaddr + CSR5) & TPLnkFail) {
iowrite32((ioread32(ioaddr + CSR7) & ~TPLnkFail) | TPLnkPass, ioaddr + CSR7);
/* If we use an external MII, then we mustn't use the
@@ -114,8 +114,8 @@ void pnic_timer(unsigned long data)
int csr5 = ioread32(ioaddr + CSR5);
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: PNIC timer PHY status %08x, %s CSR5 %08x\n",
- dev->name, phy_reg, medianame[dev->if_port], csr5);
+ netdev_dbg(dev, "PNIC timer PHY status %08x, %s CSR5 %08x\n",
+ phy_reg, medianame[dev->if_port], csr5);
if (phy_reg & 0x04000000) { /* Remote link fault */
iowrite32(0x0201F078, ioaddr + 0xB8);
next_tick = 1*HZ;
@@ -125,11 +125,11 @@ void pnic_timer(unsigned long data)
next_tick = 60*HZ;
} else if (csr5 & TPLnkFail) { /* 100baseTx link beat */
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: %s link beat failed, CSR12 %04x, CSR5 %08x, PHY %03x\n",
- dev->name, medianame[dev->if_port],
- csr12,
- ioread32(ioaddr + CSR5),
- ioread32(ioaddr + 0xB8));
+ netdev_dbg(dev, "%s link beat failed, CSR12 %04x, CSR5 %08x, PHY %03x\n",
+ medianame[dev->if_port],
+ csr12,
+ ioread32(ioaddr + CSR5),
+ ioread32(ioaddr + 0xB8));
next_tick = 3*HZ;
if (tp->medialock) {
} else if (tp->nwayset && (dev->if_port & 1)) {
diff --git a/drivers/net/tulip/pnic2.c b/drivers/net/tulip/pnic2.c
index 4690c8e..93358ee 100644
--- a/drivers/net/tulip/pnic2.c
+++ b/drivers/net/tulip/pnic2.c
@@ -125,8 +125,8 @@ void pnic2_start_nway(struct net_device *dev)
csr14 |= 0x00001184;
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: Restarting PNIC2 autonegotiation, csr14=%08x\n",
- dev->name, csr14);
+ netdev_dbg(dev, "Restarting PNIC2 autonegotiation, csr14=%08x\n",
+ csr14);
/* tell pnic2_lnk_change we are doing an nway negotiation */
dev->if_port = 0;
@@ -137,8 +137,7 @@ void pnic2_start_nway(struct net_device *dev)
tp->csr6 = ioread32(ioaddr + CSR6);
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: On Entry to Nway, csr6=%08x\n",
- dev->name, tp->csr6);
+ netdev_dbg(dev, "On Entry to Nway, csr6=%08x\n", tp->csr6);
/* mask off any bits not to touch
* comment at top of file explains mask value
@@ -271,9 +270,10 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)
iowrite32(1, ioaddr + CSR13);
if (tulip_debug > 2)
- printk(KERN_DEBUG "%s: Setting CSR6 %08x/%x CSR12 %08x\n",
- dev->name, tp->csr6,
- ioread32(ioaddr + CSR6), ioread32(ioaddr + CSR12));
+ netdev_dbg(dev, "Setting CSR6 %08x/%x CSR12 %08x\n",
+ tp->csr6,
+ ioread32(ioaddr + CSR6),
+ ioread32(ioaddr + CSR12));
/* now the following actually writes out the
* new csr6 values
@@ -324,7 +324,7 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)
/* Link blew? Maybe restart NWay. */
if (tulip_debug > 2)
- printk(KERN_DEBUG "%s: Ugh! Link blew?\n", dev->name);
+ netdev_dbg(dev, "Ugh! Link blew?\n");
del_timer_sync(&tp->timer);
pnic2_start_nway(dev);
diff --git a/drivers/net/tulip/timer.c b/drivers/net/tulip/timer.c
index 36c2725..2017faf 100644
--- a/drivers/net/tulip/timer.c
+++ b/drivers/net/tulip/timer.c
@@ -28,11 +28,11 @@ void tulip_media_task(struct work_struct *work)
unsigned long flags;
if (tulip_debug > 2) {
- printk(KERN_DEBUG "%s: Media selection tick, %s, status %08x mode %08x SIA %08x %08x %08x %08x\n",
- dev->name, medianame[dev->if_port],
- ioread32(ioaddr + CSR5), ioread32(ioaddr + CSR6),
- csr12, ioread32(ioaddr + CSR13),
- ioread32(ioaddr + CSR14), ioread32(ioaddr + CSR15));
+ netdev_dbg(dev, "Media selection tick, %s, status %08x mode %08x SIA %08x %08x %08x %08x\n",
+ medianame[dev->if_port],
+ ioread32(ioaddr + CSR5), ioread32(ioaddr + CSR6),
+ csr12, ioread32(ioaddr + CSR13),
+ ioread32(ioaddr + CSR14), ioread32(ioaddr + CSR15));
}
switch (tp->chip_id) {
case DC21140:
@@ -48,9 +48,9 @@ void tulip_media_task(struct work_struct *work)
Assume this a generic MII or SYM transceiver. */
next_tick = 60*HZ;
if (tulip_debug > 2)
- printk(KERN_DEBUG "%s: network media monitor CSR6 %08x CSR12 0x%02x\n",
- dev->name,
- ioread32(ioaddr + CSR6), csr12 & 0xff);
+ netdev_dbg(dev, "network media monitor CSR6 %08x CSR12 0x%02x\n",
+ ioread32(ioaddr + CSR6),
+ csr12 & 0xff);
break;
}
mleaf = &tp->mtable->mleaf[tp->cur_index];
@@ -62,8 +62,8 @@ void tulip_media_task(struct work_struct *work)
s8 bitnum = p[offset];
if (p[offset+1] & 0x80) {
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: Transceiver monitor tick CSR12=%#02x, no media sense\n",
- dev->name, csr12);
+ netdev_dbg(dev, "Transceiver monitor tick CSR12=%#02x, no media sense\n",
+ csr12);
if (mleaf->type == 4) {
if (mleaf->media == 3 && (csr12 & 0x02))
goto select_next_media;
@@ -71,17 +71,16 @@ void tulip_media_task(struct work_struct *work)
break;
}
if (tulip_debug > 2)
- printk(KERN_DEBUG "%s: Transceiver monitor tick: CSR12=%#02x bit %d is %d, expecting %d\n",
- dev->name, csr12, (bitnum >> 1) & 7,
- (csr12 & (1 << ((bitnum >> 1) & 7))) != 0,
- (bitnum >= 0));
+ netdev_dbg(dev, "Transceiver monitor tick: CSR12=%#02x bit %d is %d, expecting %d\n",
+ csr12, (bitnum >> 1) & 7,
+ (csr12 & (1 << ((bitnum >> 1) & 7))) != 0,
+ (bitnum >= 0));
/* Check that the specified bit has the proper value. */
if ((bitnum < 0) !=
((csr12 & (1 << ((bitnum >> 1) & 7))) != 0)) {
if (tulip_debug > 2)
- printk(KERN_DEBUG "%s: Link beat detected for %s\n",
- dev->name,
- medianame[mleaf->media & MEDIA_MASK]);
+ netdev_dbg(dev, "Link beat detected for %s\n",
+ medianame[mleaf->media & MEDIA_MASK]);
if ((p[2] & 0x61) == 0x01) /* Bogus Znyx board. */
goto actually_mii;
netif_carrier_on(dev);
@@ -99,10 +98,9 @@ void tulip_media_task(struct work_struct *work)
if (tulip_media_cap[dev->if_port] & MediaIsFD)
goto select_next_media; /* Skip FD entries. */
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: No link beat on media %s, trying transceiver type %s\n",
- dev->name,
- medianame[mleaf->media & MEDIA_MASK],
- medianame[tp->mtable->mleaf[tp->cur_index].media]);
+ netdev_dbg(dev, "No link beat on media %s, trying transceiver type %s\n",
+ medianame[mleaf->media & MEDIA_MASK],
+ medianame[tp->mtable->mleaf[tp->cur_index].media]);
tulip_select_media(dev, 0);
/* Restart the transmit process. */
tulip_restart_rxtx(tp);
@@ -166,10 +164,9 @@ void comet_timer(unsigned long data)
int next_tick = 60*HZ;
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: Comet link status %04x partner capability %04x\n",
- dev->name,
- tulip_mdio_read(dev, tp->phys[0], 1),
- tulip_mdio_read(dev, tp->phys[0], 5));
+ netdev_dbg(dev, "Comet link status %04x partner capability %04x\n",
+ tulip_mdio_read(dev, tp->phys[0], 1),
+ tulip_mdio_read(dev, tp->phys[0], 5));
/* mod_timer synchronizes us with potential add_timer calls
* from interrupts.
*/
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h
index ed66a16..9db5289 100644
--- a/drivers/net/tulip/tulip.h
+++ b/drivers/net/tulip/tulip.h
@@ -547,11 +547,9 @@ static inline void tulip_stop_rxtx(struct tulip_private *tp)
udelay(10);
if (!i)
- printk(KERN_DEBUG "%s: tulip_stop_rxtx() failed"
- " (CSR5 0x%x CSR6 0x%x)\n",
- pci_name(tp->pdev),
- ioread32(ioaddr + CSR5),
- ioread32(ioaddr + CSR6));
+ netdev_dbg(tp->dev, "tulip_stop_rxtx() failed (CSR5 0x%x CSR6 0x%x)\n",
+ ioread32(ioaddr + CSR5),
+ ioread32(ioaddr + CSR6));
}
}
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index f46898a..ebc8058 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -330,8 +330,7 @@ static void tulip_up(struct net_device *dev)
udelay(100);
if (tulip_debug > 1)
- printk(KERN_DEBUG "%s: tulip_up(), irq==%d\n",
- dev->name, dev->irq);
+ netdev_dbg(dev, "tulip_up(), irq==%d\n", dev->irq);
iowrite32(tp->rx_ring_dma, ioaddr + CSR3);
iowrite32(tp->tx_ring_dma, ioaddr + CSR4);
@@ -498,10 +497,10 @@ media_picked:
iowrite32(0, ioaddr + CSR2); /* Rx poll demand */
if (tulip_debug > 2) {
- printk(KERN_DEBUG "%s: Done tulip_up(), CSR0 %08x, CSR5 %08x CSR6 %08x\n",
- dev->name, ioread32(ioaddr + CSR0),
- ioread32(ioaddr + CSR5),
- ioread32(ioaddr + CSR6));
+ netdev_dbg(dev, "Done tulip_up(), CSR0 %08x, CSR5 %08x CSR6 %08x\n",
+ ioread32(ioaddr + CSR0),
+ ioread32(ioaddr + CSR5),
+ ioread32(ioaddr + CSR6));
}
/* Set the timer to switch to check for link beat and perhaps switch
@@ -842,8 +841,7 @@ static int tulip_close (struct net_device *dev)
tulip_down (dev);
if (tulip_debug > 1)
- dev_printk(KERN_DEBUG, &dev->dev,
- "Shutting down ethercard, status was %02x\n",
+ netdev_dbg(dev, "Shutting down ethercard, status was %02x\n",
ioread32 (ioaddr + CSR5));
free_irq (dev->irq, dev);
@@ -1206,7 +1204,7 @@ static void __devinit tulip_mwi_config (struct pci_dev *pdev,
u32 csr0;
if (tulip_debug > 3)
- printk(KERN_DEBUG "%s: tulip_mwi_config()\n", pci_name(pdev));
+ netdev_dbg(dev, "tulip_mwi_config()\n");
tp->csr0 = csr0 = 0;
@@ -1268,8 +1266,8 @@ static void __devinit tulip_mwi_config (struct pci_dev *pdev,
out:
tp->csr0 = csr0;
if (tulip_debug > 2)
- printk(KERN_DEBUG "%s: MWI config cacheline=%d, csr0=%08x\n",
- pci_name(pdev), cache, csr0);
+ netdev_dbg(dev, "MWI config cacheline=%d, csr0=%08x\n",
+ cache, csr0);
}
#endif
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 939c96e..64e3f01 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -645,8 +645,7 @@ static int netdev_open(struct net_device *dev)
goto out_err;
if (debug > 1)
- printk(KERN_DEBUG "%s: w89c840_open() irq %d\n",
- dev->name, dev->irq);
+ netdev_dbg(dev, "w89c840_open() irq %d\n", dev->irq);
if((i=alloc_ringdesc(dev)))
goto out_err;
@@ -658,7 +657,7 @@ static int netdev_open(struct net_device *dev)
netif_start_queue(dev);
if (debug > 2)
- printk(KERN_DEBUG "%s: Done netdev_open()\n", dev->name);
+ netdev_dbg(dev, "Done netdev_open()\n");
/* Set the timer to check for link beat. */
init_timer(&np->timer);
@@ -787,9 +786,9 @@ static void netdev_timer(unsigned long data)
void __iomem *ioaddr = np->base_addr;
if (debug > 2)
- printk(KERN_DEBUG "%s: Media selection timer tick, status %08x config %08x\n",
- dev->name, ioread32(ioaddr + IntrStatus),
- ioread32(ioaddr + NetworkConfig));
+ netdev_dbg(dev, "Media selection timer tick, status %08x config %08x\n",
+ ioread32(ioaddr + IntrStatus),
+ ioread32(ioaddr + NetworkConfig));
spin_lock_irq(&np->lock);
update_csr6(dev, update_link(dev));
spin_unlock_irq(&np->lock);
@@ -1056,8 +1055,8 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev)
spin_unlock_irq(&np->lock);
if (debug > 4) {
- printk(KERN_DEBUG "%s: Transmit frame #%d queued in slot %d\n",
- dev->name, np->cur_tx, entry);
+ netdev_dbg(dev, "Transmit frame #%d queued in slot %d\n",
+ np->cur_tx, entry);
}
return NETDEV_TX_OK;
}
@@ -1074,8 +1073,8 @@ static void netdev_tx_done(struct net_device *dev)
if (tx_status & 0x8000) { /* There was an error, log it. */
#ifndef final_version
if (debug > 1)
- printk(KERN_DEBUG "%s: Transmit error, Tx status %08x\n",
- dev->name, tx_status);
+ netdev_dbg(dev, "Transmit error, Tx status %08x\n",
+ tx_status);
#endif
np->stats.tx_errors++;
if (tx_status & 0x0104) np->stats.tx_aborted_errors++;
@@ -1087,8 +1086,8 @@ static void netdev_tx_done(struct net_device *dev)
} else {
#ifndef final_version
if (debug > 3)
- printk(KERN_DEBUG "%s: Transmit slot %d ok, Tx status %08x\n",
- dev->name, entry, tx_status);
+ netdev_dbg(dev, "Transmit slot %d ok, Tx status %08x\n",
+ entry, tx_status);
#endif
np->stats.tx_bytes += np->tx_skbuff[entry]->len;
np->stats.collisions += (tx_status >> 3) & 15;
@@ -1131,8 +1130,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)
iowrite32(intr_status & 0x001ffff, ioaddr + IntrStatus);
if (debug > 4)
- printk(KERN_DEBUG "%s: Interrupt, status %04x\n",
- dev->name, intr_status);
+ netdev_dbg(dev, "Interrupt, status %04x\n", intr_status);
if ((intr_status & (NormalIntr|AbnormalIntr)) == 0)
break;
@@ -1173,8 +1171,8 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)
} while (1);
if (debug > 3)
- printk(KERN_DEBUG "%s: exiting interrupt, status=%#4.4x\n",
- dev->name, ioread32(ioaddr + IntrStatus));
+ netdev_dbg(dev, "exiting interrupt, status=%#4.4x\n",
+ ioread32(ioaddr + IntrStatus));
return IRQ_RETVAL(handled);
}
@@ -1187,8 +1185,8 @@ static int netdev_rx(struct net_device *dev)
int work_limit = np->dirty_rx + RX_RING_SIZE - np->cur_rx;
if (debug > 4) {
- printk(KERN_DEBUG " In netdev_rx(), entry %d status %04x\n",
- entry, np->rx_ring[entry].status);
+ netdev_dbg(dev, " In netdev_rx(), entry %d status %04x\n",
+ entry, np->rx_ring[entry].status);
}
/* If EOP is set on the next entry, it's a new packet. Send it up. */
@@ -1197,8 +1195,8 @@ static int netdev_rx(struct net_device *dev)
s32 status = desc->status;
if (debug > 4)
- printk(KERN_DEBUG " netdev_rx() status was %08x\n",
- status);
+ netdev_dbg(dev, " netdev_rx() status was %08x\n",
+ status);
if (status < 0)
break;
if ((status & 0x38008300) != 0x0300) {
@@ -1213,8 +1211,8 @@ static int netdev_rx(struct net_device *dev)
} else if (status & 0x8000) {
/* There was a fatal error. */
if (debug > 2)
- printk(KERN_DEBUG "%s: Receive error, Rx status %08x\n",
- dev->name, status);
+ netdev_dbg(dev, "Receive error, Rx status %08x\n",
+ status);
np->stats.rx_errors++; /* end of a packet.*/
if (status & 0x0890) np->stats.rx_length_errors++;
if (status & 0x004C) np->stats.rx_frame_errors++;
@@ -1227,8 +1225,8 @@ static int netdev_rx(struct net_device *dev)
#ifndef final_version
if (debug > 4)
- printk(KERN_DEBUG " netdev_rx() normal Rx pkt length %d status %x\n",
- pkt_len, status);
+ netdev_dbg(dev, " netdev_rx() normal Rx pkt length %d status %x\n",
+ pkt_len, status);
#endif
/* Check if the packet is long enough to accept without copying
to a minimally-sized skbuff. */
@@ -1253,10 +1251,10 @@ static int netdev_rx(struct net_device *dev)
#ifndef final_version /* Remove after testing. */
/* You will want this info for the initial debug. */
if (debug > 5)
- printk(KERN_DEBUG " Rx data %pM %pM %02x%02x %pI4\n",
- &skb->data[0], &skb->data[6],
- skb->data[12], skb->data[13],
- &skb->data[14]);
+ netdev_dbg(dev, " Rx data %pM %pM %02x%02x %pI4\n",
+ &skb->data[0], &skb->data[6],
+ skb->data[12], skb->data[13],
+ &skb->data[14]);
#endif
skb->protocol = eth_type_trans(skb, dev);
netif_rx(skb);
@@ -1294,8 +1292,7 @@ static void netdev_error(struct net_device *dev, int intr_status)
void __iomem *ioaddr = np->base_addr;
if (debug > 2)
- printk(KERN_DEBUG "%s: Abnormal event, %08x\n",
- dev->name, intr_status);
+ netdev_dbg(dev, "Abnormal event, %08x\n", intr_status);
if (intr_status == 0xffffffff)
return;
spin_lock(&np->lock);
@@ -1315,8 +1312,7 @@ static void netdev_error(struct net_device *dev, int intr_status)
new = 127; /* load full packet before starting */
new = (np->csr6 & ~(0x7F << 14)) | (new<<14);
#endif
- printk(KERN_DEBUG "%s: Tx underflow, new csr6 %08x\n",
- dev->name, new);
+ netdev_dbg(dev, "Tx underflow, new csr6 %08x\n", new);
update_csr6(dev, new);
}
if (intr_status & RxDied) { /* Missed a Rx frame. */
@@ -1489,13 +1485,12 @@ static int netdev_close(struct net_device *dev)
netif_stop_queue(dev);
if (debug > 1) {
- printk(KERN_DEBUG "%s: Shutting down ethercard, status was %08x Config %08x\n",
- dev->name, ioread32(ioaddr + IntrStatus),
- ioread32(ioaddr + NetworkConfig));
- printk(KERN_DEBUG "%s: Queue pointers were Tx %d / %d, Rx %d / %d\n",
- dev->name,
- np->cur_tx, np->dirty_tx,
- np->cur_rx, np->dirty_rx);
+ netdev_dbg(dev, "Shutting down ethercard, status was %08x Config %08x\n",
+ ioread32(ioaddr + IntrStatus),
+ ioread32(ioaddr + NetworkConfig));
+ netdev_dbg(dev, "Queue pointers were Tx %d / %d, Rx %d / %d\n",
+ np->cur_tx, np->dirty_tx,
+ np->cur_rx, np->dirty_rx);
}
/* Stop the chip's Tx and Rx processes. */
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index abfe2e3..71d4304 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -348,7 +348,7 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
if (link_status_changed(card)) {
int newlink;
- printk(KERN_DEBUG "xircom_cb: Link status has changed\n");
+ netdev_dbg(dev, "Link status has changed\n");
newlink = link_status(card);
netdev_info(dev, "Link is %d mbit\n", newlink);
if (newlink)
--
1.7.5.rc3.dirty
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH net-next 4/4] tulip: Use pr_<level> where appropriate
2011-05-07 2:08 [PATCH net-next 0/4] tulip: logging cleanups Joe Perches
` (2 preceding siblings ...)
2011-05-07 2:08 ` [PATCH net-next 3/4] tulip: Convert uses of KERN_DEBUG Joe Perches
@ 2011-05-07 2:08 ` Joe Perches
2011-05-09 18:47 ` [PATCH net-next 0/4] tulip: logging cleanups David Miller
4 siblings, 0 replies; 15+ messages in thread
From: Joe Perches @ 2011-05-07 2:08 UTC (permalink / raw)
To: Grant Grundler, Tobias Ringstrom; +Cc: netdev, linux-kernel
Use the current logging styles.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/tulip/de2104x.c | 6 +++---
drivers/net/tulip/dmfe.c | 7 +++----
drivers/net/tulip/tulip_core.c | 5 +++--
drivers/net/tulip/uli526x.c | 23 ++++-------------------
drivers/net/tulip/winbond-840.c | 2 +-
5 files changed, 14 insertions(+), 29 deletions(-)
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index e925c1e..e2f6923 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -53,7 +53,7 @@
/* These identify the driver base version and may not be removed. */
static char version[] =
-KERN_INFO DRV_NAME " PCI Ethernet driver v" DRV_VERSION " (" DRV_RELDATE ")\n";
+"PCI Ethernet driver v" DRV_VERSION " (" DRV_RELDATE ")";
MODULE_AUTHOR("Jeff Garzik <jgarzik@pobox.com>");
MODULE_DESCRIPTION("Intel/Digital 21040/1 series PCI Ethernet driver");
@@ -1978,7 +1978,7 @@ static int __devinit de_init_one (struct pci_dev *pdev,
#ifndef MODULE
if (board_idx == 0)
- printk("%s", version);
+ pr_info("%s\n", version);
#endif
/* allocate a new ethernet device structure, and fill in defaults */
@@ -2200,7 +2200,7 @@ static struct pci_driver de_driver = {
static int __init de_init (void)
{
#ifdef MODULE
- printk("%s", version);
+ pr_info("%s\n", version);
#endif
return pci_register_driver(&de_driver);
}
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 96e8541..4685127 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -295,8 +295,7 @@ enum dmfe_CR6_bits {
/* Global variable declaration ----------------------------- */
static int __devinitdata printed_version;
static const char version[] __devinitconst =
- KERN_INFO DRV_NAME ": Davicom DM9xxx net driver, version "
- DRV_VERSION " (" DRV_RELDATE ")\n";
+ "Davicom DM9xxx net driver, version " DRV_VERSION " (" DRV_RELDATE ")";
static int dmfe_debug;
static unsigned char dmfe_media_mode = DMFE_AUTO;
@@ -381,7 +380,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
DMFE_DBUG(0, "dmfe_init_one()", 0);
if (!printed_version++)
- printk(version);
+ pr_info("%s\n", version);
/*
* SPARC on-board DM910x chips should be handled by the main
@@ -2203,7 +2202,7 @@ static int __init dmfe_init_module(void)
{
int rc;
- printk(version);
+ pr_info("%s\n", version);
printed_version = 1;
DMFE_DBUG(0, "init_module() ", debug);
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index ebc8058..82f8764 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1478,7 +1478,8 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
if (sig == 0x09811317) {
tp->flags |= COMET_PM;
tp->wolinfo.supported = WAKE_PHY | WAKE_MAGIC;
- printk(KERN_INFO "tulip_init_one: Enabled WOL support for AN983B\n");
+ pr_info("%s: Enabled WOL support for AN983B\n",
+ __func__);
}
}
tp->pdev = pdev;
@@ -1874,7 +1875,7 @@ save_state:
tulip_set_wolopts(pdev, tp->wolinfo.wolopts);
rc = pci_enable_wake(pdev, pstate, tp->wolinfo.wolopts);
if (rc)
- printk("tulip: pci_enable_wake failed (%d)\n", rc);
+ pr_err("pci_enable_wake failed (%d)\n", rc);
}
pci_set_power_state(pdev, pstate);
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 92c00ee..9e63f40 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -209,8 +209,7 @@ enum uli526x_CR6_bits {
/* Global variable declaration ----------------------------- */
static int __devinitdata printed_version;
static const char version[] __devinitconst =
- KERN_INFO DRV_NAME ": ULi M5261/M5263 net driver, version "
- DRV_VERSION " (" DRV_RELDATE ")\n";
+ "ULi M5261/M5263 net driver, version " DRV_VERSION " (" DRV_RELDATE ")";
static int uli526x_debug;
static unsigned char uli526x_media_mode = ULI526X_AUTO;
@@ -283,7 +282,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
ULI526X_DBUG(0, "uli526x_init_one()", 0);
if (!printed_version++)
- printk(version);
+ pr_info("%s\n", version);
/* Init network device */
dev = alloc_etherdev(sizeof(*db));
@@ -667,15 +666,6 @@ static int uli526x_stop(struct net_device *dev)
/* free allocated rx buffer */
uli526x_free_rxbuffer(db);
-#if 0
- /* show statistic counter */
- printk(DRV_NAME ": FU:%lx EC:%lx LC:%lx NC:%lx LOC:%lx TXJT:%lx RESET:%lx RCR8:%lx FAL:%lx TT:%lx\n",
- db->tx_fifo_underrun, db->tx_excessive_collision,
- db->tx_late_collision, db->tx_no_carrier, db->tx_loss_carrier,
- db->tx_jabber_timeout, db->reset_count, db->reset_cr8,
- db->reset_fatal, db->reset_TXtimeout);
-#endif
-
return 0;
}
@@ -755,7 +745,6 @@ static void uli526x_free_tx_pkt(struct net_device *dev,
txptr = db->tx_remove_ptr;
while(db->tx_packet_cnt) {
tdes0 = le32_to_cpu(txptr->tdes0);
- /* printk(DRV_NAME ": tdes0=%x\n", tdes0); */
if (tdes0 & 0x80000000)
break;
@@ -765,7 +754,6 @@ static void uli526x_free_tx_pkt(struct net_device *dev,
/* Transmit statistic counter */
if ( tdes0 != 0x7fffffff ) {
- /* printk(DRV_NAME ": tdes0=%x\n", tdes0); */
dev->stats.collisions += (tdes0 >> 3) & 0xf;
dev->stats.tx_bytes += le32_to_cpu(txptr->tdes1) & 0x7ff;
if (tdes0 & TDES0_ERR_MASK) {
@@ -838,7 +826,6 @@ static void uli526x_rx_packet(struct net_device *dev, struct uli526x_board_info
/* error summary bit check */
if (rdes0 & 0x8000) {
/* This is a error packet */
- //printk(DRV_NAME ": rdes0: %lx\n", rdes0);
dev->stats.rx_errors++;
if (rdes0 & 1)
dev->stats.rx_fifo_errors++;
@@ -1046,8 +1033,7 @@ static void uli526x_timer(unsigned long data)
if ( time_after(jiffies, dev_trans_start(dev) + ULI526X_TX_TIMEOUT) ) {
db->reset_TXtimeout++;
db->wait_reset = 1;
- printk( "%s: Tx timeout - resetting\n",
- dev->name);
+ netdev_err(dev, " Tx timeout - resetting\n");
}
}
@@ -1534,7 +1520,6 @@ static u8 uli526x_sense_speed(struct uli526x_board_info * db)
else
phy_mode = 0x1000;
- /* printk(DRV_NAME ": Phy_mode %x ",phy_mode); */
switch (phy_mode) {
case 0x1000: db->op_mode = ULI526X_10MHF; break;
case 0x2000: db->op_mode = ULI526X_10MFD; break;
@@ -1823,7 +1808,7 @@ MODULE_PARM_DESC(mode, "ULi M5261/M5263: Bit 0: 10/100Mbps, bit 2: duplex, bit 8
static int __init uli526x_init_module(void)
{
- printk(version);
+ pr_info("%s\n", version);
printed_version = 1;
ULI526X_DBUG(0, "init_module() ", debug);
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 64e3f01..862eadf 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -141,7 +141,7 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
/* These identify the driver base version and may not be removed. */
static const char version[] __initconst =
- KERN_INFO DRV_NAME ".c:v" DRV_VERSION " (2.4 port) "
+ "v" DRV_VERSION " (2.4 port) "
DRV_RELDATE " Donald Becker <becker@scyld.com>\n"
" http://www.scyld.com/network/drivers.html\n";
--
1.7.5.rc3.dirty
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH net-next 0/4] tulip: logging cleanups
2011-05-07 2:08 [PATCH net-next 0/4] tulip: logging cleanups Joe Perches
` (3 preceding siblings ...)
2011-05-07 2:08 ` [PATCH net-next 4/4] tulip: Use pr_<level> where appropriate Joe Perches
@ 2011-05-09 18:47 ` David Miller
2011-05-09 19:08 ` [PATCH net-next 5/4] tulip: xircom_cb: Remove useless func_enter and func_exit Joe Perches
4 siblings, 1 reply; 15+ messages in thread
From: David Miller @ 2011-05-09 18:47 UTC (permalink / raw)
To: joe; +Cc: netdev, linux-kernel
From: Joe Perches <joe@perches.com>
Date: Fri, 6 May 2011 19:08:41 -0700
> Joe Perches (4):
> tulip: xircom_cb: Convert #ifdef DEBUG blocks and enter/leave uses
> tulip: Convert printks to netdev_<level>
> tulip: Convert uses of KERN_DEBUG
> tulip: Use pr_<level> where appropriate
With the advent of the function tracer, those silly function entry/exit
logging things are entirely superfluous.
They make the code look ugly too.
So you have my approval to just kill those things off entirely.
Please do that and respin this patch set, thanks Joe!
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH net-next 5/4] tulip: xircom_cb: Remove useless func_enter and func_exit
2011-05-09 18:47 ` [PATCH net-next 0/4] tulip: logging cleanups David Miller
@ 2011-05-09 19:08 ` Joe Perches
2011-05-09 19:10 ` David Miller
0 siblings, 1 reply; 15+ messages in thread
From: Joe Perches @ 2011-05-09 19:08 UTC (permalink / raw)
To: David Miller; +Cc: netdev, LKML
On Mon, 2011-05-09 at 11:47 -0700, David Miller wrote:
> With the advent of the function tracer, those silly function entry/exit
> logging things are entirely superfluous.
> They make the code look ugly too.
I don't much like a lot of debugging messages
throughout drivers/net, but that's a whole 'nother
set of patches.
> Please do that and respin this patch set, thanks Joe!
How 'bout I just add another patch to delete them.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/tulip/xircom_cb.c | 119 ++---------------------------------------
1 files changed, 5 insertions(+), 114 deletions(-)
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 71d4304..2f77daa 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -37,15 +37,6 @@
#include <asm/irq.h>
#endif
-#if defined DEBUG && DEBUG > 1
-#define func_enter(x) pr_debug("Enter: %s\n", __func__)
-#define func_exit(x) pr_debug("Exit: %s\n", __func__)
-#else
-#define func_enter(x) no_printk(KERN_DEBUG "Enter: %s\n", __func__)
-#define func_exit(x) no_printk(KERN_DEBUG "Exit: %s\n", __func__)
-#endif
-
-
MODULE_DESCRIPTION("Xircom Cardbus ethernet driver");
MODULE_AUTHOR("Arjan van de Ven <arjanv@redhat.com>");
MODULE_LICENSE("GPL");
@@ -205,7 +196,6 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
struct xircom_private *private;
unsigned long flags;
unsigned short tmp16;
- func_enter();
/* First do the PCI initialisation */
@@ -285,7 +275,6 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
trigger_receive(private);
- func_exit();
return 0;
reg_fail:
@@ -310,7 +299,6 @@ static void __devexit xircom_remove(struct pci_dev *pdev)
struct net_device *dev = pci_get_drvdata(pdev);
struct xircom_private *card = netdev_priv(dev);
- func_enter();
pci_free_consistent(pdev,8192,card->rx_buffer,card->rx_dma_handle);
pci_free_consistent(pdev,8192,card->tx_buffer,card->tx_dma_handle);
@@ -318,7 +306,6 @@ static void __devexit xircom_remove(struct pci_dev *pdev)
unregister_netdev(dev);
free_netdev(dev);
pci_set_drvdata(pdev, NULL);
- func_exit();
}
static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
@@ -328,8 +315,6 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
unsigned int status;
int i;
- func_enter();
-
spin_lock(&card->lock);
status = inl(card->io_port+CSR5);
@@ -369,9 +354,7 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
for (i=0;i<NUMDESCRIPTORS;i++)
investigate_read_descriptor(dev,card,i,bufferoffsets[i]);
-
spin_unlock(&card->lock);
- func_exit();
return IRQ_HANDLED;
}
@@ -382,7 +365,6 @@ static netdev_tx_t xircom_start_xmit(struct sk_buff *skb,
unsigned long flags;
int nextdescriptor;
int desc;
- func_enter();
card = netdev_priv(dev);
spin_lock_irqsave(&card->lock,flags);
@@ -424,13 +406,10 @@ static netdev_tx_t xircom_start_xmit(struct sk_buff *skb,
netif_stop_queue(dev);
}
card->transmit_used = nextdescriptor;
- func_exit();
spin_unlock_irqrestore(&card->lock,flags);
return NETDEV_TX_OK;
}
-
-
/* Uh oh... no free descriptor... drop the packet */
netif_stop_queue(dev);
spin_unlock_irqrestore(&card->lock,flags);
@@ -446,18 +425,15 @@ static int xircom_open(struct net_device *dev)
{
struct xircom_private *xp = netdev_priv(dev);
int retval;
- func_enter();
+
netdev_info(dev, "xircom cardbus adaptor found, using irq %i\n",
dev->irq);
retval = request_irq(dev->irq, xircom_interrupt, IRQF_SHARED, dev->name, dev);
- if (retval) {
- func_exit();
+ if (retval)
return retval;
- }
xircom_up(xp);
xp->open = 1;
- func_exit();
return 0;
}
@@ -466,7 +442,6 @@ static int xircom_close(struct net_device *dev)
struct xircom_private *card;
unsigned long flags;
- func_enter();
card = netdev_priv(dev);
netif_stop_queue(dev); /* we don't want new packets */
@@ -486,8 +461,6 @@ static int xircom_close(struct net_device *dev)
card->open = 0;
free_irq(dev->irq,dev);
- func_exit();
-
return 0;
}
@@ -507,8 +480,6 @@ static void initialize_card(struct xircom_private *card)
{
unsigned int val;
unsigned long flags;
- func_enter();
-
spin_lock_irqsave(&card->lock, flags);
@@ -534,8 +505,6 @@ static void initialize_card(struct xircom_private *card)
deactivate_transmitter(card);
spin_unlock_irqrestore(&card->lock, flags);
-
- func_exit();
}
/*
@@ -547,12 +516,9 @@ ignored; I chose zero.
static void trigger_transmit(struct xircom_private *card)
{
unsigned int val;
- func_enter();
val = 0;
outl(val, card->io_port + CSR1);
-
- func_exit();
}
/*
@@ -565,12 +531,9 @@ ignored; I chose zero.
static void trigger_receive(struct xircom_private *card)
{
unsigned int val;
- func_enter();
val = 0;
outl(val, card->io_port + CSR2);
-
- func_exit();
}
/*
@@ -581,8 +544,6 @@ static void setup_descriptors(struct xircom_private *card)
{
u32 address;
int i;
- func_enter();
-
BUG_ON(card->rx_buffer == NULL);
BUG_ON(card->tx_buffer == NULL);
@@ -636,8 +597,6 @@ static void setup_descriptors(struct xircom_private *card)
/* wite the transmit descriptor ring to the card */
address = card->tx_dma_handle;
outl(address, card->io_port + CSR4); /* xmit descr list address */
-
- func_exit();
}
/*
@@ -647,13 +606,10 @@ valid by setting the address in the card to 0x00.
static void remove_descriptors(struct xircom_private *card)
{
unsigned int val;
- func_enter();
val = 0;
outl(val, card->io_port + CSR3); /* Receive descriptor address */
outl(val, card->io_port + CSR4); /* Send descriptor address */
-
- func_exit();
}
/*
@@ -665,21 +621,17 @@ This function also clears the status-bit.
static int link_status_changed(struct xircom_private *card)
{
unsigned int val;
- func_enter();
val = inl(card->io_port + CSR5); /* Status register */
- if ((val & (1 << 27)) == 0) { /* no change */
- func_exit();
+ if ((val & (1 << 27)) == 0) /* no change */
return 0;
- }
/* clear the event by writing a 1 to the bit in the
status register. */
val = (1 << 27);
outl(val, card->io_port + CSR5);
- func_exit();
return 1;
}
@@ -691,16 +643,12 @@ in a non-stopped state.
static int transmit_active(struct xircom_private *card)
{
unsigned int val;
- func_enter();
val = inl(card->io_port + CSR5); /* Status register */
- if ((val & (7 << 20)) == 0) { /* transmitter disabled */
- func_exit();
+ if ((val & (7 << 20)) == 0) /* transmitter disabled */
return 0;
- }
- func_exit();
return 1;
}
@@ -711,17 +659,12 @@ in a non-stopped state.
static int receive_active(struct xircom_private *card)
{
unsigned int val;
- func_enter();
-
val = inl(card->io_port + CSR5); /* Status register */
- if ((val & (7 << 17)) == 0) { /* receiver disabled */
- func_exit();
+ if ((val & (7 << 17)) == 0) /* receiver disabled */
return 0;
- }
- func_exit();
return 1;
}
@@ -739,8 +682,6 @@ static void activate_receiver(struct xircom_private *card)
{
unsigned int val;
int counter;
- func_enter();
-
val = inl(card->io_port + CSR6); /* Operation mode */
@@ -781,8 +722,6 @@ static void activate_receiver(struct xircom_private *card)
netdev_err(card->dev,
"Receiver failed to re-activate\n");
}
-
- func_exit();
}
/*
@@ -796,7 +735,6 @@ static void deactivate_receiver(struct xircom_private *card)
{
unsigned int val;
int counter;
- func_enter();
val = inl(card->io_port + CSR6); /* Operation mode */
val = val & ~2; /* disable the receiver */
@@ -812,9 +750,6 @@ static void deactivate_receiver(struct xircom_private *card)
if (counter <= 0)
netdev_err(card->dev, "Receiver failed to deactivate\n");
}
-
-
- func_exit();
}
@@ -832,8 +767,6 @@ static void activate_transmitter(struct xircom_private *card)
{
unsigned int val;
int counter;
- func_enter();
-
val = inl(card->io_port + CSR6); /* Operation mode */
@@ -874,8 +807,6 @@ static void activate_transmitter(struct xircom_private *card)
netdev_err(card->dev,
"Transmitter failed to re-activate\n");
}
-
- func_exit();
}
/*
@@ -889,7 +820,6 @@ static void deactivate_transmitter(struct xircom_private *card)
{
unsigned int val;
int counter;
- func_enter();
val = inl(card->io_port + CSR6); /* Operation mode */
val = val & ~2; /* disable the transmitter */
@@ -906,9 +836,6 @@ static void deactivate_transmitter(struct xircom_private *card)
netdev_err(card->dev,
"Transmitter failed to deactivate\n");
}
-
-
- func_exit();
}
@@ -920,13 +847,10 @@ must be called with the lock held and interrupts disabled.
static void enable_transmit_interrupt(struct xircom_private *card)
{
unsigned int val;
- func_enter();
val = inl(card->io_port + CSR7); /* Interrupt enable register */
val |= 1; /* enable the transmit interrupt */
outl(val, card->io_port + CSR7);
-
- func_exit();
}
@@ -938,13 +862,10 @@ must be called with the lock held and interrupts disabled.
static void enable_receive_interrupt(struct xircom_private *card)
{
unsigned int val;
- func_enter();
val = inl(card->io_port + CSR7); /* Interrupt enable register */
val = val | (1 << 6); /* enable the receive interrupt */
outl(val, card->io_port + CSR7);
-
- func_exit();
}
/*
@@ -955,13 +876,10 @@ must be called with the lock held and interrupts disabled.
static void enable_link_interrupt(struct xircom_private *card)
{
unsigned int val;
- func_enter();
val = inl(card->io_port + CSR7); /* Interrupt enable register */
val = val | (1 << 27); /* enable the link status chage interrupt */
outl(val, card->io_port + CSR7);
-
- func_exit();
}
@@ -974,12 +892,9 @@ must be called with the lock held and interrupts disabled.
static void disable_all_interrupts(struct xircom_private *card)
{
unsigned int val;
- func_enter();
val = 0; /* disable all interrupts */
outl(val, card->io_port + CSR7);
-
- func_exit();
}
/*
@@ -990,7 +905,6 @@ must be called with the lock held and interrupts disabled.
static void enable_common_interrupts(struct xircom_private *card)
{
unsigned int val;
- func_enter();
val = inl(card->io_port + CSR7); /* Interrupt enable register */
val |= (1<<16); /* Normal Interrupt Summary */
@@ -1002,8 +916,6 @@ static void enable_common_interrupts(struct xircom_private *card)
val |= (1<<2); /* Transmit Buffer Unavailable */
val |= (1<<1); /* Transmit Process Stopped */
outl(val, card->io_port + CSR7);
-
- func_exit();
}
/*
@@ -1014,13 +926,11 @@ must be called with the lock held and interrupts disabled.
static int enable_promisc(struct xircom_private *card)
{
unsigned int val;
- func_enter();
val = inl(card->io_port + CSR6);
val = val | (1 << 6);
outl(val, card->io_port + CSR6);
- func_exit();
return 1;
}
@@ -1035,7 +945,6 @@ Must be called in locked state with interrupts disabled
static int link_status(struct xircom_private *card)
{
unsigned int val;
- func_enter();
val = inb(card->io_port + CSR12);
@@ -1046,7 +955,6 @@ static int link_status(struct xircom_private *card)
/* If we get here -> no link at all */
- func_exit();
return 0;
}
@@ -1065,8 +973,6 @@ static void read_mac_address(struct xircom_private *card)
unsigned long flags;
int i;
- func_enter();
-
spin_lock_irqsave(&card->lock, flags);
outl(1 << 12, card->io_port + CSR9); /* enable boot rom access */
@@ -1094,7 +1000,6 @@ static void read_mac_address(struct xircom_private *card)
}
spin_unlock_irqrestore(&card->lock, flags);
pr_debug(" %pM\n", card->dev->dev_addr);
- func_exit();
}
@@ -1107,8 +1012,6 @@ static void transceiver_voodoo(struct xircom_private *card)
{
unsigned long flags;
- func_enter();
-
/* disable all powermanagement */
pci_write_config_dword(card->pdev, PCI_POWERMGMT, 0x0000);
@@ -1126,7 +1029,6 @@ static void transceiver_voodoo(struct xircom_private *card)
spin_unlock_irqrestore(&card->lock, flags);
netif_start_queue(card->dev);
- func_exit();
}
@@ -1135,8 +1037,6 @@ static void xircom_up(struct xircom_private *card)
unsigned long flags;
int i;
- func_enter();
-
/* disable all powermanagement */
pci_write_config_dword(card->pdev, PCI_POWERMGMT, 0x0000);
@@ -1160,7 +1060,6 @@ static void xircom_up(struct xircom_private *card)
trigger_receive(card);
trigger_transmit(card);
netif_start_queue(card->dev);
- func_exit();
}
/* Bufferoffset is in BYTES */
@@ -1170,8 +1069,6 @@ investigate_read_descriptor(struct net_device *dev, struct xircom_private *card,
{
int status;
- func_enter();
-
status = le32_to_cpu(card->rx_buffer[4*descnr]);
if (status > 0) { /* packet received */
@@ -1206,8 +1103,6 @@ out:
card->rx_buffer[4*descnr] = cpu_to_le32(0x80000000);
trigger_receive(card);
}
-
- func_exit();
}
@@ -1219,8 +1114,6 @@ investigate_write_descriptor(struct net_device *dev,
{
int status;
- func_enter();
-
status = le32_to_cpu(card->tx_buffer[4*descnr]);
#if 0
if (status & 0x8000) { /* Major error */
@@ -1242,8 +1135,6 @@ investigate_write_descriptor(struct net_device *dev,
netif_wake_queue(dev);
dev->stats.tx_packets++;
}
-
- func_exit();
}
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH net-next 5/4] tulip: xircom_cb: Remove useless func_enter and func_exit
2011-05-09 19:08 ` [PATCH net-next 5/4] tulip: xircom_cb: Remove useless func_enter and func_exit Joe Perches
@ 2011-05-09 19:10 ` David Miller
2011-05-09 19:17 ` Joe Perches
0 siblings, 1 reply; 15+ messages in thread
From: David Miller @ 2011-05-09 19:10 UTC (permalink / raw)
To: joe; +Cc: netdev, linux-kernel
From: Joe Perches <joe@perches.com>
Date: Mon, 09 May 2011 12:08:01 -0700
> On Mon, 2011-05-09 at 11:47 -0700, David Miller wrote:
>> With the advent of the function tracer, those silly function entry/exit
>> logging things are entirely superfluous.
>> They make the code look ugly too.
>
> I don't much like a lot of debugging messages
> throughout drivers/net, but that's a whole 'nother
> set of patches.
>
>> Please do that and respin this patch set, thanks Joe!
>
> How 'bout I just add another patch to delete them.
>
> Signed-off-by: Joe Perches <joe@perches.com>
How about you just respin the patch set as I asked you to?
It makes no sense to "fix" something you're just going to
delete in the very next commit.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH net-next 5/4] tulip: xircom_cb: Remove useless func_enter and func_exit
2011-05-09 19:10 ` David Miller
@ 2011-05-09 19:17 ` Joe Perches
2011-05-09 19:41 ` David Miller
0 siblings, 1 reply; 15+ messages in thread
From: Joe Perches @ 2011-05-09 19:17 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-kernel
On Mon, 2011-05-09 at 12:10 -0700, David Miller wrote:
> From: Joe Perches <joe@perches.com>
> Date: Mon, 09 May 2011 12:08:01 -0700
> > On Mon, 2011-05-09 at 11:47 -0700, David Miller wrote:
> >> With the advent of the function tracer, those silly function entry/exit
> >> logging things are entirely superfluous.
> >> They make the code look ugly too.
> > I don't much like a lot of debugging messages
> > throughout drivers/net, but that's a whole 'nother
> > set of patches.
> >> Please do that and respin this patch set, thanks Joe!
> > How 'bout I just add another patch to delete them.
> > Signed-off-by: Joe Perches <joe@perches.com>
> How about you just respin the patch set as I asked you to?
> It makes no sense to "fix" something you're just going to
> delete in the very next commit.
Grumble.
'Cause it's about 20 minutes work for almost _no_ value.
^ permalink raw reply [flat|nested] 15+ messages in thread