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

Commit 079c6179 authored by Yijing Wang's avatar Yijing Wang Committed by Alex Shi
Browse files

ARM/PCI: Remove unused pcibios_add_bus() and pcibios_remove_bus() 



There are no users of the struct hw_pci.add_bus() or .remove_bus() methods,
so remove the pointers from hw_pci.  That makes pcibios_add_bus() and
pcibios_remove_bus() themselves superfluous, so remove them as well.

[bhelgaas: changelog]
Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
(cherry picked from commit 6cf00af0ae158120e8149ed3d77746397b3f911f)

Signed-off-by: default avatarAlex Shi <alex.shi@linaro.org>
parent c137c607

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

+0 −4
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ struct hw_pci { 
					  resource_size_t start,

					  resource_size_t size,

					  resource_size_t align);

	void		(*add_bus)(struct pci_bus *bus);

	void		(*remove_bus)(struct pci_bus *bus);

};



/*
@@ -71,8 +69,6 @@ struct pci_sys_data { 
					  resource_size_t start,

					  resource_size_t size,

					  resource_size_t align);

	void		(*add_bus)(struct pci_bus *bus);

	void		(*remove_bus)(struct pci_bus *bus);

	void		*private_data;	/* platform controller private data	*/

};

arch/arm/kernel/bios32.c

+0 −16
Original line number Diff line number Diff line
@@ -369,20 +369,6 @@ void pcibios_fixup_bus(struct pci_bus *bus) 
}

EXPORT_SYMBOL(pcibios_fixup_bus);



void pcibios_add_bus(struct pci_bus *bus)

{

	struct pci_sys_data *sys = bus->sysdata;

	if (sys->add_bus)

		sys->add_bus(bus);

}



void pcibios_remove_bus(struct pci_bus *bus)

{

	struct pci_sys_data *sys = bus->sysdata;

	if (sys->remove_bus)

		sys->remove_bus(bus);

}



/*

 * Swizzle the device pin each time we cross a bridge.  If a platform does

 * not provide a swizzle function, we perform the standard PCI swizzling.
@@ -487,8 +473,6 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, 
		sys->swizzle = hw->swizzle;

		sys->map_irq = hw->map_irq;

		sys->align_resource = hw->align_resource;

		sys->add_bus = hw->add_bus;

		sys->remove_bus = hw->remove_bus;

		INIT_LIST_HEAD(&sys->resources);



		if (hw->private_data)