scx200_32: replace printks with pr_<level>s
authorJim Cromie <jim.cromie@gmail.com>
Wed, 1 Feb 2012 17:58:49 +0000 (10:58 -0700)
committerJiri Kosina <jkosina@suse.cz>
Fri, 3 Feb 2012 22:24:58 +0000 (23:24 +0100)
update scx200_32.c to use pr_<level>, also 2 whitespaces.

Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
arch/x86/platform/scx200/scx200_32.c

index 5dfd335ad50c9b3cb498e8a53878f38a4962cea1..7a9ad30d6c9f60b47623fcd9b9e72291e7e9a8fd 100644 (file)
@@ -17,8 +17,6 @@
 /* Verify that the configuration block really is there */
 #define scx200_cb_probe(base) (inw((base) + SCx200_CBA) == (base))
 
-#define NAME "scx200"
-
 MODULE_AUTHOR("Christer Weinigel <wingel@nano-system.com>");
 MODULE_DESCRIPTION("NatSemi SCx200 Driver");
 MODULE_LICENSE("GPL");
@@ -63,10 +61,11 @@ static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_
        if (pdev->device == PCI_DEVICE_ID_NS_SCx200_BRIDGE ||
            pdev->device == PCI_DEVICE_ID_NS_SC1100_BRIDGE) {
                base = pci_resource_start(pdev, 0);
-               printk(KERN_INFO NAME ": GPIO base 0x%x\n", base);
+               pr_info("GPIO base 0x%x\n", base);
 
-               if (!request_region(base, SCx200_GPIO_SIZE, "NatSemi SCx200 GPIO")) {
-                       printk(KERN_ERR NAME ": can't allocate I/O for GPIOs\n");
+               if (!request_region(base, SCx200_GPIO_SIZE,
+                                   "NatSemi SCx200 GPIO")) {
+                       pr_err("can't allocate I/O for GPIOs\n");
                        return -EBUSY;
                }
 
@@ -82,11 +81,11 @@ static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_
                        if (scx200_cb_probe(base)) {
                                scx200_cb_base = base;
                        } else {
-                               printk(KERN_WARNING NAME ": Configuration Block not found\n");
+                               pr_warn("Configuration Block not found\n");
                                return -ENODEV;
                        }
                }
-               printk(KERN_INFO NAME ": Configuration Block base 0x%x\n", scx200_cb_base);
+               pr_info("Configuration Block base 0x%x\n", scx200_cb_base);
        }
 
        return 0;
@@ -111,8 +110,7 @@ u32 scx200_gpio_configure(unsigned index, u32 mask, u32 bits)
 
 static int __init scx200_init(void)
 {
-       printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n");
-
+       pr_info("NatSemi SCx200 Driver\n");
        return pci_register_driver(&scx200_pci_driver);
 }