diff options
author | Joe Perches <joe@perches.com> | 2010-02-27 09:43:51 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-17 00:23:25 -0400 |
commit | 0dc7d2b3cbfcf4ff20bdc68f563a2e52e6a2178f (patch) | |
tree | 9f81abd6d5d494230a4d23b1a27f399f5832f9e7 /drivers/net/ks8842.c | |
parent | ca50910185fcce694af0cc194de50d2374a7c7ef (diff) |
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
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ks8842.c')
-rw-r--r-- | drivers/net/ks8842.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ks8842.c b/drivers/net/ks8842.c index 5c45cb58d023..b91492f4e48a 100644 --- a/drivers/net/ks8842.c +++ b/drivers/net/ks8842.c | |||
@@ -20,6 +20,8 @@ | |||
20 | * The Micrel KS8842 behind the timberdale FPGA | 20 | * The Micrel KS8842 behind the timberdale FPGA |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
24 | |||
23 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
24 | #include <linux/module.h> | 26 | #include <linux/module.h> |
25 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
@@ -525,8 +527,7 @@ static int ks8842_open(struct net_device *netdev) | |||
525 | err = request_irq(adapter->irq, ks8842_irq, IRQF_SHARED, DRV_NAME, | 527 | err = request_irq(adapter->irq, ks8842_irq, IRQF_SHARED, DRV_NAME, |
526 | adapter); | 528 | adapter); |
527 | if (err) { | 529 | if (err) { |
528 | printk(KERN_ERR "Failed to request IRQ: %d: %d\n", | 530 | pr_err("Failed to request IRQ: %d: %d\n", adapter->irq, err); |
529 | adapter->irq, err); | ||
530 | return err; | 531 | return err; |
531 | } | 532 | } |
532 | 533 | ||
@@ -668,8 +669,7 @@ static int __devinit ks8842_probe(struct platform_device *pdev) | |||
668 | 669 | ||
669 | platform_set_drvdata(pdev, netdev); | 670 | platform_set_drvdata(pdev, netdev); |
670 | 671 | ||
671 | printk(KERN_INFO DRV_NAME | 672 | pr_info("Found chip, family: 0x%x, id: 0x%x, rev: 0x%x\n", |
672 | " Found chip, family: 0x%x, id: 0x%x, rev: 0x%x\n", | ||
673 | (id >> 8) & 0xff, (id >> 4) & 0xf, (id >> 1) & 0x7); | 673 | (id >> 8) & 0xff, (id >> 4) & 0xf, (id >> 1) & 0x7); |
674 | 674 | ||
675 | return 0; | 675 | return 0; |