summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Belisko <marek.belisko@open-nandra.com>2010-11-18 14:29:31 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2010-11-19 09:35:09 +0100
commit52f5f20baa08c062142c30af645784d1c0d118c0 (patch)
tree2dbe5a209d66558da7230ba9af9ea8c0ceda96bb
parent5c495ce5e5595bdd0cb2b5ee3c760540c58d5c37 (diff)
downloadbarebox-52f5f20baa08c062142c30af645784d1c0d118c0.tar.gz
barebox-52f5f20baa08c062142c30af645784d1c0d118c0.tar.xz
smc91111: Various sparse fixes.
Patch fix all similar warnings found by sparse: drivers/net/smc91111.c:488:9: warning: incorrect type in argument 1 (different base types) expected void const volatile [noderef] <asn:2>*<noident> got unsigned long [unsigned] offset Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--drivers/net/smc91111.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index 605a7d8613..535e69a1d9 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -440,20 +440,20 @@
#define MEMORY_WAIT_TIME 16
struct accessors {
- void (*ob)(unsigned, unsigned long);
- void (*ow)(unsigned, unsigned long);
- void (*ol)(unsigned long, unsigned long);
- void (*osl)(unsigned long, const void*, int);
- unsigned (*ib)(unsigned long);
- unsigned (*iw)(unsigned long);
- unsigned long (*il)(unsigned long);
- void (*isl)(unsigned long, void*, int);
+ void (*ob)(unsigned, void __iomem *);
+ void (*ow)(unsigned, void __iomem *);
+ void (*ol)(unsigned long, void __iomem *);
+ void (*osl)(void __iomem *, const void *, int);
+ unsigned (*ib)(void __iomem *);
+ unsigned (*iw)(void __iomem *);
+ unsigned long (*il)(void __iomem *);
+ void (*isl)(void __iomem *, void*, int);
};
struct smc91c111_priv {
struct mii_device miidev;
struct accessors a;
- unsigned long base;
+ void __iomem *base;
};
#if (SMC_DEBUG > 2 )
@@ -483,44 +483,44 @@ struct smc91c111_priv {
#define ETH_ZLEN 60
-static void a_outb(unsigned value, unsigned long offset)
+static void a_outb(unsigned value, void __iomem *offset)
{
writeb(value, offset);
}
-static void a_outw(unsigned value, unsigned long offset)
+static void a_outw(unsigned value, void __iomem *offset)
{
writew(value, offset);
}
-static void a_outl(unsigned long value, unsigned long offset)
+static void a_outl(unsigned long value, void __iomem *offset)
{
writel(value, offset);
}
-static void a_outsl(unsigned long offset, const void *data, int count)
+static void a_outsl(void __iomem *offset, const void *data, int count)
{
- writesl((void*)offset, data, count);
+ writesl(offset, data, count);
}
-static unsigned a_inb(unsigned long offset)
+static unsigned a_inb(void __iomem *offset)
{
return readb(offset);
}
-static unsigned a_inw(unsigned long offset)
+static unsigned a_inw(void __iomem *offset)
{
return readw(offset);
}
-static unsigned long a_inl(unsigned long offset)
+static unsigned long a_inl(void __iomem *offset)
{
return readl(offset);
}
-static inline void a_insl(unsigned long offset, void *data, int count)
+static inline void a_insl(void __iomem *offset, void *data, int count)
{
- readsl((void*)offset, data, count);
+ readsl(offset, data, count);
}
/* access happens via a 32 bit bus */
@@ -1317,7 +1317,7 @@ static int smc91c111_probe(struct device_d *dev)
priv->miidev.address = 0;
priv->miidev.flags = 0;
priv->miidev.edev = edev;
- priv->base = dev->map_base;
+ priv->base = IOMEM(dev->map_base);
smc91c111_reset(edev);