diff options
author | Madalin Bucur <madalin.bucur@freescale.com> | 2014-11-20 15:04:59 (GMT) |
---|---|---|
committer | Madalin Bucur <madalin.bucur@freescale.com> | 2015-02-25 16:26:59 (GMT) |
commit | 6970c7d5d0fbf914ff300f45273cbdf83c86c2ed (patch) | |
tree | 164570f0b985658ec450d9a938c5dcfe3a692f34 /drivers/net/ethernet/freescale/dpa/dpaa_eth.c | |
parent | 8e0373b33dfc8d955a92c57895b96b83bf3efb6d (diff) | |
download | linux-fsl-qoriq-6970c7d5d0fbf914ff300f45273cbdf83c86c2ed.tar.xz |
dpaa_eth: make use of devm_alloc_percpu()
Use resource managed variant of alloc_percpu().
Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com>
Change-Id: I51f3fe816792535bdf01827c77a6f504f9c22e7a
Reviewed-on: http://git.am.freescale.net:8181/24141
Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com>
Tested-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/dpa/dpaa_eth.c')
-rw-r--r-- | drivers/net/ethernet/freescale/dpa/dpaa_eth.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth.c index e0fad81..56d4dc9 100644 --- a/drivers/net/ethernet/freescale/dpa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth.c @@ -771,7 +771,7 @@ dpa_priv_bp_probe(struct device *dev) return ERR_PTR(-ENOMEM); } - dpa_bp->percpu_count = alloc_percpu(*dpa_bp->percpu_count); + dpa_bp->percpu_count = devm_alloc_percpu(dev, *dpa_bp->percpu_count); dpa_bp->target_count = CONFIG_FSL_DPAA_ETH_MAX_BUF_COUNT; dpa_bp->seed_cb = dpa_bp_priv_seed; @@ -1044,10 +1044,10 @@ dpaa_eth_priv_probe(struct platform_device *_of_dev) } #endif - priv->percpu_priv = alloc_percpu(*priv->percpu_priv); + priv->percpu_priv = devm_alloc_percpu(dev, *priv->percpu_priv); if (priv->percpu_priv == NULL) { - dev_err(dev, "alloc_percpu() failed\n"); + dev_err(dev, "devm_alloc_percpu() failed\n"); err = -ENOMEM; goto alloc_percpu_failed; } @@ -1080,11 +1080,10 @@ dpaa_eth_priv_probe(struct platform_device *_of_dev) netdev_init_failed: napi_add_failed: dpa_private_napi_del(net_dev); - free_percpu(priv->percpu_priv); +alloc_percpu_failed: #ifdef CONFIG_FMAN_PFC pfc_mapping_failed: #endif -alloc_percpu_failed: dpa_fq_free(dev, &priv->dpa_fq_list); fq_alloc_failed: qman_release_cgrid(priv->ingress_cgr.cgrid); @@ -1098,7 +1097,6 @@ get_channel_failed: dpa_bp_free(priv, priv->dpa_bp); bp_create_failed: fq_probe_failed: - devm_kfree(dev, buf_layout); alloc_failed: mac_probe_failed: dev_set_drvdata(dev, NULL); |