aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/arcnet/arc-rimi.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2015-05-05 13:05:50 -0400
committerMichael Grzeschik <m.grzeschik@pengutronix.de>2015-09-23 02:44:23 -0400
commit3b4e55510f3151cd906cd221f6fba5cb56b8cfed (patch)
treec2736a77824fcfbafbf5dbe45abcc406be553dd9 /drivers/net/arcnet/arc-rimi.c
parent7f5e760c1b269044a4ba1b269263beca80ae2741 (diff)
arcnet: Coalesce string fragments
Using coalesced strings helps grep for specific messages. 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.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c
index e8c15016bb8e..6eedd6b6b041 100644
--- a/drivers/net/arcnet/arc-rimi.c
+++ b/drivers/net/arcnet/arc-rimi.c
@@ -90,13 +90,11 @@ static int __init arcrimi_probe(struct net_device *dev)
90 dev->dev_addr[0], dev->mem_start, dev->irq); 90 dev->dev_addr[0], dev->mem_start, dev->irq);
91 91
92 if (dev->mem_start <= 0 || dev->irq <= 0) { 92 if (dev->mem_start <= 0 || dev->irq <= 0) {
93 BUGLVL(D_NORMAL) printk("No autoprobe for RIM I; you " 93 BUGLVL(D_NORMAL) printk("No autoprobe for RIM I; you must specify the shmem and irq!\n");
94 "must specify the shmem and irq!\n");
95 return -ENODEV; 94 return -ENODEV;
96 } 95 }
97 if (dev->dev_addr[0] == 0) { 96 if (dev->dev_addr[0] == 0) {
98 BUGLVL(D_NORMAL) printk("You need to specify your card's station " 97 BUGLVL(D_NORMAL) printk("You need to specify your card's station ID!\n");
99 "ID!\n");
100 return -ENODEV; 98 return -ENODEV;
101 } 99 }
102 /* 100 /*
@@ -225,8 +223,7 @@ static int __init arcrimi_found(struct net_device *dev)
225 /* get and check the station ID from offset 1 in shmem */ 223 /* get and check the station ID from offset 1 in shmem */
226 dev->dev_addr[0] = readb(lp->mem_start + 1); 224 dev->dev_addr[0] = readb(lp->mem_start + 1);
227 225
228 BUGMSG(D_NORMAL, "ARCnet RIM I: station %02Xh found at IRQ %d, " 226 BUGMSG(D_NORMAL, "ARCnet RIM I: station %02Xh found at IRQ %d, ShMem %lXh (%ld*%d bytes)\n",
229 "ShMem %lXh (%ld*%d bytes).\n",
230 dev->dev_addr[0], 227 dev->dev_addr[0],
231 dev->irq, dev->mem_start, 228 dev->irq, dev->mem_start,
232 (dev->mem_end - dev->mem_start + 1) / mirror_size, mirror_size); 229 (dev->mem_end - dev->mem_start + 1) / mirror_size, mirror_size);