Skip to content

Commit

Permalink
ARM: sa11x0: Use void __iomem * in MMIO accessors
Browse files Browse the repository at this point in the history
MMIO accessors such as readl() and writel() want a void __iomem * for
the address. Update the BSE nanoEngine PCI driver to pass such pointers
instead of unsigned long in preparation to converting ARM to use generic
and more rigidly typed accessors.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Thierry Reding authored and Arnd Bergmann committed Nov 11, 2014
1 parent 1d0eeac commit 3ba5acf
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/arm/mach-sa1100/pci-nanoengine.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
static DEFINE_SPINLOCK(nano_lock);

static int nanoengine_get_pci_address(struct pci_bus *bus,
unsigned int devfn, int where, unsigned long *address)
unsigned int devfn, int where, void __iomem **address)
{
int ret = PCIBIOS_DEVICE_NOT_FOUND;
unsigned int busnr = bus->number;

*address = NANO_PCI_CONFIG_SPACE_VIRT +
*address = (void __iomem *)NANO_PCI_CONFIG_SPACE_VIRT +
((bus->number << 16) | (devfn << 8) | (where & ~3));

ret = (busnr > 255 || devfn > 255 || where > 255) ?
Expand All @@ -51,7 +51,7 @@ static int nanoengine_read_config(struct pci_bus *bus, unsigned int devfn, int w
int size, u32 *val)
{
int ret;
unsigned long address;
void __iomem *address;
unsigned long flags;
u32 v;

Expand Down Expand Up @@ -85,7 +85,7 @@ static int nanoengine_write_config(struct pci_bus *bus, unsigned int devfn, int
int size, u32 val)
{
int ret;
unsigned long address;
void __iomem *address;
unsigned long flags;
unsigned shift;
u32 v;
Expand Down

0 comments on commit 3ba5acf

Please sign in to comment.