diff options
| author |   Joe Perches <joe@perches.com> | 2015-05-05 10:05:56 -0700 |
|---|---|---|
| committer |   Michael Grzeschik <m.grzeschik@pengutronix.de> | 2015-09-23 08:44:24 +0200 |
| commit | 05a24b234b9dda3720208b74503f2cf1d05774ee (patch) | |
| tree | 117e7e1908f427ed51b441deb0d2efed71d1d0d1 /drivers/net/arcnet/arc-rimi.c | |
| parent | arcnet: Convert BUGMSG and BUGMSG2 to arc_prink and arc_cont (diff) | |
| download | linux-dev-05a24b234b9dda3720208b74503f2cf1d05774ee.tar.xz linux-dev-05a24b234b9dda3720208b74503f2cf1d05774ee.zip | |
arcnet: Convert printk to pr_<level>
Use the more current logging style.
Remove #define VERSION, use pr_info normally.
Add pr_fmt with "arcnet:" prefixes and KBUILD_MODNAME.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Diffstat (limited to 'drivers/net/arcnet/arc-rimi.c')
| -rw-r--r-- | drivers/net/arcnet/arc-rimi.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c index 25f84b7437f3..7360214e3d3f 100644 --- a/drivers/net/arcnet/arc-rimi.c +++ b/drivers/net/arcnet/arc-rimi.c @@ -24,6 +24,9 @@ * * ********************** */ + +#define pr_fmt(fmt) "arcnet:" KBUILD_MODNAME ": " fmt + #include <linux/kernel.h> #include <linux/module.h> #include <linux/moduleparam.h> @@ -36,8 +39,6 @@ #include <linux/io.h> #include <linux/arcdevice.h> -#define VERSION "arcnet: RIM I (entirely mem-mapped) support\n" - /* Internal function declarations */ static int arcrimi_probe(struct net_device *dev); @@ -83,20 +84,20 @@ static void arcrimi_copy_from_card(struct net_device *dev, int bufnum, int offse static int __init arcrimi_probe(struct net_device *dev) { if (BUGLVL(D_NORMAL)) { - printk(VERSION); - printk("E-mail me if you actually test the RIM I driver, please!\n"); - printk("Given: node %02Xh, shmem %lXh, irq %d\n", - dev->dev_addr[0], dev->mem_start, dev->irq); + pr_info("%s\n", "RIM I (entirely mem-mapped) support"); + pr_info("E-mail me if you actually test the RIM I driver, please!\n"); + pr_info("Given: node %02Xh, shmem %lXh, irq %d\n", + dev->dev_addr[0], dev->mem_start, dev->irq); } if (dev->mem_start <= 0 || dev->irq <= 0) { if (BUGLVL(D_NORMAL)) - printk("No autoprobe for RIM I; you must specify the shmem and irq!\n"); + pr_err("No autoprobe for RIM I; you must specify the shmem and irq!\n"); return -ENODEV; } if (dev->dev_addr[0] == 0) { if (BUGLVL(D_NORMAL)) - printk("You need to specify your card's station ID!\n"); + pr_err("You need to specify your card's station ID!\n"); return -ENODEV; } /* Grab the memory region at mem_start for MIRROR_SIZE bytes. @@ -106,7 +107,7 @@ static int __init arcrimi_probe(struct net_device *dev) */ if (!request_mem_region(dev->mem_start, MIRROR_SIZE, "arcnet (90xx)")) { if (BUGLVL(D_NORMAL)) - printk("Card memory already allocated\n"); + pr_notice("Card memory already allocated\n"); return -ENODEV; } return arcrimi_found(dev); @@ -375,7 +376,7 @@ static int __init arcrimi_setup(char *s) return 1; switch (ints[0]) { default: /* ERROR */ - printk("arcrimi: Too many arguments.\n"); + pr_err("Too many arguments\n"); case 3: /* Node ID */ node = ints[3]; case 2: /* IRQ */ |