drivers/net/mac8390.c: Convert printk(KERN_<level> to pr_<level>( (18c00191) · Commits · 方亚芬 / linux

drivers/net/mac8390.c

+25 −32

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,8 @@
	/* 2002-12-30: Try to support more cards, some clues from NetBSD driver */		/* 2002-12-30: Try to support more cards, some clues from NetBSD driver */
	/* 2003-12-26: Make sure Asante cards always work. */		/* 2003-12-26: Make sure Asante cards always work. */

			#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

	#include <linux/module.h>		#include <linux/module.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/types.h>		#include <linux/types.h>
	@@ -42,7 +44,7 @@
	#include <asm/macints.h>		#include <asm/macints.h>

	static char version[] =		static char version[] =
	"mac8390.c: v0.4 2001-05-15 David Huggins-Daines <dhd@debian.org> and others\n";		"v0.4 2001-05-15 David Huggins-Daines <dhd@debian.org> and others\n";

	#define EI_SHIFT(x) (ei_local->reg_offset[x])		#define EI_SHIFT(x) (ei_local->reg_offset[x])
	#define ei_inb(port) in_8(port)		#define ei_inb(port) in_8(port)
	@@ -288,7 +290,6 @@ struct net_device * __init mac8390_probe(int unit)
	{		{
	struct net_device *dev;		struct net_device *dev;
	volatile unsigned short *i;		volatile unsigned short *i;
	int version_disp = 0;
	struct nubus_dev * ndev = NULL;		struct nubus_dev * ndev = NULL;
	int err = -ENODEV;		int err = -ENODEV;

	@@ -320,10 +321,7 @@ struct net_device * __init mac8390_probe(int unit)
	if ((cardtype = mac8390_ident(ndev)) == MAC8390_NONE)		if ((cardtype = mac8390_ident(ndev)) == MAC8390_NONE)
	continue;		continue;

	if (version_disp == 0) {		printk_once(KERN_INFO pr_fmt(version));
	version_disp = 1;
	printk(version);
	}

	dev->irq = SLOT2IRQ(ndev->board->slot);		dev->irq = SLOT2IRQ(ndev->board->slot);
	/* This is getting to be a habit */		/* This is getting to be a habit */
	@@ -333,16 +331,14 @@ struct net_device * __init mac8390_probe(int unit)
	of where its memory and registers are. */		of where its memory and registers are. */

	if (nubus_get_func_dir(ndev, &dir) == -1) {		if (nubus_get_func_dir(ndev, &dir) == -1) {
	printk(KERN_ERR "%s: Unable to get Nubus functional"		pr_err("%s: Unable to get Nubus functional directory for slot %X!\n",
	" directory for slot %X!\n",
	dev->name, ndev->board->slot);		dev->name, ndev->board->slot);
	continue;		continue;
	}		}

	/* Get the MAC address */		/* Get the MAC address */
	if ((nubus_find_rsrc(&dir, NUBUS_RESID_MAC_ADDRESS, &ent)) == -1) {		if ((nubus_find_rsrc(&dir, NUBUS_RESID_MAC_ADDRESS, &ent)) == -1) {
	printk(KERN_INFO "%s: Couldn't get MAC address!\n",		pr_info("%s: Couldn't get MAC address!\n", dev->name);
	dev->name);
	continue;		continue;
	} else {		} else {
	nubus_get_rsrc_mem(dev->dev_addr, &ent, 6);		nubus_get_rsrc_mem(dev->dev_addr, &ent, 6);
	@@ -351,8 +347,7 @@ struct net_device * __init mac8390_probe(int unit)
	if (useresources[cardtype] == 1) {		if (useresources[cardtype] == 1) {
	nubus_rewinddir(&dir);		nubus_rewinddir(&dir);
	if (nubus_find_rsrc(&dir, NUBUS_RESID_MINOR_BASEOS, &ent) == -1) {		if (nubus_find_rsrc(&dir, NUBUS_RESID_MINOR_BASEOS, &ent) == -1) {
	printk(KERN_ERR "%s: Memory offset resource"		pr_err("%s: Memory offset resource for slot %X not found!\n",
	" for slot %X not found!\n",
	dev->name, ndev->board->slot);		dev->name, ndev->board->slot);
	continue;		continue;
	}		}
	@@ -362,9 +357,7 @@ struct net_device * __init mac8390_probe(int unit)
	dev->base_addr = dev->mem_start + 0x10000;		dev->base_addr = dev->mem_start + 0x10000;
	nubus_rewinddir(&dir);		nubus_rewinddir(&dir);
	if (nubus_find_rsrc(&dir, NUBUS_RESID_MINOR_LENGTH, &ent) == -1) {		if (nubus_find_rsrc(&dir, NUBUS_RESID_MINOR_LENGTH, &ent) == -1) {
	printk(KERN_INFO "%s: Memory length resource"		pr_info("%s: Memory length resource for slot %X not found, probing\n",
	" for slot %X not found"
	", probing\n",
	dev->name, ndev->board->slot);		dev->name, ndev->board->slot);
	offset = mac8390_memsize(dev->mem_start);		offset = mac8390_memsize(dev->mem_start);
	} else {		} else {
	@@ -417,8 +410,7 @@ struct net_device * __init mac8390_probe(int unit)
	break;		break;

	default:		default:
	printk(KERN_ERR "Card type %s is"		pr_err("Card type %s is unsupported, sorry\n",
	" unsupported, sorry\n",
	ndev->board->name);		ndev->board->name);
	continue;		continue;
	}		}
	@@ -458,7 +450,7 @@ int init_module(void)
	dev_mac890[i] = dev;		dev_mac890[i] = dev;
	}		}
	if (!i) {		if (!i) {
	printk(KERN_NOTICE "mac8390.c: No useable cards found, driver NOT installed.\n");		pr_notice("No useable cards found, driver NOT installed.\n");
	return -ENODEV;		return -ENODEV;
	}		}
	return 0;		return 0;
	@@ -545,7 +537,7 @@ static int __init mac8390_initdev(struct net_device * dev, struct nubus_dev * nd
	case MAC8390_APPLE:		case MAC8390_APPLE:
	switch (mac8390_testio(dev->mem_start)) {		switch (mac8390_testio(dev->mem_start)) {
	case ACCESS_UNKNOWN:		case ACCESS_UNKNOWN:
	printk("Don't know how to access card memory!\n");		pr_info("Don't know how to access card memory!\n");
	return -ENODEV;		return -ENODEV;
	break;		break;

	@@ -612,17 +604,18 @@ static int __init mac8390_initdev(struct net_device * dev, struct nubus_dev * nd
	break;		break;

	default:		default:
	printk(KERN_ERR "Card type %s is unsupported, sorry\n", ndev->board->name);		pr_err("Card type %s is unsupported, sorry\n",
			ndev->board->name);
	return -ENODEV;		return -ENODEV;
	}		}

	__NS8390_init(dev, 0);		__NS8390_init(dev, 0);

	/* Good, done, now spit out some messages */		/* Good, done, now spit out some messages */
	printk(KERN_INFO "%s: %s in slot %X (type %s)\n",		pr_info("%s: %s in slot %X (type %s)\n",
	dev->name, ndev->board->name, ndev->board->slot, cardname[type]);		dev->name, ndev->board->name, ndev->board->slot,
	printk(KERN_INFO		cardname[type]);
	"MAC %pM IRQ %d, %d KB shared memory at %#lx, %d-bit access.\n",		pr_info("MAC %pM IRQ %d, %d KB shared memory at %#lx, %d-bit access.\n",
	dev->dev_addr, dev->irq,		dev->dev_addr, dev->irq,
	(unsigned int)(dev->mem_end - dev->mem_start) >> 10,		(unsigned int)(dev->mem_end - dev->mem_start) >> 10,
	dev->mem_start, access_bitmode ? 32 : 16);		dev->mem_start, access_bitmode ? 32 : 16);
	@@ -633,7 +626,7 @@ static int mac8390_open(struct net_device *dev)
	{		{
	__ei_open(dev);		__ei_open(dev);
	if (request_irq(dev->irq, __ei_interrupt, 0, "8390 Ethernet", dev)) {		if (request_irq(dev->irq, __ei_interrupt, 0, "8390 Ethernet", dev)) {
	printk ("%s: unable to get IRQ %d.\n", dev->name, dev->irq);		pr_info("%s: unable to get IRQ %d.\n", dev->name, dev->irq);
	return -EAGAIN;		return -EAGAIN;
	}		}
	return 0;		return 0;
	@@ -650,7 +643,7 @@ static void mac8390_no_reset(struct net_device *dev)
	{		{
	ei_status.txing = 0;		ei_status.txing = 0;
	if (ei_debug > 1)		if (ei_debug > 1)
	printk("reset not supported\n");		pr_info("reset not supported\n");
	return;		return;
	}		}

	@@ -658,11 +651,11 @@ static void interlan_reset(struct net_device *dev)
	{		{
	unsigned char *target=nubus_slot_addr(IRQ2SLOT(dev->irq));		unsigned char *target=nubus_slot_addr(IRQ2SLOT(dev->irq));
	if (ei_debug > 1)		if (ei_debug > 1)
	printk("Need to reset the NS8390 t=%lu...", jiffies);		pr_info("Need to reset the NS8390 t=%lu...", jiffies);
	ei_status.txing = 0;		ei_status.txing = 0;
	target[0xC0000] = 0;		target[0xC0000] = 0;
	if (ei_debug > 1)		if (ei_debug > 1)
	printk("reset complete\n");		pr_cont("reset complete\n");
	return;		return;
	}		}