|
@@ -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");
|
|
@@ -29,10 +27,10 @@ unsigned long scx200_gpio_shadow[2];
|
|
|
unsigned scx200_cb_base = 0;
|
|
|
|
|
|
static struct pci_device_id scx200_tbl[] = {
|
|
|
- { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE) },
|
|
|
- { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE) },
|
|
|
- { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_XBUS) },
|
|
|
- { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_XBUS) },
|
|
|
+ { PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE) },
|
|
|
+ { PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE) },
|
|
|
+ { PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_SCx200_XBUS) },
|
|
|
+ { PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_SC1100_XBUS) },
|
|
|
{ },
|
|
|
};
|
|
|
MODULE_DEVICE_TABLE(pci,scx200_tbl);
|
|
@@ -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);
|
|
|
}
|
|
|
|