Messages in this thread | | | From | Michael Buesch <> | Subject | Re: [PATCH] trivial iomem annotations (arch/powerpc/platfroms/parsemi/pci.c) | Date | Wed, 11 Oct 2006 01:16:05 +0200 |
| |
On Monday 09 October 2006 17:23, Al Viro wrote: > Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> > --- > arch/powerpc/platforms/pasemi/pci.c | 26 +++++++++++++------------- > 1 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/arch/powerpc/platforms/pasemi/pci.c b/arch/powerpc/platforms/pasemi/pci.c > index 4679c52..39020c1 100644 > --- a/arch/powerpc/platforms/pasemi/pci.c > +++ b/arch/powerpc/platforms/pasemi/pci.c > @@ -35,17 +35,17 @@ #define PA_PXP_CFA(bus, devfn, off) (((b > > #define CONFIG_OFFSET_VALID(off) ((off) < 4096) > > -static unsigned long pa_pxp_cfg_addr(struct pci_controller *hose, > +static void volatile __iomem *pa_pxp_cfg_addr(struct pci_controller *hose, > u8 bus, u8 devfn, int offset) > { > - return ((unsigned long)hose->cfg_data) + PA_PXP_CFA(bus, devfn, offset); > + return hose->cfg_data + PA_PXP_CFA(bus, devfn, offset); > } > > static int pa_pxp_read_config(struct pci_bus *bus, unsigned int devfn, > int offset, int len, u32 *val) > { > struct pci_controller *hose; > - unsigned long addr; > + void volatile __iomem *addr;
I think you should drop all these new "volatile"s.
> hose = pci_bus_to_host(bus); > if (!hose) > @@ -62,13 +62,13 @@ static int pa_pxp_read_config(struct pci > */ > switch (len) { > case 1: > - *val = in_8((u8 *)addr); > + *val = in_8(addr); > break; > case 2: > - *val = in_le16((u16 *)addr); > + *val = in_le16(addr); > break; > default: > - *val = in_le32((u32 *)addr); > + *val = in_le32(addr); > break; > } > > @@ -79,7 +79,7 @@ static int pa_pxp_write_config(struct pc > int offset, int len, u32 val) > { > struct pci_controller *hose; > - unsigned long addr; > + void volatile __iomem *addr; > > hose = pci_bus_to_host(bus); > if (!hose) > @@ -96,16 +96,16 @@ static int pa_pxp_write_config(struct pc > */ > switch (len) { > case 1: > - out_8((u8 *)addr, val); > - (void) in_8((u8 *)addr); > + out_8(addr, val); > + (void) in_8(addr); > break; > case 2: > - out_le16((u16 *)addr, val); > - (void) in_le16((u16 *)addr); > + out_le16(addr, val); > + (void) in_le16(addr); > break; > default: > - out_le32((u32 *)addr, val); > - (void) in_le32((u32 *)addr); > + out_le32(addr, val); > + (void) in_le32(addr); > break; > } > return PCIBIOS_SUCCESSFUL;
-- Greetings Michael. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |