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>

diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c
index e8c15016bb8e7e48f6b1ea6a1f430be940a7f9bb..6eedd6b6b041cca281278c06e01fcd569d0c8b57 100644 (file)
--- 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)
                                dev->dev_addr[0], dev->mem_start, dev->irq);
 
        if (dev->mem_start <= 0 || dev->irq <= 0) {
-               BUGLVL(D_NORMAL) printk("No autoprobe for RIM I; you "
-                      "must specify the shmem and irq!\n");
+               BUGLVL(D_NORMAL) printk("No autoprobe for RIM I; you must specify the shmem and irq!\n");
                return -ENODEV;
        }
        if (dev->dev_addr[0] == 0) {
-               BUGLVL(D_NORMAL) printk("You need to specify your card's station "
-                      "ID!\n");
+               BUGLVL(D_NORMAL) printk("You need to specify your card's station ID!\n");
                return -ENODEV;
        }
        /*
@@ -225,8 +223,7 @@ static int __init arcrimi_found(struct net_device *dev)
        /* get and check the station ID from offset 1 in shmem */
        dev->dev_addr[0] = readb(lp->mem_start + 1);
 
-       BUGMSG(D_NORMAL, "ARCnet RIM I: station %02Xh found at IRQ %d, "
-              "ShMem %lXh (%ld*%d bytes).\n",
+       BUGMSG(D_NORMAL, "ARCnet RIM I: station %02Xh found at IRQ %d, ShMem %lXh (%ld*%d bytes)\n",
               dev->dev_addr[0],
               dev->irq, dev->mem_start,
         (dev->mem_end - dev->mem_start + 1) / mirror_size, mirror_size);

diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c
index 24c0a64150237a378a62b49ce71510180d9b5f40..d70efda777c52253e5bbda9ca01fb42b288d0d57 100644 (file)
--- a/drivers/net/arcnet/arcnet.c
+++ b/drivers/net/arcnet/arcnet.c
@@ -416,11 +416,9 @@ int arcnet_open(struct net_device *dev)
                lp->hw.open(dev);
 
        if (dev->dev_addr[0] == 0)
-               BUGMSG(D_NORMAL, "WARNING!  Station address 00 is reserved "
-                      "for broadcasts!\n");
+               BUGMSG(D_NORMAL, "WARNING!  Station address 00 is reserved for broadcasts!\n");
        else if (dev->dev_addr[0] == 255)
-               BUGMSG(D_NORMAL, "WARNING!  Station address FF may confuse "
-                      "DOS networking programs!\n");
+               BUGMSG(D_NORMAL, "WARNING!  Station address FF may confuse DOS networking programs!\n");
 
        BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
        if (ASTATUS() & RESETflag) {
@@ -580,8 +578,8 @@ netdev_tx_t arcnet_send_packet(struct sk_buff *skb,
                        if (proto->continue_tx &&
                            proto->continue_tx(dev, txbuf)) {
                                BUGMSG(D_NORMAL,
-                                      "bug! continue_tx finished the first time! "
-                                      "(proto='%c')\n", proto->suffix);
+                                      "bug! continue_tx finished the first time! (proto='%c')\n",
+                                      proto->suffix);
                        }
                }
                retval = NETDEV_TX_OK;
@@ -779,15 +777,13 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
                                if (!(status & TXACKflag)) {
                                        if (lp->lasttrans_dest != 0) {
                                                BUGMSG(D_EXTRA,
-                                                      "transmit was not acknowledged! "
-                                                      "(status=%Xh, dest=%02Xh)\n",
+                                                      "transmit was not acknowledged! (status=%Xh, dest=%02Xh)\n",
                                                       status, lp->lasttrans_dest);
                                                dev->stats.tx_errors++;
                                                dev->stats.tx_carrier_errors++;
                                        } else {
                                                BUGMSG(D_DURING,
-                                                      "broadcast was not acknowledged; that's normal "
-                                                      "(status=%Xh, dest=%02Xh)\n",
+                                                      "broadcast was not acknowledged; that's normal (status=%Xh, dest=%02Xh)\n",
                                                       status, lp->lasttrans_dest);
                                        }
                                }
@@ -948,8 +944,7 @@ static void arcnet_rx(struct net_device *dev, int bufnum)
                lp->hw.copy_from_card(dev, bufnum, ofs, soft, length);
        }
 
