generic_hdlc: Update to current logging forms

[pandora-kernel.git] / drivers / net / wan / pc300too.c

diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
index c7ab3be..c49c1b3 100644 (file)
--- a/drivers/net/wan/pc300too.c
+++ b/drivers/net/wan/pc300too.c
@@ -17,6 +17,8 @@
  * PC300/X21 cards.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -318,7 +320,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
 
        card = kzalloc(sizeof(card_t), GFP_KERNEL);
        if (card == NULL) {
-               printk(KERN_ERR "pc300: unable to allocate memory\n");
+               pr_err("unable to allocate memory\n");
                pci_release_regions(pdev);
                pci_disable_device(pdev);
                return -ENOBUFS;
@@ -328,7 +330,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
        if (pci_resource_len(pdev, 0) != PC300_PLX_SIZE ||
            pci_resource_len(pdev, 2) != PC300_SCA_SIZE ||
            pci_resource_len(pdev, 3) < 16384) {
-               printk(KERN_ERR "pc300: invalid card EEPROM parameters\n");
+               pr_err("invalid card EEPROM parameters\n");
                pc300_pci_remove_one(pdev);
                return -EFAULT;
        }
@@ -345,7 +347,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
        if (card->plxbase == NULL ||
            card->scabase == NULL ||
            card->rambase == NULL) {
-               printk(KERN_ERR "pc300: ioremap() failed\n");
+               pr_err("ioremap() failed\n");
                pc300_pci_remove_one(pdev);
        }
 
@@ -370,7 +372,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
 
        for (i = 0; i < card->n_ports; i++)
                if (!(card->ports[i].netdev = alloc_hdlcdev(&card->ports[i]))) {
-                       printk(KERN_ERR "pc300: unable to allocate memory\n");
+                       pr_err("unable to allocate memory\n");
                        pc300_pci_remove_one(pdev);
                        return -ENOMEM;
                }
@@ -411,15 +413,14 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
        card->buff_offset = card->n_ports * sizeof(pkt_desc) *
                (card->tx_ring_buffers + card->rx_ring_buffers);
 
-       printk(KERN_INFO "pc300: PC300/%s, %u KB RAM at 0x%x, IRQ%u, "
-              "using %u TX + %u RX packets rings\n",
-              card->type == PC300_X21 ? "X21" :
-              card->type == PC300_TE ? "TE" : "RSV",
-              ramsize / 1024, ramphys, pdev->irq,
-              card->tx_ring_buffers, card->rx_ring_buffers);
+       pr_info("PC300/%s, %u KB RAM at 0x%x, IRQ%u, using %u TX + %u RX packets rings\n",
+               card->type == PC300_X21 ? "X21" :
+               card->type == PC300_TE ? "TE" : "RSV",
+               ramsize / 1024, ramphys, pdev->irq,
+               card->tx_ring_buffers, card->rx_ring_buffers);
 
        if (card->tx_ring_buffers < 1) {
-               printk(KERN_ERR "pc300: RAM test failed\n");
+               pr_err("RAM test failed\n");
                pc300_pci_remove_one(pdev);
                return -EFAULT;
        }
@@ -429,8 +430,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
 
        /* Allocate IRQ */
        if (request_irq(pdev->irq, sca_intr, IRQF_SHARED, "pc300", card)) {
-               printk(KERN_WARNING "pc300: could not allocate IRQ%d.\n",
-                      pdev->irq);
+               pr_warn("could not allocate IRQ%d\n", pdev->irq);
                pc300_pci_remove_one(pdev);
                return -EBUSY;
        }
@@ -466,15 +466,13 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
 
                sca_init_port(port);
                if (register_hdlc_device(dev)) {
-                       printk(KERN_ERR "pc300: unable to register hdlc "
-                              "device\n");
+                       pr_err("unable to register hdlc device\n");
                        port->card = NULL;
                        pc300_pci_remove_one(pdev);
                        return -ENOBUFS;
                }
 
-               printk(KERN_INFO "%s: PC300 channel %d\n",
-                      dev->name, port->chan);
+               netdev_info(dev, "PC300 channel %d\n", port->chan);
        }
        return 0;
 }
@@ -505,11 +503,11 @@ static struct pci_driver pc300_pci_driver = {
 static int __init pc300_init_module(void)
 {
        if (pci_clock_freq < 1000000 || pci_clock_freq > 80000000) {
-               printk(KERN_ERR "pc300: Invalid PCI clock frequency\n");
+               pr_err("Invalid PCI clock frequency\n");
                return -EINVAL;
        }
        if (use_crystal_clock != 0 && use_crystal_clock != 1) {
-               printk(KERN_ERR "pc300: Invalid 'use_crystal_clock' value\n");
+               pr_err("Invalid 'use_crystal_clock' value\n");
                return -EINVAL;
        }