Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 237c5e8e authored by Ben Dooks's avatar Ben Dooks Committed by David S. Miller
Browse files

NET: AX88796 use dev_dbg() instead of printk() 



Change to using dev_dbg() and the other dev_xxx()
macros instead of printk, and update to use the
print_mac() helper.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 06c3fd6a

drivers/net/ax88796.c

+23 −17
Original line number Diff line number Diff line
@@ -137,11 +137,12 @@ static int ax_initial_check(struct net_device *dev) 
static void ax_reset_8390(struct net_device *dev)

{

	struct ei_device *ei_local = netdev_priv(dev);

	struct ax_device  *ax = to_ax_dev(dev);

	unsigned long reset_start_time = jiffies;

	void __iomem *addr = (void __iomem *)dev->base_addr;



	if (ei_debug > 1)

		printk(KERN_DEBUG "resetting the 8390 t=%ld...", jiffies);

		dev_dbg(&ax->dev->dev, "resetting the 8390 t=%ld\n", jiffies);



	ei_outb(ei_inb(addr + NE_RESET), addr + NE_RESET);
@@ -151,7 +152,7 @@ static void ax_reset_8390(struct net_device *dev) 
	/* This check _should_not_ be necessary, omit eventually. */

	while ((ei_inb(addr + EN0_ISR) & ENISR_RESET) == 0) {

		if (jiffies - reset_start_time > 2*HZ/100) {

			printk(KERN_WARNING "%s: %s did not complete.\n",

			dev_warn(&ax->dev->dev, "%s: %s did not complete.\n",

			       __FUNCTION__, dev->name);

			break;

		}
@@ -165,11 +166,13 @@ static void ax_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, 
			    int ring_page)

{

	struct ei_device *ei_local = netdev_priv(dev);

	struct ax_device  *ax = to_ax_dev(dev);

	void __iomem *nic_base = ei_local->mem;



	/* This *shouldn't* happen. If it does, it's the last thing you'll see */

	if (ei_status.dmaing) {

		printk(KERN_EMERG "%s: DMAing conflict in %s [DMAstat:%d][irqlock:%d].\n",

		dev_err(&ax->dev->dev, "%s: DMAing conflict in %s "

			"[DMAstat:%d][irqlock:%d].\n",

			dev->name, __FUNCTION__,

			ei_status.dmaing, ei_status.irqlock);

		return;
@@ -204,13 +207,16 @@ static void ax_block_input(struct net_device *dev, int count, 
			   struct sk_buff *skb, int ring_offset)

{

	struct ei_device *ei_local = netdev_priv(dev);

	struct ax_device  *ax = to_ax_dev(dev);

	void __iomem *nic_base = ei_local->mem;

	char *buf = skb->data;



	if (ei_status.dmaing) {

		printk(KERN_EMERG "%s: DMAing conflict in ax_block_input "

		dev_err(&ax->dev->dev,

			"%s: DMAing conflict in %s "

			"[DMAstat:%d][irqlock:%d].\n",

			dev->name, ei_status.dmaing, ei_status.irqlock);

			dev->name, __FUNCTION__,

			ei_status.dmaing, ei_status.irqlock);

		return;

	}
@@ -239,6 +245,7 @@ static void ax_block_output(struct net_device *dev, int count, 
			    const unsigned char *buf, const int start_page)

{

	struct ei_device *ei_local = netdev_priv(dev);

	struct ax_device  *ax = to_ax_dev(dev);

	void __iomem *nic_base = ei_local->mem;

	unsigned long dma_start;
@@ -251,7 +258,7 @@ static void ax_block_output(struct net_device *dev, int count, 


	/* This *shouldn't* happen. If it does, it's the last thing you'll see */

	if (ei_status.dmaing) {

		printk(KERN_EMERG "%s: DMAing conflict in %s."

		dev_err(&ax->dev->dev, "%s: DMAing conflict in %s."

			"[DMAstat:%d][irqlock:%d]\n",

			dev->name, __FUNCTION__,

		       ei_status.dmaing, ei_status.irqlock);
@@ -281,7 +288,8 @@ static void ax_block_output(struct net_device *dev, int count, 


	while ((ei_inb(nic_base + EN0_ISR) & ENISR_RDC) == 0) {

		if (jiffies - dma_start > 2*HZ/100) {		/* 20ms */

			printk(KERN_WARNING "%s: timeout waiting for Tx RDC.\n", dev->name);

			dev_warn(&ax->dev->dev,

				 "%s: timeout waiting for Tx RDC.\n", dev->name);

			ax_reset_8390(dev);

			ax_NS8390_init(dev,1);

			break;
@@ -424,9 +432,10 @@ static void 
ax_phy_write(struct net_device *dev, int phy_addr, int reg, int value)

{

	struct ei_device *ei = (struct ei_device *) netdev_priv(dev);

	struct ax_device  *ax = to_ax_dev(dev);

	unsigned long flags;



	printk(KERN_DEBUG "%s: %p, %04x, %04x %04x\n",

	dev_dbg(&ax->dev->dev, "%s: %p, %04x, %04x %04x\n",

		__FUNCTION__, dev, phy_addr, reg, value);



      	spin_lock_irqsave(&ei->page_lock, flags);
@@ -750,14 +759,11 @@ static int ax_init_dev(struct net_device *dev, int first_init) 
	ax_NS8390_init(dev, 0);



	if (first_init) {

		printk("AX88796: %dbit, irq %d, %lx, MAC: ",

		       ei_status.word16 ? 16:8, dev->irq, dev->base_addr);



		for (i = 0; i < ETHER_ADDR_LEN; i++)

			printk("%2.2x%c", dev->dev_addr[i],

			       (i < (ETHER_ADDR_LEN-1) ? ':' : ' '));

		DECLARE_MAC_BUF(mac);



		printk("\n");

		dev_info(&ax->dev->dev, "%dbit, irq %d, %lx, MAC: %s\n",

			 ei_status.word16 ? 16:8, dev->irq, dev->base_addr,

			 print_mac(mac, dev->dev_addr));

	}



	ret = register_netdev(dev);