diff options
| author | Jonas Gorski <jonas.gorski@gmail.com> | 2017-10-02 11:41:43 +0200 |
|---|---|---|
| committer | Jonas Gorski <jonas.gorski@gmail.com> | 2017-12-16 12:57:05 +0100 |
| commit | 49c3b1c4555db688c4c514d1284254f954e46180 (patch) | |
| tree | 4e8bb279e592509354f071118ebfb24a3690d7bb /target/linux/brcm63xx/patches-4.4/424-bcm63xx_enet_no_request_mem_region.patch | |
| parent | aba4e29eadfb82ef7f52f85cdb4cd10a4abad622 (diff) | |
| download | upstream-49c3b1c4555db688c4c514d1284254f954e46180.tar.gz upstream-49c3b1c4555db688c4c514d1284254f954e46180.tar.bz2 upstream-49c3b1c4555db688c4c514d1284254f954e46180.zip | |
brcm63xx: backport enet cleanup patches
Align with upstream version, mostly non-fixes and small clean ups.
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Diffstat (limited to 'target/linux/brcm63xx/patches-4.4/424-bcm63xx_enet_no_request_mem_region.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-4.4/424-bcm63xx_enet_no_request_mem_region.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/brcm63xx/patches-4.4/424-bcm63xx_enet_no_request_mem_region.patch b/target/linux/brcm63xx/patches-4.4/424-bcm63xx_enet_no_request_mem_region.patch index 24dd27a292..5762ae7513 100644 --- a/target/linux/brcm63xx/patches-4.4/424-bcm63xx_enet_no_request_mem_region.patch +++ b/target/linux/brcm63xx/patches-4.4/424-bcm63xx_enet_no_request_mem_region.patch @@ -1,15 +1,15 @@ --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -2784,12 +2784,6 @@ static int bcm_enetsw_probe(struct platf +@@ -2776,9 +2776,9 @@ static int bcm_enetsw_probe(struct platf if (ret) goto out; -- if (!request_mem_region(res_mem->start, resource_size(res_mem), -- "bcm63xx_enetsw")) { -- ret = -EBUSY; -- goto out; -- } -- - priv->base = ioremap(res_mem->start, resource_size(res_mem)); - if (priv->base == NULL) { - ret = -ENOMEM; +- priv->base = devm_ioremap_resource(&pdev->dev, res_mem); +- if (IS_ERR(priv->base)) { +- ret = PTR_ERR(priv->base); ++ priv->base = devm_ioremap(&pdev->dev, res_mem->start, resource_size(res_mem)); ++ if (priv->base == NULL) { ++ ret = -ENOMEM; + goto out; + } + |