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

Commit b5e5e8a1 authored by Lorenzo Pieralisi's avatar Lorenzo Pieralisi Committed by Bjorn Helgaas
Browse files

ARM/PCI: Remove msi_controller from struct pci_sys_data 



ARM now uses pci_bus->msi to store the msi_controller pointer, so we don't
need to save it in struct pci_sys_data, and we don't need to implement
pcibios_msi_controller() to get it out of pci_sys_data.

Remove msi_controller from struct pci_sys_data and
pcibios_msi_controller().

[bhelgaas: changelog, split into separate patch]
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarJingoo Han <jingoohan1@gmail.com>
parent 8953aab1

arch/arm/include/asm/mach/pci.h

+0 −3
Original line number Diff line number Diff line
@@ -40,9 +40,6 @@ struct hw_pci { 
 * Per-controller structure

 */

struct pci_sys_data {

#ifdef CONFIG_PCI_MSI

	struct msi_controller *msi_ctrl;

#endif

	struct list_head node;

	int		busnr;		/* primary bus number			*/

	u64		mem_offset;	/* bus->cpu memory mapping offset	*/

arch/arm/kernel/bios32.c

+0 −12
Original line number Diff line number Diff line
@@ -18,15 +18,6 @@ 


static int debug_pci;



#ifdef CONFIG_PCI_MSI

struct msi_controller *pcibios_msi_controller(struct pci_dev *dev)

{

	struct pci_sys_data *sysdata = dev->bus->sysdata;



	return sysdata->msi_ctrl;

}

#endif



/*

 * We can't use pci_get_device() here since we are

 * called from interrupt context.
@@ -462,9 +453,6 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, 
		if (WARN(!sys, "PCI: unable to allocate sys data!"))

			break;



#ifdef CONFIG_PCI_MSI

		sys->msi_ctrl = hw->msi_ctrl;

#endif

		sys->busnr   = busnr;

		sys->swizzle = hw->swizzle;

		sys->map_irq = hw->map_irq;