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

Commit 5b21fb8e authored by Kumar Gala's avatar Kumar Gala Committed by Benjamin Herrenschmidt
Browse files

powerpc/pci: Clean up direct access to sysdata by 52xx platforms 



We shouldn't directly access sysdata to get the pci_controller.  Instead
use pci_bus_to_host() for this purpose.  In the future we might have
sysdata be a device_node to match ppc64 and unify the code between ppc32
& ppc64.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 8206a110

arch/powerpc/platforms/52xx/efika.c

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
static int rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset,

			    int len, u32 * val)

{

	struct pci_controller *hose = bus->sysdata;

	struct pci_controller *hose = pci_bus_to_host(bus);

	unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)

	    | (((bus->number - hose->first_busno) & 0xff) << 16)

	    | (hose->global_number << 24);
@@ -49,7 +49,7 @@ static int rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset, 
static int rtas_write_config(struct pci_bus *bus, unsigned int devfn,

			     int offset, int len, u32 val)

{

	struct pci_controller *hose = bus->sysdata;

	struct pci_controller *hose = pci_bus_to_host(bus);

	unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)

	    | (((bus->number - hose->first_busno) & 0xff) << 16)

	    | (hose->global_number << 24);

arch/powerpc/platforms/52xx/mpc52xx_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static int 
mpc52xx_pci_read_config(struct pci_bus *bus, unsigned int devfn,

				int offset, int len, u32 *val)

{

	struct pci_controller *hose = bus->sysdata;

	struct pci_controller *hose = pci_bus_to_host(bus);

	u32 value;



	if (ppc_md.pci_exclude_device)
@@ -164,7 +164,7 @@ static int 
mpc52xx_pci_write_config(struct pci_bus *bus, unsigned int devfn,

				int offset, int len, u32 val)

{

	struct pci_controller *hose = bus->sysdata;

	struct pci_controller *hose = pci_bus_to_host(bus);

	u32 value, mask;



	if (ppc_md.pci_exclude_device)