mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
parisc: remove the HBA_DATA macro
No need to hide a cast in a macro, especially as all users have cleaner ways to archive the result than blind casting. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Helge Deller <[email protected]>
This commit is contained in:
parent
5007526700
commit
3654f01211
3 changed files with 9 additions and 8 deletions
|
|
@ -1519,6 +1519,7 @@ static int __init ccio_probe(struct parisc_device *dev)
|
|||
{
|
||||
int i;
|
||||
struct ioc *ioc, **ioc_p = &ioc_list;
|
||||
struct pci_hba_data *hba;
|
||||
|
||||
ioc = kzalloc(sizeof(struct ioc), GFP_KERNEL);
|
||||
if (ioc == NULL) {
|
||||
|
|
@ -1545,11 +1546,13 @@ static int __init ccio_probe(struct parisc_device *dev)
|
|||
ccio_ioc_init(ioc);
|
||||
ccio_init_resources(ioc);
|
||||
hppa_dma_ops = &ccio_ops;
|
||||
dev->dev.platform_data = kzalloc(sizeof(struct pci_hba_data), GFP_KERNEL);
|
||||
|
||||
hba = kzalloc(sizeof(*hba), GFP_KERNEL);
|
||||
/* if this fails, no I/O cards will work, so may as well bug */
|
||||
BUG_ON(dev->dev.platform_data == NULL);
|
||||
HBA_DATA(dev->dev.platform_data)->iommu = ioc;
|
||||
BUG_ON(hba == NULL);
|
||||
|
||||
hba->iommu = ioc;
|
||||
dev->dev.platform_data = hba;
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
if (ioc_count == 0) {
|
||||
|
|
|
|||
|
|
@ -1275,7 +1275,7 @@ lba_legacy_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev)
|
|||
r->flags = IORESOURCE_MEM;
|
||||
/* mmio_mask also clears Enable bit */
|
||||
r->start &= mmio_mask;
|
||||
r->start = PCI_HOST_ADDR(HBA_DATA(lba_dev), r->start);
|
||||
r->start = PCI_HOST_ADDR(&lba_dev->hba, r->start);
|
||||
rsize = ~ READ_REG32(lba_dev->hba.base_addr + LBA_LMMIO_MASK);
|
||||
|
||||
/*
|
||||
|
|
@ -1321,7 +1321,7 @@ lba_legacy_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev)
|
|||
r->flags = IORESOURCE_MEM;
|
||||
/* mmio_mask also clears Enable bit */
|
||||
r->start &= mmio_mask;
|
||||
r->start = PCI_HOST_ADDR(HBA_DATA(lba_dev), r->start);
|
||||
r->start = PCI_HOST_ADDR(&lba_dev->hba, r->start);
|
||||
rsize = READ_REG32(lba_dev->hba.base_addr + LBA_ELMMIO_MASK);
|
||||
r->end = r->start + ~rsize;
|
||||
}
|
||||
|
|
@ -1562,7 +1562,7 @@ lba_driver_probe(struct parisc_device *dev)
|
|||
|
||||
/* ------------ Second : initialize common stuff ---------- */
|
||||
pci_bios = &lba_bios_ops;
|
||||
pcibios_register_hba(HBA_DATA(lba_dev));
|
||||
pcibios_register_hba(&lba_dev->hba);
|
||||
spin_lock_init(&lba_dev->lba_lock);
|
||||
|
||||
if (lba_hw_init(lba_dev))
|
||||
|
|
|
|||
Loading…
Reference in a new issue