[PATCH] Update pcips2 driver

[PATCH] Update pcips2 driver

[Russell King]

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

Re: [PATCH] Update pcips2 driver

[Andrew Morton]

Russell King <rmk+lkml@arm.linux.org.uk> wrote:
>
> Use pci_request_regions()/pci_release_regions() instead of
> request_region()/release_region()

Some of this patch is already in Vojtech's tree.  If it's not critical,
perhaps it would be best if he took the remaining bit:


From: Russell King <rmk+lkml@arm.linux.org.uk>

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: Andrew Morton <akpm@osdl.org>
---

 25-akpm/./drivers/input/serio/pcips2.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff -puN ./drivers/input/serio/pcips2.c~update-pcips2-driver ./drivers/input/serio/pcips2.c
--- 25/./drivers/input/serio/pcips2.c~update-pcips2-driver	Mon Jul 12 13:25:01 2004
+++ 25-akpm/./drivers/input/serio/pcips2.c	Mon Jul 12 13:25:01 2004
@@ -134,13 +134,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);
 	serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
_

Re: [PATCH] Update pcips2 driver

[Russell King]

On Mon, Jul 12, 2004 at 01:25:25PM -0700, Andrew Morton wrote:
> Russell King <rmk+lkml@arm.linux.org.uk> wrote:
> >
> > Use pci_request_regions()/pci_release_regions() instead of
> > request_region()/release_region()
> 
> Some of this patch is already in Vojtech's tree.  If it's not critical,
> perhaps it would be best if he took the remaining bit:

Looking at the bits in the 2.6.7-mm7 tree, none of my original patch
is merged, and merging the bit below would mean that we then have an
asymetry between the function used to request the resources and the
function used to release them.

Therefore, I think the original patch should stand as-is.

-- 
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

Re: [PATCH] Update pcips2 driver

[Vojtech Pavlik]

On Mon, Jul 12, 2004 at 10:55:50PM +0100, Russell King wrote:
> On Mon, Jul 12, 2004 at 01:25:25PM -0700, Andrew Morton wrote:
> > Russell King <rmk+lkml@arm.linux.org.uk> wrote:
> > >
> > > Use pci_request_regions()/pci_release_regions() instead of
> > > request_region()/release_region()
> > 
> > Some of this patch is already in Vojtech's tree.  If it's not critical,
> > perhaps it would be best if he took the remaining bit:
> 
> Looking at the bits in the 2.6.7-mm7 tree, none of my original patch
> is merged, and merging the bit below would mean that we then have an
> asymetry between the function used to request the resources and the
> function used to release them.
> 
> Therefore, I think the original patch should stand as-is.
 
I don't seem to have the bigger patch in my mailbox. Can you resend it?
Thanks.

-- 
Vojtech Pavlik
SuSE Labs, SuSE CR