From: Alan Cox <alan@redhat.com>
To: torvalds@osdl.org, linux-kernel@vger.kernel.org,
linux-serial@vger.kernel.org
Subject: [PATCH 14/27] Char: cyclades. remove bogus iomap
Date: Fri, 10 Oct 2008 11:49:46 +0100 [thread overview]
Message-ID: <20081010104941.31597.64869.stgit@localhost.localdomain> (raw)
In-Reply-To: <20081010103447.31597.42992.stgit@localhost.localdomain>
From: Jiri Slaby <jirislaby@gmail.com>
readl/writel are not expected to accept iomap return value. Replace
bogus mapping by standard ioremap.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alan Cox <alan@redhat.com>
---
drivers/char/cyclades.c | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index fe6d774..5e5b1dc 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -4993,12 +4993,14 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) {
card_name = "Cyclom-Y";
- addr0 = pci_iomap(pdev, 0, CyPCI_Yctl);
+ addr0 = ioremap_nocache(pci_resource_start(pdev, 0),
+ CyPCI_Yctl);
if (addr0 == NULL) {
dev_err(&pdev->dev, "can't remap ctl region\n");
goto err_reg;
}
- addr2 = pci_iomap(pdev, 2, CyPCI_Ywin);
+ addr2 = ioremap_nocache(pci_resource_start(pdev, 2),
+ CyPCI_Ywin);
if (addr2 == NULL) {
dev_err(&pdev->dev, "can't remap base region\n");
goto err_unmap;
@@ -5013,7 +5015,8 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
} else if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Hi) {
struct RUNTIME_9060 __iomem *ctl_addr;
- ctl_addr = addr0 = pci_iomap(pdev, 0, CyPCI_Zctl);
+ ctl_addr = addr0 = ioremap_nocache(pci_resource_start(pdev, 0),
+ CyPCI_Zctl);
if (addr0 == NULL) {
dev_err(&pdev->dev, "can't remap ctl region\n");
goto err_reg;
@@ -5026,8 +5029,8 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
mailbox = (u32)readl(&ctl_addr->mail_box_0);
- addr2 = pci_iomap(pdev, 2, mailbox == ZE_V1 ?
- CyPCI_Ze_win : CyPCI_Zwin);
+ addr2 = ioremap_nocache(pci_resource_start(pdev, 2),
+ mailbox == ZE_V1 ? CyPCI_Ze_win : CyPCI_Zwin);
if (addr2 == NULL) {
dev_err(&pdev->dev, "can't remap base region\n");
goto err_unmap;
@@ -5159,9 +5162,9 @@ err_null:
cy_card[card_no].base_addr = NULL;
free_irq(irq, &cy_card[card_no]);
err_unmap:
- pci_iounmap(pdev, addr0);
+ iounmap(addr0);
if (addr2)
- pci_iounmap(pdev, addr2);
+ iounmap(addr2);
err_reg:
pci_release_regions(pdev);
err_dis:
@@ -5186,9 +5189,9 @@ static void __devexit cy_pci_remove(struct pci_dev *pdev)
cy_writew(cinfo->ctl_addr + 0x68,
readw(cinfo->ctl_addr + 0x68) & ~0x0900);
- pci_iounmap(pdev, cinfo->base_addr);
+ iounmap(cinfo->base_addr);
if (cinfo->ctl_addr)
- pci_iounmap(pdev, cinfo->ctl_addr);
+ iounmap(cinfo->ctl_addr);
if (cinfo->irq
#ifndef CONFIG_CYZ_INTR
&& !IS_CYC_Z(*cinfo)
next prev parent reply other threads:[~2008-10-10 10:49 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-10 10:36 [PATCH 00/27] First block of the tty backlog Alan Cox
2008-10-10 10:36 ` [PATCH 01/27] drivers/serial/crisv10.c: add missing put_tty_driver Alan Cox
2008-10-10 10:36 ` [PATCH 02/27] drivers/char/hvc_console.c: adjust call to put_tty_driver Alan Cox
2008-10-10 10:36 ` [PATCH 03/27] coldfire: scheduled SERIAL_COLDFIRE removal Alan Cox
2008-10-10 10:37 ` [PATCH 04/27] epca: call tty_port_init Alan Cox
2008-10-10 10:48 ` [PATCH 05/27] Blackfin Serial Driver: use __initdata for data, not __init Alan Cox
2008-10-10 10:48 ` [PATCH 06/27] Blackfin Serial Driver: Fix bug - should suspend/resume/remove all uart ports Alan Cox
2008-10-10 10:48 ` [PATCH 07/27] Blackfin Serial Driver: trim trailing whitespace -- no functional changes Alan Cox
2008-10-10 10:48 ` [PATCH 08/27] Blackfin Serial Driver: move common variables out of serial headers and into the serial driver Alan Cox
2008-10-10 10:48 ` [PATCH 09/27] Blackfin Serial Driver: Remove useless stop Alan Cox
2008-10-10 10:49 ` [PATCH 10/27] Blackfin Serial Driver: Fix bug - Don't call tx_stop in tx_transfer Alan Cox
2008-10-10 10:49 ` [PATCH 11/27] Blackfin Serial Driver: Fix bug - ircp fails on sir over Blackfin UART Alan Cox
2008-10-10 10:49 ` [PATCH 12/27] Blackfin Serial Driver: Fix bug - request UART2/3 peripheral mapped interrupts in PIO mode Alan Cox
2008-10-10 10:49 ` [PATCH 13/27] Fix oti6858 debug level Alan Cox
2008-10-10 10:49 ` Alan Cox [this message]
2008-10-10 10:49 ` [PATCH 15/27] Char: sx, fix io unmapping Alan Cox
2008-10-10 10:50 ` [PATCH 16/27] Char: merge ip2main and ip2base Alan Cox
2008-10-10 10:50 ` [PATCH 17/27] ip2, cleanup globals Alan Cox
2008-10-10 10:50 ` [PATCH 18/27] ip2, fix sparse warnings Alan Cox
2008-10-10 10:50 ` [PATCH 19/27] ip2, init/deinit cleanup Alan Cox
2008-10-10 10:50 ` [PATCH 20/27] ip2: avoid add_timer with pending timer Alan Cox
2008-10-10 10:50 ` [PATCH 21/27] audit: Handle embedded NUL in TTY input auditing Alan Cox
2008-10-10 10:50 ` [PATCH 22/27] serial: Make uart_port's ioport "unsigned long" Alan Cox
2008-10-10 12:54 ` Josh Boyer
2008-10-10 16:19 ` David Miller
2008-10-10 10:51 ` [PATCH 23/27] nozomi: Fix close on error Alan Cox
2008-10-10 10:51 ` [PATCH 24/27] serial-make-uart_ports-ioport-unsigned-long-fix Alan Cox
2008-10-10 10:51 ` [PATCH 25/27] usb: fix pl2303 initialization Alan Cox
2008-10-10 10:51 ` [PATCH 26/27] ftdi: A few errors are err() that should be debug which causes much spewage Alan Cox
2008-10-10 10:52 ` [PATCH 27/27] serial_8250: pci_enable_device fail is not fully handled Alan Cox
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=20081010104941.31597.64869.stgit@localhost.localdomain \
--to=alan@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=torvalds@osdl.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