From: Jiri Slaby <jirislaby@gmail.com>
Date: Fri, 8 Dec 2006 10:38:53 +0000 (-0800)
Subject: [PATCH] Char: isicom, use pci_request_region
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=78028da91e05146c9ce0c9db2fea53e0cded1e81;p=linux-beck.git

[PATCH] Char: isicom, use pci_request_region

Use pci_request_region in pci probing function instead of request_region.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 604882dac2d2..91b978445229 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -1789,7 +1789,8 @@ static int __devinit isicom_probe(struct pci_dev *pdev,
 
 	pci_set_drvdata(pdev, board);
 
-	if (!request_region(board->base, 16, ISICOM_NAME)) {
+	retval = pci_request_region(pdev, 3, ISICOM_NAME);
+	if (retval) {
 		dev_err(&pdev->dev, "I/O Region 0x%lx-0x%lx is busy. Card%d "
 			"will be disabled.\n", board->base, board->base + 15,
 			index + 1);
@@ -1822,7 +1823,7 @@ static int __devinit isicom_probe(struct pci_dev *pdev,
 errunri:
 	free_irq(board->irq, board);
 errunrr:
-	release_region(board->base, 16);
+	pci_release_region(pdev, 3);
 err:
 	board->base = 0;
 	return retval;
@@ -1837,7 +1838,7 @@ static void __devexit isicom_remove(struct pci_dev *pdev)
 		tty_unregister_device(isicom_normal, board->index * 16 + i);
 
 	free_irq(board->irq, board);
-	release_region(board->base, 16);
+	pci_release_region(pdev, 3);
 }
 
 static int __init isicom_init(void)