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

Commit 92a11f9e authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] ppc iomem annotations: ->io_base_virt 



* ->io_base_virt in struct pci_controller is iomem pointer.  Marked as such.
  Most of the places that used it are already annotated to expect iomem.
* places that did gratitious (and wrong) casts a-la
	isa_io_base = (unsigned long)ioremap(...);
	hose->io_base_virt = (void *)isa_io_base;
  turned into
	hose->io_base_virt = ioremap(...);
	isa_io_base = (unsigned long)hose->io_base_virt;
* pci_bus_io_base() annotated as returning iomem pointer.

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9090e001

arch/ppc/kernel/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1432,7 +1432,7 @@ pci_bus_to_hose(int bus) 
	return NULL;

}



void*

void __iomem *

pci_bus_io_base(unsigned int bus)

{

	struct pci_controller *hose;

arch/ppc/platforms/4xx/ebony.c

+2 −3
Original line number Diff line number Diff line
@@ -210,9 +210,8 @@ ebony_setup_hose(void) 
	hose->io_space.end = EBONY_PCI_UPPER_IO;

	hose->mem_space.start = EBONY_PCI_LOWER_MEM;

	hose->mem_space.end = EBONY_PCI_UPPER_MEM;

	isa_io_base =

		(unsigned long)ioremap64(EBONY_PCI_IO_BASE, EBONY_PCI_IO_SIZE);

	hose->io_base_virt = (void *)isa_io_base;

	hose->io_base_virt = ioremap64(EBONY_PCI_IO_BASE, EBONY_PCI_IO_SIZE);

	isa_io_base = (unsigned long)hose->io_base_virt;



	setup_indirect_pci(hose,

			EBONY_PCI_CFGA_PLB32,

arch/ppc/platforms/4xx/luan.c

+2 −3
Original line number Diff line number Diff line
@@ -223,9 +223,8 @@ luan_setup_hose(struct pci_controller *hose, 
	hose->io_space.end = LUAN_PCIX_UPPER_IO;

	hose->mem_space.start = lower_mem;

	hose->mem_space.end = upper_mem;

	isa_io_base =

		(unsigned long)ioremap64(pcix_io_base, PCIX_IO_SIZE);

	hose->io_base_virt = (void *)isa_io_base;

	hose->io_base_virt = ioremap64(pcix_io_base, PCIX_IO_SIZE);

	isa_io_base = (unsigned long) hose->io_base_virt;



	setup_indirect_pci(hose, cfga, cfgd);

	hose->set_cfg_type = 1;

arch/ppc/platforms/4xx/ocotea.c

+2 −3
Original line number Diff line number Diff line
@@ -227,9 +227,8 @@ ocotea_setup_hose(void) 
	hose->io_space.end = OCOTEA_PCI_UPPER_IO;

	hose->mem_space.start = OCOTEA_PCI_LOWER_MEM;

	hose->mem_space.end = OCOTEA_PCI_UPPER_MEM;

	isa_io_base =

		(unsigned long)ioremap64(OCOTEA_PCI_IO_BASE, OCOTEA_PCI_IO_SIZE);

	hose->io_base_virt = (void *)isa_io_base;

	hose->io_base_virt = ioremap64(OCOTEA_PCI_IO_BASE, OCOTEA_PCI_IO_SIZE);

	isa_io_base = (unsigned long) hose->io_base_virt;



	setup_indirect_pci(hose,

			OCOTEA_PCI_CFGA_PLB32,

arch/ppc/syslib/m8260_pci.c

+2 −3
Original line number Diff line number Diff line
@@ -171,10 +171,9 @@ void __init m8260_find_bridges(void) 
	m8260_setup_pci(hose);

        hose->pci_mem_offset = MPC826x_PCI_MEM_OFFSET;



        isa_io_base =

                (unsigned long) ioremap(MPC826x_PCI_IO_BASE,

        hose->io_base_virt = ioremap(MPC826x_PCI_IO_BASE,

                                        MPC826x_PCI_IO_SIZE);

        hose->io_base_virt = (void *) isa_io_base;

        isa_io_base = (unsigned long) hose->io_base_virt;

 

        /* setup resources */

        pci_init_resource(&hose->mem_resources[0],