From 3b393a43afb81270adece97740d78bc993005618 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 27 Jun 2016 09:12:53 +0200 Subject: net: dm9k: Fix buswidth setting for platform data probe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reported by: 张忠山 --- drivers/net/dm9k.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) (limited to 'drivers/net') 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) -- cgit v1.2.3