[PATCH 6/7] Char: isicom, use pci_request_region

[Jiri Slaby]

isicom, use pci_request_region

Use pci_request_region in pci probing function instead of request_region.

Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>

---
commit b298d99f4a779fb54b0035f0f870d5247b13b269
tree 4a7e9a76cc286a126cea5079ef3d405f7fda6436
parent 780d1e45bab78cb6cc6c79037bfe0986bc999332
author Jiri Slaby <jirislaby@xxxxxxxxx> Thu, 19 Oct 2006 19:45:18 +0200
committer Jiri Slaby <jirislaby@xxxxxxxxx> Thu, 19 Oct 2006 19:45:18 +0200

 drivers/char/isicom.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index f07226a..2f5be09 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -1788,7 +1788,8 @@ static int __devinit isicom_probe(struct
 
 	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);
@@ -1821,7 +1822,7 @@ static int __devinit isicom_probe(struct
 errunri:
 	free_irq(board->irq, board);
 errunrr:
-	release_region(board->base, 16);
+	pci_release_region(pdev, 3);
 err:
 	board->base = 0;
 	return retval;
@@ -1836,7 +1837,7 @@ static void __devexit isicom_remove(stru
 		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)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/