From: Scott Thompson Date: Fri, 24 Aug 2007 18:49:45 +0000 Subject: [PATCH] /drivers/char sx.c ioremap -> pci_ioremap api Message-Id: <46CF2849.2090008@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, jirislaby@gmail.com patchset against 2.6.23-rc3. moves the iomap/iounmap call to pci 'flavor'. this was a recommendation from a previously submitted patch that handles the unchecked iomap (or, now, pci_iomap) return code. Signed-off-by: Scott Thompson hushmail.com> ---------------------------------------------------------- diff --git a/drivers/char/sx.c b/drivers/char/sx.c index 85a2328..481334f 100644 --- a/drivers/char/sx.c +++ b/drivers/char/sx.c @@ -2626,14 +2626,14 @@ static void __devinit fix_sx_pci(struct pci_dev *pdev, struct sx_board *board) pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &hwbase); hwbase &= PCI_BASE_ADDRESS_MEM_MASK; - rebase = ioremap(hwbase, 0x80); + rebase = pci_iomap(pdev, 0, 0x80); t = readl(rebase + CNTRL_REG_OFFSET); if (t != CNTRL_REG_GOODVALUE) { printk(KERN_DEBUG "sx: performing cntrl reg fix: %08x -> " "%08x\n", t, CNTRL_REG_GOODVALUE); writel(CNTRL_REG_GOODVALUE, rebase + CNTRL_REG_OFFSET); } - iounmap(rebase); + pci_iounmap(pdev, rebase); } #endif