From: Jiri Slaby <jirislaby@gmail.com>
To: "Oyvind Aabling" <Oyvind.Aabling@uni-c.dk>
Cc: <linux-kernel@vger.kernel.org>, Jiri Slaby <jirislaby@gmail.com>
Subject: [RFC 3/5] Char: moxa, pci io space fixup
Date: Thu, 24 Jan 2008 10:32:43 +0100 [thread overview]
Message-ID: <1201167165-27635-3-git-send-email-jirislaby@gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0801221042270.19094@dbs1.uni-c.dtu.dk>
- request region before remapping pci io space
- use ioremap, iounmap istead of iomap interface, because we use
readX/writeX for accessing this space because of isa support
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
drivers/char/moxa.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 485dea6..ad51916 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -290,10 +290,17 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev,
}
board = &moxa_boards[i];
- board->basemem = pci_iomap(pdev, 2, 0x4000);
+
+ retval = pci_request_region(pdev, 2, "moxa-base");
+ if (retval) {
+ dev_err(&pdev->dev, "can't request pci region 2\n");
+ goto err;
+ }
+
+ board->basemem = ioremap(pci_resource_start(pdev, 2), 0x4000);
if (board->basemem == NULL) {
dev_err(&pdev->dev, "can't remap io space 2\n");
- goto err;
+ goto err_reg;
}
board->boardType = board_type;
@@ -315,6 +322,8 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev,
pci_set_drvdata(pdev, board);
return (0);
+err_reg:
+ pci_release_region(pdev, 2);
err:
return retval;
}
@@ -323,8 +332,9 @@ static void __devexit moxa_pci_remove(struct pci_dev *pdev)
{
struct moxa_board_conf *brd = pci_get_drvdata(pdev);
- pci_iounmap(pdev, brd->basemem);
+ iounmap(brd->basemem);
brd->basemem = NULL;
+ pci_release_region(pdev, 2);
}
static struct pci_driver moxa_pci_driver = {
--
1.5.3.7
next prev parent reply other threads:[~2008-01-24 9:34 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <Pine.LNX.4.64.0801202145230.18101@dbs1.uni-c.dtu.dk>
2008-01-21 22:51 ` [PATCH] drivers/char/moxa.c, kernel 2.6.23.14 Jiri Slaby
2008-01-22 10:23 ` Oyvind Aabling
2008-01-23 15:37 ` Jiri Slaby
2008-01-24 23:34 ` Oyvind Aabling
2008-01-24 23:38 ` Jiri Slaby
2008-01-24 9:32 ` [RFC 1/5] Char: moxa, remove static isa support Jiri Slaby
2008-01-24 9:32 ` [RFC 2/5] Char: moxa, cleanup module-param passed isa init Jiri Slaby
2008-01-24 9:32 ` Jiri Slaby [this message]
2008-01-24 9:32 ` [RFC 4/5] Char: moxa, fix TIOC(G/S)SOFTCAR param Jiri Slaby
2008-01-24 9:32 ` [RFC 5/5] Char: moxa, add firmware loading Jiri Slaby
2008-01-27 19:16 ` [RFC 1/6] " Jiri Slaby
2008-01-27 19:16 ` [RFC 2/6] Char: moxa, merge c2xx and c320 " Jiri Slaby
2008-01-27 19:16 ` [RFC 3/6] Char: moxa, remove port->port Jiri Slaby
2008-01-27 19:16 ` [RFC 4/6] Char: moxa, remove unused port entries Jiri Slaby
2008-01-27 19:16 ` [RFC 5/6] Char: moxa, centralize board readiness Jiri Slaby
2008-01-27 19:16 ` [RFC 6/6] Char: moxa, timer cleanup Jiri Slaby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1201167165-27635-3-git-send-email-jirislaby@gmail.com \
--to=jirislaby@gmail.com \
--cc=Oyvind.Aabling@uni-c.dk \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).