libertas: Convert lbs_pr_<level> to pr_<level>

Use the standard pr_<level> functions eases grep a bit.

Added a few missing terminating newlines to messages.
Coalesced long formats.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 27 insertions, 25 deletions

diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index 4dfd48fe8b6..f2d10115f5e 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -21,6 +21,8 @@
 
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
@@ -362,7 +364,7 @@ static int if_cs_send_cmd(struct lbs_private *priv, u8 *buf, u16 nb)
                 if (status & IF_CS_BIT_COMMAND)
                         break;
                 if (++loops > 100) {
-                        lbs_pr_err("card not ready for commands\n");
+                        pr_err("card not ready for commands\n");
                         goto done;
                 }
                 mdelay(1);
@@ -432,14 +434,14 @@ static int if_cs_receive_cmdres(struct lbs_private *priv, u8 *data, u32 *len)
         /* is hardware ready? */
         status = if_cs_read16(priv->card, IF_CS_CARD_STATUS);
         if ((status & IF_CS_BIT_RESP) == 0) {
-                lbs_pr_err("no cmd response in card\n");
+                pr_err("no cmd response in card\n");
                 *len = 0;
                 goto out;
         }
 
         *len = if_cs_read16(priv->card, IF_CS_RESP_LEN);
         if ((*len == 0) || (*len > LBS_CMD_BUFFER_SIZE)) {
-                lbs_pr_err("card cmd buffer has invalid # of bytes (%d)\n", *len);
+                pr_err("card cmd buffer has invalid # of bytes (%d)\n", *len);
                 goto out;
         }
 
@@ -473,7 +475,7 @@ static struct sk_buff *if_cs_receive_data(struct lbs_private *priv)
 
         len = if_cs_read16(priv->card, IF_CS_READ_LEN);
         if (len == 0 || len > MRVDRV_ETH_RX_PACKET_BUFFER_SIZE) {
-                lbs_pr_err("card data buffer has invalid # of bytes (%d)\n", len);
+                pr_err("card data buffer has invalid # of bytes (%d)\n", len);
                 priv->dev->stats.rx_dropped++;
                 goto dat_err;
         }
@@ -653,8 +655,8 @@ static int if_cs_prog_helper(struct if_cs_card *card, const struct firmware *fw)
                 ret = if_cs_poll_while_fw_download(card, IF_CS_CARD_STATUS,
                         IF_CS_BIT_COMMAND);
                 if (ret < 0) {
-                        lbs_pr_err("can't download helper at 0x%x, ret %d\n",
-                                sent, ret);
+                        pr_err("can't download helper at 0x%x, ret %d\n",
+                               sent, ret);
                         goto done;
                 }
 
@@ -684,7 +686,7 @@ static int if_cs_prog_real(struct if_cs_card *card, const struct firmware *fw)
         ret = if_cs_poll_while_fw_download(card, IF_CS_SQ_READ_LOW,
                 IF_CS_SQ_HELPER_OK);
         if (ret < 0) {
-                lbs_pr_err("helper firmware doesn't answer\n");
+                pr_err("helper firmware doesn't answer\n");
                 goto done;
         }
 
@@ -692,13 +694,13 @@ static int if_cs_prog_real(struct if_cs_card *card, const struct firmware *fw)
                 len = if_cs_read16(card, IF_CS_SQ_READ_LOW);
                 if (len & 1) {
                         retry++;
-                        lbs_pr_info("odd, need to retry this firmware block\n");
+                        pr_info("odd, need to retry this firmware block\n");
                 } else {
                         retry = 0;
                 }
 
                 if (retry > 20) {
-                        lbs_pr_err("could not download firmware\n");
+                        pr_err("could not download firmware\n");
                         ret = -ENODEV;
                         goto done;
                 }
@@ -718,14 +720,14 @@ static int if_cs_prog_real(struct if_cs_card *card, const struct firmware *fw)
                 ret = if_cs_poll_while_fw_download(card, IF_CS_CARD_STATUS,
                         IF_CS_BIT_COMMAND);
                 if (ret < 0) {
-                        lbs_pr_err("can't download firmware at 0x%x\n", sent);
+                        pr_err("can't download firmware at 0x%x\n", sent);
                         goto done;
                 }
         }
 
         ret = if_cs_poll_while_fw_download(card, IF_CS_SCRATCH, 0x5a);
         if (ret < 0)
