* [PATCH] more s2io __iomem annotations
@ 2006-09-23 0:33 Al Viro
2006-09-26 0:08 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Al Viro @ 2006-09-23 0:33 UTC (permalink / raw)
To: Jeff Garzik; +Cc: linux-kernel
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
drivers/net/s2io.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index e72e0e0..86d5e67 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -2903,7 +2903,7 @@ static void s2io_mdio_write(u32 mmd_type
{
u64 val64 = 0x0;
nic_t *sp = dev->priv;
- XENA_dev_config_t *bar0 = (XENA_dev_config_t *)sp->bar0;
+ XENA_dev_config_t __iomem *bar0 = sp->bar0;
//address transaction
val64 = val64 | MDIO_MMD_INDX_ADDR(addr)
@@ -2952,7 +2952,7 @@ static u64 s2io_mdio_read(u32 mmd_type,
u64 val64 = 0x0;
u64 rval64 = 0x0;
nic_t *sp = dev->priv;
- XENA_dev_config_t *bar0 = (XENA_dev_config_t *)sp->bar0;
+ XENA_dev_config_t __iomem *bar0 = sp->bar0;
/* address transaction */
val64 = val64 | MDIO_MMD_INDX_ADDR(addr)
@@ -3275,7 +3275,7 @@ static void alarm_intr_handler(struct s2
* SUCCESS on success and FAILURE on failure.
*/
-static int wait_for_cmd_complete(void *addr, u64 busy_bit)
+static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit)
{
int ret = FAILURE, cnt = 0;
u64 val64;
--
1.4.2.GIT
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] more s2io __iomem annotations
2006-09-23 0:33 [PATCH] more s2io __iomem annotations Al Viro
@ 2006-09-26 0:08 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2006-09-26 0:08 UTC (permalink / raw)
To: Al Viro; +Cc: linux-kernel
applied both s2io patches
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-09-26 0:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-23 0:33 [PATCH] more s2io __iomem annotations Al Viro
2006-09-26 0:08 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox