summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-06-27 09:12:53 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-07-05 09:02:40 +0200
commit3b393a43afb81270adece97740d78bc993005618 (patch)
tree0791584e10147216acf7af1a10e1be66e6bac541 /drivers/net
parent341aca3762be2cacdeffecd8ec6c793bf2da7f92 (diff)
downloadbarebox-3b393a43afb81270adece97740d78bc993005618.tar.gz
barebox-3b393a43afb81270adece97740d78bc993005618.tar.xz
net: dm9k: Fix buswidth setting for platform data probe
priv->buswidth expects IORESOURCE_MEM_* macros which are not identical to the integer byte bus width, so calling dm9000_setup_buswidth() for the platform_data case is wrong. fixes: d818f02 net: dm9k: add device tree support Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Reported by: 张忠山 <zzs213@126.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/dm9k.c42
1 files changed, 18 insertions, 24 deletions
diff --git a/drivers/net/dm9k.c b/drivers/net/dm9k.c
index acc0abbc48..25f08602f6 100644
--- a/drivers/net/dm9k.c
+++ b/drivers/net/dm9k.c
@@ -729,26 +729,6 @@ static int dm9k_init_dev(struct eth_device *edev)
return 0;
}
-static int dm9000_setup_buswidth(struct device_d *dev, struct dm9k *priv, uint32_t width)
-{
- switch (width) {
- case 1:
- priv->buswidth = IORESOURCE_MEM_8BIT;
- break;
- case 2:
- priv->buswidth = IORESOURCE_MEM_16BIT;
- break;
- case 4:
- priv->buswidth = IORESOURCE_MEM_32BIT;
- break;
- default:
- dev_err(dev, "Wrong io resource size\n");
- return -EINVAL;
- }
-
- return 0;
-}
-
static int dm9000_parse_dt(struct device_d *dev, struct dm9k *priv)
{
struct device_node *np = dev->device_node;
@@ -768,19 +748,33 @@ static int dm9000_parse_dt(struct device_d *dev, struct dm9k *priv)
prop = 1;
}
- return dm9000_setup_buswidth(dev, priv, prop);
+ switch (prop) {
+ case 1:
+ priv->buswidth = IORESOURCE_MEM_8BIT;
+ break;
+ case 2:
+ priv->buswidth = IORESOURCE_MEM_16BIT;
+ break;
+ case 4:
+ priv->buswidth = IORESOURCE_MEM_32BIT;
+ break;
+ default:
+ dev_err(dev, "Wrong io resource size\n");
+ return -EINVAL;
+ }
+
+ return 0;
}
static int dm9000_parse_pdata(struct device_d *dev, struct dm9k *priv)
{
struct dm9000_platform_data *pdata = dev->platform_data;
- uint32_t width;
priv->srom = pdata->srom;
- width = dev->resource[0].flags & IORESOURCE_MEM_TYPE_MASK;
+ priv->buswidth = dev->resource[0].flags & IORESOURCE_MEM_TYPE_MASK;
- return dm9000_setup_buswidth(dev, priv, width);
+ return 0;
}
static int dm9k_probe(struct device_d *dev)