-                lbs_pr_err("firmware download failed\n");
+                pr_err("firmware download failed\n");
 
 done:
         lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret);
@@ -759,7 +761,7 @@ static int if_cs_host_to_card(struct lbs_private *priv,
                 ret = if_cs_send_cmd(priv, buf, nb);
                 break;
         default:
-                lbs_pr_err("%s: unsupported type %d\n", __func__, type);
+                pr_err("%s: unsupported type %d\n", __func__, type);
         }
 
         lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret);
@@ -788,7 +790,7 @@ static int if_cs_ioprobe(struct pcmcia_device *p_dev, void *priv_data)
         p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
 
         if (p_dev->resource[1]->end) {
-                lbs_pr_err("wrong CIS (check number of IO windows)\n");
+                pr_err("wrong CIS (check number of IO windows)\n");
                 return -ENODEV;
         }
 
@@ -809,7 +811,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
 
         card = kzalloc(sizeof(struct if_cs_card), GFP_KERNEL);
         if (!card) {
-                lbs_pr_err("error in kzalloc\n");
+                pr_err("error in kzalloc\n");
                 goto out;
         }
         card->p_dev = p_dev;
@@ -818,7 +820,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
         p_dev->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
 
         if (pcmcia_loop_config(p_dev, if_cs_ioprobe, NULL)) {
-                lbs_pr_err("error in pcmcia_loop_config\n");
+                pr_err("error in pcmcia_loop_config\n");
                 goto out1;
         }
 
@@ -834,14 +836,14 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
         card->iobase = ioport_map(p_dev->resource[0]->start,
                                 resource_size(p_dev->resource[0]));
         if (!card->iobase) {
-                lbs_pr_err("error in ioport_map\n");
+                pr_err("error in ioport_map\n");
                 ret = -EIO;
                 goto out1;
         }
 
         ret = pcmcia_enable_device(p_dev);
         if (ret) {
-                lbs_pr_err("error in pcmcia_enable_device\n");
+                pr_err("error in pcmcia_enable_device\n");
                 goto out2;
         }
 
@@ -856,8 +858,8 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
 
         card->model = get_model(p_dev->manf_id, p_dev->card_id);
         if (card->model == MODEL_UNKNOWN) {
-                lbs_pr_err("unsupported manf_id 0x%04x / card_id 0x%04x\n",
-                           p_dev->manf_id, p_dev->card_id);
+                pr_err("unsupported manf_id 0x%04x / card_id 0x%04x\n",
+                       p_dev->manf_id, p_dev->card_id);
                 goto out2;
         }
 
@@ -866,20 +868,20 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
         if (card->model == MODEL_8305) {
                 card->align_regs = 1;
                 if (prod_id < IF_CS_CF8305_B1_REV) {
-                        lbs_pr_err("8305 rev B0 and older are not supported\n");
+                        pr_err("8305 rev B0 and older are not supported\n");
                         ret = -ENODEV;
                         goto out2;
                 }
         }
 
         if ((card->model == MODEL_8381) && prod_id < IF_CS_CF8381_B3_REV) {
-                lbs_pr_err("8381 rev B2 and older are not supported\n");
+                pr_err("8381 rev B2 and older are not supported\n");
                 ret = -ENODEV;
                 goto out2;
         }
 
         if ((card->model == MODEL_8385) && prod_id < IF_CS_CF8385_B1_REV) {
-                lbs_pr_err("8385 rev B0 and older are not supported\n");
+                pr_err("8385 rev B0 and older are not supported\n");
                 ret = -ENODEV;
                 goto out2;
         }
@@ -887,7 +889,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
         ret = lbs_get_firmware(&p_dev->dev, NULL, NULL, card->model,
                                 &fw_table[0], &helper, &mainfw);
         if (ret) {
-                lbs_pr_err("failed to find firmware (%d)\n", ret);
+                pr_err("failed to find firmware (%d)\n", ret);
                 goto out2;
         }
 
@@ -918,7 +920,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
         ret = request_irq(p_dev->irq, if_cs_interrupt,
                 IRQF_SHARED, DRV_NAME, card);
         if (ret) {
-                lbs_pr_err("error in request_irq\n");
+                pr_err("error in request_irq\n");
                 goto out3;
         }
 
@@ -931,7 +933,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
 
         /* And finally bring the card up */
         if (lbs_start_card(priv) != 0) {
-                lbs_pr_err("could not activate card\n");
+                pr_err("could not activate card\n");
                 goto out3;
         }