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

Commit 352af7d4 authored by Thierry Reding's avatar Thierry Reding Committed by Russell King
Browse files

ARM: 7648/1: pci: Allow passing per-controller private data 



In order to allow drivers to specify private data for each controller,
this commit adds a private_data field to the struct hw_pci. This field
is an array of nr_controllers pointers that will be used to initialize
the private_data field of the corresponding controller's pci_sys_data
structure.

Signed-off-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 276fd3c5

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

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ struct hw_pci { 
#endif

	struct pci_ops	*ops;

	int		nr_controllers;

	void		**private_data;

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

	struct pci_bus *(*scan)(int nr, struct pci_sys_data *);

	void		(*preinit)(void);

arch/arm/kernel/bios32.c

+3 −0
Original line number Diff line number Diff line
@@ -464,6 +464,9 @@ static void pcibios_init_hw(struct hw_pci *hw, struct list_head *head) 
		sys->map_irq = hw->map_irq;

		INIT_LIST_HEAD(&sys->resources);



		if (hw->private_data)

			sys->private_data = hw->private_data[nr];



		ret = hw->setup(nr, sys);



		if (ret > 0) {