Commit 8ad95f09 authored by Jim Cromie's avatar Jim Cromie Committed by Jiri Kosina

scx200_32: replace printks with pr_<level>s

update scx200_32.c to use pr_<level>, also 2 whitespaces.
Signed-off-by: default avatarJim Cromie <jim.cromie@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 0ac25260
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
/* Verify that the configuration block really is there */ /* Verify that the configuration block really is there */
#define scx200_cb_probe(base) (inw((base) + SCx200_CBA) == (base)) #define scx200_cb_probe(base) (inw((base) + SCx200_CBA) == (base))
#define NAME "scx200"
MODULE_AUTHOR("Christer Weinigel <wingel@nano-system.com>"); MODULE_AUTHOR("Christer Weinigel <wingel@nano-system.com>");
MODULE_DESCRIPTION("NatSemi SCx200 Driver"); MODULE_DESCRIPTION("NatSemi SCx200 Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -63,10 +61,11 @@ static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_ ...@@ -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 || if (pdev->device == PCI_DEVICE_ID_NS_SCx200_BRIDGE ||
pdev->device == PCI_DEVICE_ID_NS_SC1100_BRIDGE) { pdev->device == PCI_DEVICE_ID_NS_SC1100_BRIDGE) {
base = pci_resource_start(pdev, 0); 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")) { if (!request_region(base, SCx200_GPIO_SIZE,
printk(KERN_ERR NAME ": can't allocate I/O for GPIOs\n"); "NatSemi SCx200 GPIO")) {
pr_err("can't allocate I/O for GPIOs\n");
return -EBUSY; return -EBUSY;
} }
...@@ -82,11 +81,11 @@ static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_ ...@@ -82,11 +81,11 @@ static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_
if (scx200_cb_probe(base)) { if (scx200_cb_probe(base)) {
scx200_cb_base = base; scx200_cb_base = base;
} else { } else {
printk(KERN_WARNING NAME ": Configuration Block not found\n"); pr_warn("Configuration Block not found\n");
return -ENODEV; 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; return 0;
...@@ -111,8 +110,7 @@ u32 scx200_gpio_configure(unsigned index, u32 mask, u32 bits) ...@@ -111,8 +110,7 @@ u32 scx200_gpio_configure(unsigned index, u32 mask, u32 bits)
static int __init scx200_init(void) 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); return pci_register_driver(&scx200_pci_driver);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment