lkml.org 
[lkml]   [2004]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] 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>

diff -up -x BitKeeper -x ChangeSet -x SCCS -x _xlk -x *.orig -x *.rej orig/./drivers/input/serio/pcips2.c linux/./drivers/input/serio/pcips2.c
--- orig/./drivers/input/serio/pcips2.c Thu Sep 4 16:37:05 2003
+++ linux/./drivers/input/serio/pcips2.c Sat Aug 23 10:10:57 2003
@@ -133,13 +133,11 @@ static int __devinit pcips2_probe(struct

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);
if (!ps2if) {
@@ -165,10 +163,10 @@ static int __devinit pcips2_probe(struct
return 0;

release:
- release_region(pci_resource_start(dev, 0),
- pci_resource_len(dev, 0));
+ pci_release_regions(dev);
disable:
pci_disable_device(dev);
+ out:
return ret;
}

@@ -177,10 +175,9 @@ static void __devexit pcips2_remove(stru
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);
}

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:04    [W:0.051 / U:0.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site