git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
parisc
/
lba_pci.c
diff --git
a/drivers/parisc/lba_pci.c
b/drivers/parisc/lba_pci.c
index
3fe4a77
..
e8a2a4a
100644
(file)
--- a/
drivers/parisc/lba_pci.c
+++ b/
drivers/parisc/lba_pci.c
@@
-1213,7
+1213,7
@@
lba_pat_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev)
** Postable I/O port space is per PCI host adapter.
** base of 64MB PIOP region
*/
** Postable I/O port space is per PCI host adapter.
** base of 64MB PIOP region
*/
- lba_dev->iop_base = ioremap
_nocache
(p->start, 64 * 1024 * 1024);
+ lba_dev->iop_base = ioremap(p->start, 64 * 1024 * 1024);
sprintf(lba_dev->hba.io_name, "PCI%02lx Ports",
lba_dev->hba.bus_num.start);
sprintf(lba_dev->hba.io_name, "PCI%02lx Ports",
lba_dev->hba.bus_num.start);
@@
-1525,7
+1525,7
@@
lba_driver_probe(struct parisc_device *dev)
u32 func_class;
void *tmp_obj;
char *version;
u32 func_class;
void *tmp_obj;
char *version;
- void __iomem *addr = ioremap
_nocache
(dev->hpa.start, 4096);
+ void __iomem *addr = ioremap(dev->hpa.start, 4096);
/* Read HW Rev First */
func_class = READ_REG32(addr + LBA_FCLASS);
/* Read HW Rev First */
func_class = READ_REG32(addr + LBA_FCLASS);
@@
-1619,7
+1619,7
@@
lba_driver_probe(struct parisc_device *dev)
} else {
if (!astro_iop_base) {
/* Sprockets PDC uses NPIOP region */
} else {
if (!astro_iop_base) {
/* Sprockets PDC uses NPIOP region */
- astro_iop_base = ioremap
_nocache
(LBA_PORT_BASE, 64 * 1024);
+ astro_iop_base = ioremap(LBA_PORT_BASE, 64 * 1024);
pci_port = &lba_astro_port_ops;
}
pci_port = &lba_astro_port_ops;
}
@@
-1700,7
+1700,7
@@
void __init lba_init(void)
*/
void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask)
{
*/
void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask)
{
- void __iomem * base_addr = ioremap
_nocache
(lba->hpa.start, 4096);
+ void __iomem * base_addr = ioremap(lba->hpa.start, 4096);
imask <<= 2; /* adjust for hints - 2 more bits */
imask <<= 2; /* adjust for hints - 2 more bits */