Commit 5bedfdb2 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/arm' 

- Remove unused msi_ctrl, io_optional and align_resource fields from ARM
  struct hw_pci (Lorenzo Pieralisi)

* remotes/lorenzo/pci/arm:
  ARM/PCI: Remove unused fields from struct hw_pci
parents 299af12a fc177304

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

+0 −7
Original line number Diff line number Diff line
@@ -17,10 +17,8 @@ struct pci_host_bridge; 
struct device;



struct hw_pci {

	struct msi_controller *msi_ctrl;

	struct pci_ops	*ops;

	int		nr_controllers;

	unsigned int	io_optional:1;

	void		**private_data;

	int		(*setup)(int nr, struct pci_sys_data *);

	int		(*scan)(int nr, struct pci_host_bridge *);
@@ -28,11 +26,6 @@ struct hw_pci { 
	void		(*postinit)(void);

	u8		(*swizzle)(struct pci_dev *dev, u8 *pin);

	int		(*map_irq)(const struct pci_dev *dev, u8 slot, u8 pin);

	resource_size_t (*align_resource)(struct pci_dev *dev,

					  const struct resource *res,

					  resource_size_t start,

					  resource_size_t size,

					  resource_size_t align);

};



/*

arch/arm/kernel/bios32.c

+2 −14
Original line number Diff line number Diff line
@@ -394,8 +394,7 @@ static int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 
	return irq;

}



static int pcibios_init_resource(int busnr, struct pci_sys_data *sys,

				 int io_optional)

static int pcibios_init_resource(int busnr, struct pci_sys_data *sys)

{

	int ret;

	struct resource_entry *window;
@@ -405,14 +404,6 @@ static int pcibios_init_resource(int busnr, struct pci_sys_data *sys, 
			 &iomem_resource, sys->mem_offset);

	}



	/*

	 * If a platform says I/O port support is optional, we don't add

	 * the default I/O space.  The platform is responsible for adding

	 * any I/O space it needs.

	 */

	if (io_optional)

		return 0;



	resource_list_for_each_entry(window, &sys->resources)

		if (resource_type(window->res) == IORESOURCE_IO)

			return 0;
@@ -462,7 +453,7 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, 


		if (ret > 0) {



			ret = pcibios_init_resource(nr, sys, hw->io_optional);

			ret = pcibios_init_resource(nr, sys);

			if (ret)  {

				pci_free_host_bridge(bridge);

				break;
@@ -480,9 +471,6 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, 
				bridge->sysdata = sys;

				bridge->busnr = sys->busnr;

				bridge->ops = hw->ops;

				bridge->msi = hw->msi_ctrl;

				bridge->align_resource =

						hw->align_resource;



				ret = pci_scan_root_bus_bridge(bridge);

			}