Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3654f012 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Helge Deller
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 50075267

arch/parisc/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ struct pci_hba_data { 
	char gmmio_name[HBA_NAME_SIZE];

};



#define HBA_DATA(d)		((struct pci_hba_data *) (d))



/* 

** We support 2^16 I/O ports per HBA.  These are set up in the form

** 0xbbxxxx, where bb is the bus number and xxxx is the I/O port

drivers/parisc/ccio-dma.c

+6 −3
Original line number Diff line number Diff line
@@ -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) {

drivers/parisc/lba_pci.c

+3 −3
Original line number Diff line number Diff line
@@ -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))