generic_hdlc: Update to current logging forms

Use pr_fmt, pr_<level> and netdev_<level> as appropriate.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 14 insertions, 15 deletions

diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index fd7375955e41..1ce21163c776 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -14,6 +14,8 @@
  *    PLX Technology Inc. PCI9052 Data Book
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/capability.h>
@@ -297,7 +299,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
 
         card = kzalloc(sizeof(card_t), GFP_KERNEL);
         if (card == NULL) {
-                printk(KERN_ERR "pci200syn: unable to allocate memory\n");
+                pr_err("unable to allocate memory\n");
                 pci_release_regions(pdev);
                 pci_disable_device(pdev);
                 return -ENOBUFS;
@@ -306,7 +308,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
         card->ports[0].netdev = alloc_hdlcdev(&card->ports[0]);
         card->ports[1].netdev = alloc_hdlcdev(&card->ports[1]);
         if (!card->ports[0].netdev || !card->ports[1].netdev) {
-                printk(KERN_ERR "pci200syn: unable to allocate memory\n");
+                pr_err("unable to allocate memory\n");
                 pci200_pci_remove_one(pdev);
                 return -ENOMEM;
         }
@@ -314,7 +316,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
         if (pci_resource_len(pdev, 0) != PCI200SYN_PLX_SIZE ||
             pci_resource_len(pdev, 2) != PCI200SYN_SCA_SIZE ||
             pci_resource_len(pdev, 3) < 16384) {
-                printk(KERN_ERR "pci200syn: invalid card EEPROM parameters\n");
+                pr_err("invalid card EEPROM parameters\n");
                 pci200_pci_remove_one(pdev);
                 return -EFAULT;
         }
@@ -331,7 +333,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
         if (card->plxbase == NULL ||
             card->scabase == NULL ||
             card->rambase == NULL) {
-                printk(KERN_ERR "pci200syn: ioremap() failed\n");
+                pr_err("ioremap() failed\n");
                 pci200_pci_remove_one(pdev);
                 return -EFAULT;
         }
@@ -357,12 +359,12 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
         card->buff_offset = 2 * sizeof(pkt_desc) * (card->tx_ring_buffers +
                                                     card->rx_ring_buffers);
 
-        printk(KERN_INFO "pci200syn: %u KB RAM at 0x%x, IRQ%u, using %u TX +"
-               " %u RX packets rings\n", ramsize / 1024, ramphys,
-               pdev->irq, card->tx_ring_buffers, card->rx_ring_buffers);
+        pr_info("%u KB RAM at 0x%x, IRQ%u, using %u TX + %u RX packets rings\n",
+                ramsize / 1024, ramphys,
+                pdev->irq, card->tx_ring_buffers, card->rx_ring_buffers);
 
         if (card->tx_ring_buffers < 1) {
-                printk(KERN_ERR "pci200syn: RAM test failed\n");
+                pr_err("RAM test failed\n");
                 pci200_pci_remove_one(pdev);
                 return -EFAULT;
         }
@@ -373,8 +375,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
 
         /* Allocate IRQ */
         if (request_irq(pdev->irq, sca_intr, IRQF_SHARED, "pci200syn", card)) {
-                printk(KERN_WARNING "pci200syn: could not allocate IRQ%d.\n",
-                       pdev->irq);
+                pr_warn("could not allocate IRQ%d\n", pdev->irq);
                 pci200_pci_remove_one(pdev);
                 return -EBUSY;
         }
@@ -400,15 +401,13 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
                 port->card = card;
                 sca_init_port(port);
                 if (register_hdlc_device(dev)) {
-                        printk(KERN_ERR "pci200syn: unable to register hdlc "
-                               "device\n");
+                        pr_err("unable to register hdlc device\n");
                         port->card = NULL;
                         pci200_pci_remove_one(pdev);
                         return -ENOBUFS;
                 }
 
-                printk(KERN_INFO "%s: PCI200SYN channel %d\n",
-                       dev->name, port->chan);
+                netdev_info(dev, "PCI200SYN channel %d\n", port->chan);
         }
 
         sca_flush(card);
@@ -435,7 +434,7 @@ static struct pci_driver pci200_pci_driver = {
 static int __init pci200_init_module(void)
 {
         if (pci_clock_freq < 1000000 || pci_clock_freq > 80000000) {
-                printk(KERN_ERR "pci200syn: Invalid PCI clock frequency\n");
+                pr_err("Invalid PCI clock frequency\n");
                 return -EINVAL;
         }
         return pci_register_driver(&pci200_pci_driver);