Skip to contentSkip to conversation

drivers/net/ks*: Use netdev_<level>, netif_<level> and pr_<level>

RFC PATCH In review Joe Perches 3 participants 3 messages Feb 28, 2010 – May 5, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 drivers/net/ks*: Use netdev_<level>, netif_<level> and pr_<level>

I'm not sure this is correct.

It changes logging macros from:

	dev_<level>(&ks->spidev->dev,
to
	netdev_<level>(ks->netdev,

Comments?

Use netdev_<level>
Use netif_<level>
Use pr_<level>
Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Add missing line to message in ks8851_remove
Change kmalloc/memset(,0) to kzalloc
Remove ks_<level> macros
Consolidation code into set_media_state

---
 drivers/net/ks8842.c     |    8 ++--
 drivers/net/ks8851.c     |   88 ++++++++++++++++++++-------------------------
 drivers/net/ks8851_mll.c |   50 ++++++++++----------------
 drivers/net/ksz884x.c    |   65 ++++++++++++++-------------------
 4 files changed, 91 insertions(+), 120 deletions(-)
drivers/net/ks8842.c +4 -4
index 5c45cb5..b91492f 100644
@@ -20,6 +20,8 @@
  * The Micrel KS8842 behind the timberdale FPGA
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
@@ -525,8 +527,7 @@ static int ks8842_open(struct net_device *netdev)
 	err = request_irq(adapter->irq, ks8842_irq, IRQF_SHARED, DRV_NAME,
 		adapter);
 	if (err) {
-		printk(KERN_ERR "Failed to request IRQ: %d: %d\n",
-			adapter->irq, err);
+		pr_err("Failed to request IRQ: %d: %d\n", adapter->irq, err);
 		return err;
 	}
 
@@ -668,8 +669,7 @@ static int __devinit ks8842_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, netdev);
 
-	printk(KERN_INFO DRV_NAME
-		" Found chip, family: 0x%x, id: 0x%x, rev: 0x%x\n",
+	pr_info("Found chip, family: 0x%x, id: 0x%x, rev: 0x%x\n",
 		(id >> 8) & 0xff, (id >> 4) & 0xf, (id >> 1) & 0x7);
 
 	return 0;
drivers/net/ks8851.c +39 -49

234 lines not on this page · raw message

drivers/net/ks8851_mll.c +20 -30

149 lines not on this page · raw message

drivers/net/ksz884x.c +28 -37

139 lines not on this page · raw message

maintainer
#1 lore raw

From: Joe Perches <[email protected]>
Date: Sat, 27 Feb 2010 16:43:51 -0800

Quoted 6 lines

I'm not sure this is correct.

It changes logging macros from:

	dev_<level>(&ks->spidev->dev,
to
	netdev_<level>(ks->netdev,

I'm just applying this, more than a week to get a review is more than enough.

Thanks Joe.

#2 lore raw
Quoted 11 lines · David Miller

From: Joe Perches <[email protected]>
Date: Sat, 27 Feb 2010 16:43:51 -0800

Quoted 6 lines

I'm not sure this is correct.

It changes logging macros from:

	dev_<level>(&ks->spidev->dev,
to
	netdev_<level>(ks->netdev,

I'm just applying this, more than a week to get a review is more than

enough.

Quoted 2 lines

Thanks Joe.

I have no objection about the patch as it just uses the latest kernel debug call. Is this new code available in current 2.6.34 release? Or will it be in the next version?

I generally download the latest 2.6.34-rc release to generate patches for submission.