/* 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");
        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;
                }
 
                        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;
 
 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);
 }