]> Pileus Git - ~andy/linux/commitdiff
staging/sbe-2t3e3: Use netdev_ or dev_ or pr_ printks in module.c
authorYAMANE Toshiaki <yamanetoshi@gmail.com>
Wed, 24 Oct 2012 02:52:58 +0000 (11:52 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 Oct 2012 04:15:13 +0000 (21:15 -0700)
fixed below checkpatch warning.
- WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(...  to printk(KERN_ERR ...
- WARNING: Prefer netdev_warn(netdev, ... then dev_warn(dev, ... then pr_warn(...  to printk(KERN_WARNING ...

and add pr_fmt.

Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/sbe-2t3e3/module.c

index 8adb17816ad9c44f37388fe433d8086e0208707e..8e1a043b6b9fb4a9e11d53f9262da93858393b49 100644 (file)
@@ -10,6 +10,8 @@
  * This code is based on a driver written by SBE Inc.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
@@ -66,7 +68,7 @@ static int __devinit t3e3_init_channel(struct channel *channel, struct pci_dev *
 
        dev = alloc_hdlcdev(channel);
        if (!dev) {
-               printk(KERN_ERR "SBE 2T3E3" ": Out of memory\n");
+               pr_err("Out of memory\n");
                err = -ENOMEM;
                goto free_regions;
        }
@@ -96,7 +98,8 @@ static int __devinit t3e3_init_channel(struct channel *channel, struct pci_dev *
 
        err = request_irq(dev->irq, &t3e3_intr, IRQF_SHARED, dev->name, dev);
        if (err) {
-               printk(KERN_WARNING "%s: could not get irq: %d\n", dev->name, dev->irq);
+               netdev_warn(channel->dev, "%s: could not get irq: %d\n",
+                           dev->name, dev->irq);
                goto unregister_dev;
        }
 
@@ -144,7 +147,7 @@ static int __devinit t3e3_init_card(struct pci_dev *pdev, const struct pci_devic
                                break; /* found the second channel */
 
                if (!pdev1) {
-                       printk(KERN_ERR "SBE 2T3E3" ": Can't find the second channel\n");
+                       dev_err(&pdev->dev, "Can't find the second channel\n");
                        return -EFAULT;
                }
                channels = 2;
@@ -153,7 +156,7 @@ static int __devinit t3e3_init_card(struct pci_dev *pdev, const struct pci_devic
 
        card = kzalloc(sizeof(struct card) + channels * sizeof(struct channel), GFP_KERNEL);
        if (!card) {
-               printk(KERN_ERR "SBE 2T3E3" ": Out of memory\n");
+               dev_err(&pdev->dev, "Out of memory\n");
                return -ENOBUFS;
        }