diff options
| author | Russell King <rmk@arm.linux.org.uk> | 2004-08-12 18:56:02 +0200 |
|---|---|---|
| committer | Vojtech Pavlik <vojtech@suse.cz> | 2004-08-12 18:56:02 +0200 |
| commit | f780670b8813e171b37ebda17fe95ef07efc5554 (patch) | |
| tree | c2d2648d80b5c2a63b8bfbed9702f217a7c2e79d /drivers/input | |
| parent | 7aac362649a470eb176f2678406966c8281aad7a (diff) | |
input: Update pcips2 driver
Use pci_request_regions()/pci_release_regions() instead of
request_region()/release_region()
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/serio/pcips2.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/input/serio/pcips2.c b/drivers/input/serio/pcips2.c index 610f94a18348..489749e7c9d0 100644 --- a/drivers/input/serio/pcips2.c +++ b/drivers/input/serio/pcips2.c @@ -134,13 +134,11 @@ static int __devinit pcips2_probe(struct pci_dev *dev, const struct pci_device_i ret = pci_enable_device(dev); if (ret) - return ret; + goto out; - if (!request_region(pci_resource_start(dev, 0), - pci_resource_len(dev, 0), "pcips2")) { - ret = -EBUSY; + ret = pci_request_regions(dev, "pcips2"); + if (ret) goto disable; - } ps2if = kmalloc(sizeof(struct pcips2_data), GFP_KERNEL); serio = kmalloc(sizeof(struct serio), GFP_KERNEL); @@ -172,10 +170,10 @@ static int __devinit pcips2_probe(struct pci_dev *dev, const struct pci_device_i release: kfree(ps2if); kfree(serio); - release_region(pci_resource_start(dev, 0), - pci_resource_len(dev, 0)); + pci_release_regions(dev); disable: pci_disable_device(dev); + out: return ret; } @@ -184,10 +182,9 @@ static void __devexit pcips2_remove(struct pci_dev *dev) struct pcips2_data *ps2if = pci_get_drvdata(dev); serio_unregister_port(ps2if->io); - release_region(pci_resource_start(dev, 0), - pci_resource_len(dev, 0)); pci_set_drvdata(dev, NULL); kfree(ps2if); + pci_release_regions(dev); pci_disable_device(dev); } |