diff options
author | Matthew Wilcox <willy@parisc-linux.org> | 2005-10-21 22:36:40 -0400 |
---|---|---|
committer | Kyle McMartin <kyle@parisc-linux.org> | 2005-10-21 22:36:40 -0400 |
commit | 53f01bba49938f115237fe43a261c31ac13ae5c6 (patch) | |
tree | df2a5fa9d95c7e69447ac0c89d6e149888c9bd1c /drivers/parisc | |
parent | bdad1f836ab1ca2b18a625222f63f630cfd14e41 (diff) |
[PARISC] Convert parisc_device to use struct resource for hpa
Convert pa_dev->hpa from an unsigned long to a struct resource.
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Fix up users of ->hpa to use ->hpa.start instead.
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'drivers/parisc')
-rw-r--r-- | drivers/parisc/asp.c | 4 | ||||
-rw-r--r-- | drivers/parisc/ccio-dma.c | 4 | ||||
-rw-r--r-- | drivers/parisc/ccio-rm-dma.c | 2 | ||||
-rw-r--r-- | drivers/parisc/dino.c | 6 | ||||
-rw-r--r-- | drivers/parisc/eisa.c | 2 | ||||
-rw-r--r-- | drivers/parisc/hppb.c | 8 | ||||
-rw-r--r-- | drivers/parisc/lasi.c | 2 | ||||
-rw-r--r-- | drivers/parisc/lba_pci.c | 14 | ||||
-rw-r--r-- | drivers/parisc/sba_iommu.c | 6 | ||||
-rw-r--r-- | drivers/parisc/wax.c | 2 |
10 files changed, 25 insertions, 25 deletions
diff --git a/drivers/parisc/asp.c b/drivers/parisc/asp.c index 52f37b42431..558420bc9f8 100644 --- a/drivers/parisc/asp.c +++ b/drivers/parisc/asp.c | |||
@@ -77,12 +77,12 @@ asp_init_chip(struct parisc_device *dev) | |||
77 | struct gsc_irq gsc_irq; | 77 | struct gsc_irq gsc_irq; |
78 | int ret; | 78 | int ret; |
79 | 79 | ||
80 | asp.version = gsc_readb(dev->hpa + ASP_VER_OFFSET) & 0xf; | 80 | asp.version = gsc_readb(dev->hpa.start + ASP_VER_OFFSET) & 0xf; |
81 | asp.name = (asp.version == 1) ? "Asp" : "Cutoff"; | 81 | asp.name = (asp.version == 1) ? "Asp" : "Cutoff"; |
82 | asp.hpa = ASP_INTERRUPT_ADDR; | 82 | asp.hpa = ASP_INTERRUPT_ADDR; |
83 | 83 | ||
84 | printk(KERN_INFO "%s version %d at 0x%lx found.\n", | 84 | printk(KERN_INFO "%s version %d at 0x%lx found.\n", |
85 | asp.name, asp.version, dev->hpa); | 85 | asp.name, asp.version, dev->hpa.start); |
86 | 86 | ||
87 | /* the IRQ ASP should use */ | 87 | /* the IRQ ASP should use */ |
88 | ret = -EBUSY; | 88 | ret = -EBUSY; |
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index 2bb1889c4c4..80d0927dc8a 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c | |||
@@ -1546,7 +1546,7 @@ static int ccio_probe(struct parisc_device *dev) | |||
1546 | 1546 | ||
1547 | ioc->name = dev->id.hversion == U2_IOA_RUNWAY ? "U2" : "UTurn"; | 1547 | ioc->name = dev->id.hversion == U2_IOA_RUNWAY ? "U2" : "UTurn"; |
1548 | 1548 | ||
1549 | printk(KERN_INFO "Found %s at 0x%lx\n", ioc->name, dev->hpa); | 1549 | printk(KERN_INFO "Found %s at 0x%lx\n", ioc->name, dev->hpa.start); |
1550 | 1550 | ||
1551 | for (i = 0; i < ioc_count; i++) { | 1551 | for (i = 0; i < ioc_count; i++) { |
1552 | ioc_p = &(*ioc_p)->next; | 1552 | ioc_p = &(*ioc_p)->next; |
@@ -1554,7 +1554,7 @@ static int ccio_probe(struct parisc_device *dev) | |||
1554 | *ioc_p = ioc; | 1554 | *ioc_p = ioc; |
1555 | 1555 | ||
1556 | ioc->hw_path = dev->hw_path; | 1556 | ioc->hw_path = dev->hw_path; |
1557 | ioc->ioc_hpa = (struct ioa_registers *)dev->hpa; | 1557 | ioc->ioc_regs = ioremap(dev->hpa.start, 4096); |
1558 | ccio_ioc_init(ioc); | 1558 | ccio_ioc_init(ioc); |
1559 | ccio_init_resources(ioc); | 1559 | ccio_init_resources(ioc); |
1560 | hppa_dma_ops = &ccio_ops; | 1560 | hppa_dma_ops = &ccio_ops; |
diff --git a/drivers/parisc/ccio-rm-dma.c b/drivers/parisc/ccio-rm-dma.c index 57e6385976e..356b8357bcc 100644 --- a/drivers/parisc/ccio-rm-dma.c +++ b/drivers/parisc/ccio-rm-dma.c | |||
@@ -167,7 +167,7 @@ ccio_probe(struct parisc_device *dev) | |||
167 | { | 167 | { |
168 | printk(KERN_INFO "%s found %s at 0x%lx\n", MODULE_NAME, | 168 | printk(KERN_INFO "%s found %s at 0x%lx\n", MODULE_NAME, |
169 | dev->id.hversion == U2_BC_GSC ? "U2" : "UTurn", | 169 | dev->id.hversion == U2_BC_GSC ? "U2" : "UTurn", |
170 | dev->hpa); | 170 | dev->hpa.start); |
171 | 171 | ||
172 | /* | 172 | /* |
173 | ** FIXME - should check U2 registers to verify it's really running | 173 | ** FIXME - should check U2 registers to verify it's really running |
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c index 8c61705e67a..37820b0ae5e 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c | |||
@@ -902,15 +902,15 @@ void ccio_cujo20_fixup(struct parisc_device *dev, u32 iovp); | |||
902 | ** If so, initialize the chip appropriately (card-mode vs bridge mode). | 902 | ** If so, initialize the chip appropriately (card-mode vs bridge mode). |
903 | ** Much of the initialization is common though. | 903 | ** Much of the initialization is common though. |
904 | */ | 904 | */ |
905 | static int __init | 905 | static int __init dino_probe(struct parisc_device *dev) |
906 | dino_driver_callback(struct parisc_device *dev) | ||
907 | { | 906 | { |
908 | struct dino_device *dino_dev; // Dino specific control struct | 907 | struct dino_device *dino_dev; // Dino specific control struct |
909 | const char *version = "unknown"; | 908 | const char *version = "unknown"; |
910 | char *name; | 909 | char *name; |
911 | int is_cujo = 0; | 910 | int is_cujo = 0; |
912 | struct pci_bus *bus; | 911 | struct pci_bus *bus; |
913 | 912 | unsigned long hpa = dev->hpa.start; | |
913 | |||
914 | name = "Dino"; | 914 | name = "Dino"; |
915 | if (is_card_dino(&dev->id)) { | 915 | if (is_card_dino(&dev->id)) { |
916 | version = "3.x (card mode)"; | 916 | version = "3.x (card mode)"; |
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c index 0afeedddf53..6362bf99eff 100644 --- a/drivers/parisc/eisa.c +++ b/drivers/parisc/eisa.c | |||
@@ -315,7 +315,7 @@ static int __devinit eisa_probe(struct parisc_device *dev) | |||
315 | char *name = is_mongoose(dev) ? "Mongoose" : "Wax"; | 315 | char *name = is_mongoose(dev) ? "Mongoose" : "Wax"; |
316 | 316 | ||
317 | printk(KERN_INFO "%s EISA Adapter found at 0x%08lx\n", | 317 | printk(KERN_INFO "%s EISA Adapter found at 0x%08lx\n", |
318 | name, dev->hpa); | 318 | name, dev->hpa.start); |
319 | 319 | ||
320 | eisa_dev.hba.dev = dev; | 320 | eisa_dev.hba.dev = dev; |
321 | eisa_dev.hba.iommu = ccio_get_iommu(dev); | 321 | eisa_dev.hba.iommu = ccio_get_iommu(dev); |
diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c index a6eae3e7c0c..5edf93f8075 100644 --- a/drivers/parisc/hppb.c +++ b/drivers/parisc/hppb.c | |||
@@ -68,14 +68,14 @@ static int hppb_probe(struct parisc_device *dev) | |||
68 | memset(card->next, '\0', sizeof(struct hppb_card)); | 68 | memset(card->next, '\0', sizeof(struct hppb_card)); |
69 | card = card->next; | 69 | card = card->next; |
70 | } | 70 | } |
71 | printk(KERN_INFO "Found GeckoBoa at 0x%lx\n", dev->hpa); | 71 | printk(KERN_INFO "Found GeckoBoa at 0x%lx\n", dev->hpa.start); |
72 | 72 | ||
73 | card->hpa = dev->hpa; | 73 | card->hpa = dev->hpa.start; |
74 | card->mmio_region.name = "HP-PB Bus"; | 74 | card->mmio_region.name = "HP-PB Bus"; |
75 | card->mmio_region.flags = IORESOURCE_MEM; | 75 | card->mmio_region.flags = IORESOURCE_MEM; |
76 | 76 | ||
77 | card->mmio_region.start = __raw_readl(dev->hpa + IO_IO_LOW); | 77 | card->mmio_region.start = gsc_readl(dev->hpa.start + IO_IO_LOW); |
78 | card->mmio_region.end = __raw_readl(dev->hpa + IO_IO_HIGH) - 1; | 78 | card->mmio_region.end = gsc_readl(dev->hpa.start + IO_IO_HIGH) - 1; |
79 | 79 | ||
80 | status = ccio_request_resource(dev, &card->mmio_region); | 80 | status = ccio_request_resource(dev, &card->mmio_region); |
81 | if(status < 0) { | 81 | if(status < 0) { |
diff --git a/drivers/parisc/lasi.c b/drivers/parisc/lasi.c index c776c372ae4..a8c20396ffb 100644 --- a/drivers/parisc/lasi.c +++ b/drivers/parisc/lasi.c | |||
@@ -175,7 +175,7 @@ lasi_init_chip(struct parisc_device *dev) | |||
175 | return -ENOMEM; | 175 | return -ENOMEM; |
176 | 176 | ||
177 | lasi->name = "Lasi"; | 177 | lasi->name = "Lasi"; |
178 | lasi->hpa = dev->hpa; | 178 | lasi->hpa = dev->hpa.start; |
179 | 179 | ||
180 | /* Check the 4-bit (yes, only 4) version register */ | 180 | /* Check the 4-bit (yes, only 4) version register */ |
181 | lasi->version = gsc_readl(lasi->hpa + LASI_VER) & 0xf; | 181 | lasi->version = gsc_readl(lasi->hpa + LASI_VER) & 0xf; |
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c index 7fdd80b7eb4..5e495dcbc58 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c | |||
@@ -1288,7 +1288,7 @@ lba_legacy_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev) | |||
1288 | ** Adjust "window" for this rope. | 1288 | ** Adjust "window" for this rope. |
1289 | */ | 1289 | */ |
1290 | rsize /= ROPES_PER_IOC; | 1290 | rsize /= ROPES_PER_IOC; |
1291 | r->start += (rsize + 1) * LBA_NUM(pa_dev->hpa); | 1291 | r->start += (rsize + 1) * LBA_NUM(pa_dev->hpa.start); |
1292 | r->end = r->start + rsize; | 1292 | r->end = r->start + rsize; |
1293 | } else { | 1293 | } else { |
1294 | r->end = r->start = 0; /* Not enabled. */ | 1294 | r->end = r->start = 0; /* Not enabled. */ |
@@ -1458,7 +1458,7 @@ lba_driver_probe(struct parisc_device *dev) | |||
1458 | u32 func_class; | 1458 | u32 func_class; |
1459 | void *tmp_obj; | 1459 | void *tmp_obj; |
1460 | char *version; | 1460 | char *version; |
1461 | void __iomem *addr = ioremap(dev->hpa, 4096); | 1461 | void __iomem *addr = ioremap(dev->hpa.start, 4096); |
1462 | 1462 | ||
1463 | /* Read HW Rev First */ | 1463 | /* Read HW Rev First */ |
1464 | func_class = READ_REG32(addr + LBA_FCLASS); | 1464 | func_class = READ_REG32(addr + LBA_FCLASS); |
@@ -1476,7 +1476,7 @@ lba_driver_probe(struct parisc_device *dev) | |||
1476 | } | 1476 | } |
1477 | 1477 | ||
1478 | printk(KERN_INFO "%s version %s (0x%x) found at 0x%lx\n", | 1478 | printk(KERN_INFO "%s version %s (0x%x) found at 0x%lx\n", |
1479 | MODULE_NAME, version, func_class & 0xf, dev->hpa); | 1479 | MODULE_NAME, version, func_class & 0xf, dev->hpa.start); |
1480 | 1480 | ||
1481 | if (func_class < 2) { | 1481 | if (func_class < 2) { |
1482 | printk(KERN_WARNING "Can't support LBA older than " | 1482 | printk(KERN_WARNING "Can't support LBA older than " |
@@ -1503,17 +1503,17 @@ lba_driver_probe(struct parisc_device *dev) | |||
1503 | * but for the mask for func_class. | 1503 | * but for the mask for func_class. |
1504 | */ | 1504 | */ |
1505 | printk(KERN_INFO "%s version %s (0x%x) found at 0x%lx\n", | 1505 | printk(KERN_INFO "%s version %s (0x%x) found at 0x%lx\n", |
1506 | MODULE_NAME, version, func_class & 0xff, dev->hpa); | 1506 | MODULE_NAME, version, func_class & 0xff, dev->hpa.start); |
1507 | cfg_ops = &mercury_cfg_ops; | 1507 | cfg_ops = &mercury_cfg_ops; |
1508 | } else { | 1508 | } else { |
1509 | printk(KERN_ERR "Unknown LBA found at 0x%lx\n", dev->hpa); | 1509 | printk(KERN_ERR "Unknown LBA found at 0x%lx\n", dev->hpa.start); |
1510 | return -ENODEV; | 1510 | return -ENODEV; |
1511 | } | 1511 | } |
1512 | 1512 | ||
1513 | /* | 1513 | /* |
1514 | ** Tell I/O SAPIC driver we have a IRQ handler/region. | 1514 | ** Tell I/O SAPIC driver we have a IRQ handler/region. |
1515 | */ | 1515 | */ |
1516 | tmp_obj = iosapic_register(dev->hpa + LBA_IOSAPIC_BASE); | 1516 | tmp_obj = iosapic_register(dev->hpa.start + LBA_IOSAPIC_BASE); |
1517 | 1517 | ||
1518 | /* NOTE: PCI devices (e.g. 103c:1005 graphics card) which don't | 1518 | /* NOTE: PCI devices (e.g. 103c:1005 graphics card) which don't |
1519 | ** have an IRT entry will get NULL back from iosapic code. | 1519 | ** have an IRT entry will get NULL back from iosapic code. |
@@ -1635,7 +1635,7 @@ void __init lba_init(void) | |||
1635 | */ | 1635 | */ |
1636 | void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask) | 1636 | void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask) |
1637 | { | 1637 | { |
1638 | void __iomem * base_addr = ioremap(lba->hpa, 4096); | 1638 | void __iomem * base_addr = ioremap(lba->hpa.start, 4096); |
1639 | 1639 | ||
1640 | imask <<= 2; /* adjust for hints - 2 more bits */ | 1640 | imask <<= 2; /* adjust for hints - 2 more bits */ |
1641 | 1641 | ||
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c index a8405f05fb5..6256ad365d0 100644 --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c | |||
@@ -1600,7 +1600,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num) | |||
1600 | 1600 | ||
1601 | static void __iomem *ioc_remap(struct sba_device *sba_dev, int offset) | 1601 | static void __iomem *ioc_remap(struct sba_device *sba_dev, int offset) |
1602 | { | 1602 | { |
1603 | return ioremap(sba_dev->dev->hpa + offset, SBA_FUNC_SIZE); | 1603 | return ioremap(sba_dev->dev->hpa.start + offset, SBA_FUNC_SIZE); |
1604 | } | 1604 | } |
1605 | 1605 | ||
1606 | static void sba_hw_init(struct sba_device *sba_dev) | 1606 | static void sba_hw_init(struct sba_device *sba_dev) |
@@ -1978,7 +1978,7 @@ sba_driver_callback(struct parisc_device *dev) | |||
1978 | u32 func_class; | 1978 | u32 func_class; |
1979 | int i; | 1979 | int i; |
1980 | char *version; | 1980 | char *version; |
1981 | void __iomem *sba_addr = ioremap(dev->hpa, SBA_FUNC_SIZE); | 1981 | void __iomem *sba_addr = ioremap(dev->hpa.start, SBA_FUNC_SIZE); |
1982 | 1982 | ||
1983 | sba_dump_ranges(sba_addr); | 1983 | sba_dump_ranges(sba_addr); |
1984 | 1984 | ||
@@ -2020,7 +2020,7 @@ sba_driver_callback(struct parisc_device *dev) | |||
2020 | } | 2020 | } |
2021 | 2021 | ||
2022 | printk(KERN_INFO "%s found %s at 0x%lx\n", | 2022 | printk(KERN_INFO "%s found %s at 0x%lx\n", |
2023 | MODULE_NAME, version, dev->hpa); | 2023 | MODULE_NAME, version, dev->hpa.start); |
2024 | 2024 | ||
2025 | sba_dev = kmalloc(sizeof(struct sba_device), GFP_KERNEL); | 2025 | sba_dev = kmalloc(sizeof(struct sba_device), GFP_KERNEL); |
2026 | if (!sba_dev) { | 2026 | if (!sba_dev) { |
diff --git a/drivers/parisc/wax.c b/drivers/parisc/wax.c index e547d7d024d..17dce2adf7f 100644 --- a/drivers/parisc/wax.c +++ b/drivers/parisc/wax.c | |||
@@ -81,7 +81,7 @@ wax_init_chip(struct parisc_device *dev) | |||
81 | return -ENOMEM; | 81 | return -ENOMEM; |
82 | 82 | ||
83 | wax->name = "wax"; | 83 | wax->name = "wax"; |
84 | wax->hpa = dev->hpa; | 84 | wax->hpa = dev->hpa.start; |
85 | 85 | ||
86 | wax->version = 0; /* gsc_readb(wax->hpa+WAX_VER); */ | 86 | wax->version = 0; /* gsc_readb(wax->hpa+WAX_VER); */ |
87 | printk(KERN_INFO "%s at 0x%lx found.\n", wax->name, wax->hpa); | 87 | printk(KERN_INFO "%s at 0x%lx found.\n", wax->name, wax->hpa); |