* [PATCH] trivial iomem annotations (arch/powerpc/platfroms/parsemi/pci.c)
@ 2006-10-09 15:23 Al Viro
2006-10-09 15:40 ` Olof Johansson
2006-10-10 23:16 ` Michael Buesch
0 siblings, 2 replies; 3+ messages in thread
From: Al Viro @ 2006-10-09 15:23 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linuxppc-dev, linux-kernel
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;
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;
--
1.4.2.GIT
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] trivial iomem annotations (arch/powerpc/platfroms/parsemi/pci.c)
2006-10-09 15:23 [PATCH] trivial iomem annotations (arch/powerpc/platfroms/parsemi/pci.c) Al Viro
@ 2006-10-09 15:40 ` Olof Johansson
2006-10-10 23:16 ` Michael Buesch
1 sibling, 0 replies; 3+ messages in thread
From: Olof Johansson @ 2006-10-09 15:40 UTC (permalink / raw)
To: Al Viro; +Cc: linuxppc-dev, Linus Torvalds, linux-kernel
On Mon, 9 Oct 2006 16:23:09 +0100 Al Viro <viro@ftp.linux.org.uk> wrote:
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Olof Johansson <olof@lixom.net>
> ---
> 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;
>
> 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;
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] trivial iomem annotations (arch/powerpc/platfroms/parsemi/pci.c)
2006-10-09 15:23 [PATCH] trivial iomem annotations (arch/powerpc/platfroms/parsemi/pci.c) Al Viro
2006-10-09 15:40 ` Olof Johansson
@ 2006-10-10 23:16 ` Michael Buesch
1 sibling, 0 replies; 3+ messages in thread
From: Michael Buesch @ 2006-10-10 23:16 UTC (permalink / raw)
To: Al Viro; +Cc: linuxppc-dev, Linus Torvalds, linux-kernel
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-10-10 23:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-09 15:23 [PATCH] trivial iomem annotations (arch/powerpc/platfroms/parsemi/pci.c) Al Viro
2006-10-09 15:40 ` Olof Johansson
2006-10-10 23:16 ` Michael Buesch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).