- 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>
Tested-by: Oyvind Aabling <Oyvind.Aabling@uni-c.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
}
board = &moxa_boards[i];
}
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");
if (board->basemem == NULL) {
dev_err(&pdev->dev, "can't remap io space 2\n");
}
board->boardType = board_type;
}
board->boardType = board_type;
pci_set_drvdata(pdev, board);
return (0);
pci_set_drvdata(pdev, board);
return (0);
+err_reg:
+ pci_release_region(pdev, 2);
{
struct moxa_board_conf *brd = pci_get_drvdata(pdev);
{
struct moxa_board_conf *brd = pci_get_drvdata(pdev);
- pci_iounmap(pdev, brd->basemem);
+ pci_release_region(pdev, 2);
}
static struct pci_driver moxa_pci_driver = {
}
static struct pci_driver moxa_pci_driver = {