-       BUGMSG(D_DURING, "Buffer #%d: received packet from %02Xh to %02Xh "
-              "(%d+4 bytes)\n",
+       BUGMSG(D_DURING, "Buffer #%d: received packet from %02Xh to %02Xh (%d+4 bytes)\n",
               bufnum, pkt.hard.source, pkt.hard.dest, length);
 
        dev->stats.rx_packets++;
@@ -964,8 +959,8 @@ static void arcnet_rx(struct net_device *dev, int bufnum)
 
                        if (oldp != newp) {
                                BUGMSG(D_PROTO,
-                                      "got protocol %02Xh; encap for host %02Xh is now '%c'"
-                                      " (was '%c')\n", soft->proto, pkt.hard.source,
+                                      "got protocol %02Xh; encap for host %02Xh is now '%c' (was '%c')\n",
+                                      soft->proto, pkt.hard.source,
                                       newp->suffix, oldp->suffix);
                        }
                }

diff --git a/drivers/net/arcnet/com20020-isa.c b/drivers/net/arcnet/com20020-isa.c
index c7d3377a45fef77ffc48c4dbdaaf4fbb57db6ed5..b8129360b756524ed7b77f448a3b2a2ed58b1897 100644 (file)
--- a/drivers/net/arcnet/com20020-isa.c
+++ b/drivers/net/arcnet/com20020-isa.c
@@ -58,8 +58,7 @@ static int __init com20020isa_probe(struct net_device *dev)
 
        ioaddr = dev->base_addr;
        if (!ioaddr) {
-               BUGMSG(D_NORMAL, "No autoprobe (yet) for IO mapped cards; you "
-                      "must specify the base address!\n");
+               BUGMSG(D_NORMAL, "No autoprobe (yet) for IO mapped cards; you must specify the base address!\n");
                return -ENODEV;
        }
        if (!request_region(ioaddr, ARCNET_TOTAL_SIZE, "arcnet (COM20020)")) {

diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c
index 11d2d0b4ccea8ae7820d8938c5d26ceeb5291112..1742fa7c1e89e67e772091e1a3a447255b634ad5 100644 (file)
--- a/drivers/net/arcnet/com90io.c
+++ b/drivers/net/arcnet/com90io.c
@@ -150,8 +150,7 @@ static int __init com90io_probe(struct net_device *dev)
        BUGLVL(D_NORMAL) printk("E-mail me if you actually test this driver, please!\n");
 
        if (!ioaddr) {
-               BUGMSG(D_NORMAL, "No autoprobe for IO mapped cards; you "
-                      "must specify the base address!\n");
+               BUGMSG(D_NORMAL, "No autoprobe for IO mapped cards; you must specify the base address!\n");
                return -ENODEV;
        }
        if (!request_region(ioaddr, ARCNET_TOTAL_SIZE, "com90io probe")) {
@@ -192,8 +191,8 @@ static int __init com90io_probe(struct net_device *dev)
        outb(0, _ADDR_LO);
 
        if ((status = inb(_MEMDATA)) != 0xd1) {
-               BUGMSG(D_INIT_REASONS, "Signature byte not found"
-                      " (%Xh instead).\n", status);
+               BUGMSG(D_INIT_REASONS, "Signature byte not found (%Xh instead).\n",
+                      status);
                goto err_out;
        }
        if (!dev->irq) {

diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c
index c16bfde97fbe26af6577023a430a88b22cd049cd..2e2908435f818f81f7a7c1b3f1fe888a83cad3ae 100644 (file)
--- a/drivers/net/arcnet/com90xx.c
+++ b/drivers/net/arcnet/com90xx.c
@@ -525,8 +525,7 @@ static int __init com90xx_found(int ioaddr, int airq, u_long shmem, void __iomem
 
        dev->base_addr = ioaddr;
 
-       BUGMSG(D_NORMAL, "COM90xx station %02Xh found at %03lXh, IRQ %d, "
-              "ShMem %lXh (%ld*%xh).\n",
+       BUGMSG(D_NORMAL, "COM90xx station %02Xh found at %03lXh, IRQ %d, ShMem %lXh (%ld*%xh).\n",
               dev->dev_addr[0],
               dev->base_addr, dev->irq, dev->mem_start,
         (dev->mem_end - dev->mem_start + 1) / mirror_size, mirror_size);

diff --git a/drivers/net/arcnet/rfc1201.c b/drivers/net/arcnet/rfc1201.c
index 4abb20e26eadc8b28fce61d5531b5eef6000df36..47750173fd14300b06d7cee04193313d21ec22eb 100644 (file)
--- a/drivers/net/arcnet/rfc1201.c
+++ b/drivers/net/arcnet/rfc1201.c
@@ -261,8 +261,7 @@ static void rx(struct net_device *dev, int bufnum,
                        BUGMSG(D_RX, "brand new splitpacket (splitflag=%d)\n",
                               soft->split_flag);
                        if (in->skb) {  /* already assembling one! */
-                               BUGMSG(D_EXTRA, "aborting previous (seq=%d) assembly "
-                                      "(splitflag=%d, seq=%d)\n",
+                               BUGMSG(D_EXTRA, "aborting previous (seq=%d) assembly (splitflag=%d, seq=%d)\n",
                                       in->sequence, soft->split_flag,
                                       soft->sequence);
                                dev->stats.rx_errors++;
@@ -306,8 +305,7 @@ static void rx(struct net_device *dev, int bufnum,
                         */
                        if (!in->skb) {
                                if (lp->rfc1201.aborted_seq != soft->sequence) {
-                                       BUGMSG(D_EXTRA, "can't continue split without starting "
-                                              "first! (splitflag=%d, seq=%d, aborted=%d)\n",
+                                       BUGMSG(D_EXTRA, "can't continue split without starting first! (splitflag=%d, seq=%d, aborted=%d)\n",
                                        soft->split_flag, soft->sequence,
                                               lp->rfc1201.aborted_seq);
                                        dev->stats.rx_errors++;
@@ -326,8 +324,7 @@ static void rx(struct net_device *dev, int bufnum,
                                        return;
                                }
                                /* "bad" duplicate, kill reassembly */
-                               BUGMSG(D_EXTRA, "out-of-order splitpacket, reassembly "
-                                      "(seq=%d) aborted (splitflag=%d, seq=%d)\n",
+                               BUGMSG(D_EXTRA, "out-of-order splitpacket, reassembly (seq=%d) aborted (splitflag=%d, seq=%d)\n",
                                       in->sequence, soft->split_flag, soft->sequence);
                                lp->rfc1201.aborted_seq = soft->sequence;
                                dev_kfree_skb_irq(in->skb);
@@ -487,8 +484,8 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
                out->numsegs = (out->dataleft + maxsegsize - 1) / maxsegsize;
                out->segnum = 0;
 
-               BUGMSG(D_DURING, "rfc1201 prep_tx: ready for %d-segment split "
-                      "(%d bytes, seq=%d)\n", out->numsegs, out->length,
+               BUGMSG(D_DURING, "rfc1201 prep_tx: ready for %d-segment split (%d bytes, seq=%d)\n",
+                      out->numsegs, out->length,
                       pkt->soft.rfc1201.sequence);
 
                return 0;       /* not done */