summaryrefslogtreecommitdiff
path: root/drivers/net/arcnet/com90xx.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2015-05-05 10:05:56 -0700
committerMichael Grzeschik <m.grzeschik@pengutronix.de>2015-09-23 08:44:24 +0200
commit05a24b234b9dda3720208b74503f2cf1d05774ee (patch)
tree117e7e1908f427ed51b441deb0d2efed71d1d0d1 /drivers/net/arcnet/com90xx.c
parenta34c0932c3b2f28542825ffc5280d562c49ad42d (diff)
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/com90xx.c')
-rw-r--r--drivers/net/arcnet/com90xx.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c
index 12534a3cb4ce..50c346b5d907 100644
--- a/drivers/net/arcnet/com90xx.c
+++ b/drivers/net/arcnet/com90xx.c
@@ -24,6 +24,9 @@
*
* **********************
*/
+
+#define pr_fmt(fmt) "arcnet:" KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
@@ -35,8 +38,6 @@
#include <linux/io.h>
#include <linux/arcdevice.h>
-#define VERSION "arcnet: COM90xx chipset support\n"
-
/* Define this to speed up the autoprobe by assuming if only one io port and
* shmem are left in the list at Stage 5, they must correspond to each
* other.
@@ -134,7 +135,7 @@ static void __init com90xx_probe(void)
}
if (BUGLVL(D_NORMAL))
- printk(VERSION);
+ pr_info("%s\n", "COM90xx chipset support");
/* set up the arrays where we'll store the possible probe addresses */
numports = numshmems = 0;
@@ -418,9 +419,9 @@ static void __init com90xx_probe(void)
if (openparen) {
if (BUGLVL(D_INIT))
- printk("no matching shmem)\n");
+ pr_cont("no matching shmem)\n");
if (BUGLVL(D_INIT_REASONS)) {
- printk("S5: ");
+ pr_cont("S5: ");
numprint = 0;
}
}
@@ -430,7 +431,7 @@ static void __init com90xx_probe(void)
}
if (BUGLVL(D_INIT_REASONS))
- printk("\n");
+ pr_cont("\n");
/* Now put back TESTvalue on all leftover shmems. */
for (index = 0; index < numshmems; index++) {
@@ -685,13 +686,13 @@ static int __init com90xx_setup(char *s)
s = get_options(s, 8, ints);
if (!ints[0] && !*s) {
- printk("com90xx: Disabled.\n");
+ pr_notice("Disabled\n");
return 1;
}
switch (ints[0]) {
default: /* ERROR */
- printk("com90xx: Too many arguments.\n");
+ pr_err("Too many arguments\n");
case 3: /* Mem address */
shmem = ints[3];
case 2: /* IRQ */