AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-04-06 20:09:59 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

crypto: ux500 - Use devm_xxx() managed function

Browse Source 
Using the devm_xxx() managed function to stripdown the error
and remove code.
In the same time, we replace request_mem_region/ioremap by the unified
devm_ioremap_resource() function.

Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
LABBE Corentin 2015-10-12 19:47:04 +02:00 committed by Herbert Xu
parent b0e8b3417a
commit 5a4eea2658
2 changed files with 16 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
drivers/crypto/ux500/cryp/cryp_core.c
View File

@ -1414,7 +1414,7 @@ static int ux500_cryp_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
dev_dbg(dev, "[%s]", __func__); dev_dbg(dev, "[%s]", __func__);
device_data = kzalloc(sizeof(struct cryp_device_data), GFP_ATOMIC); device_data = devm_kzalloc(dev, sizeof(*device_data), GFP_ATOMIC);
if (!device_data) { if (!device_data) {
dev_err(dev, "[%s]: kzalloc() failed!", __func__); dev_err(dev, "[%s]: kzalloc() failed!", __func__);
ret = -ENOMEM; ret = -ENOMEM;
@ -1435,23 +1435,15 @@ static int ux500_cryp_probe(struct platform_device *pdev)
dev_err(dev, "[%s]: platform_get_resource() failed", dev_err(dev, "[%s]: platform_get_resource() failed",
__func__); __func__);
ret = -ENODEV; ret = -ENODEV;
goto out_kfree; goto out;
}
res = request_mem_region(res->start, resource_size(res), pdev->name);
if (res == NULL) {
dev_err(dev, "[%s]: request_mem_region() failed",
__func__);
ret = -EBUSY;
goto out_kfree;
} }
device_data->phybase = res->start; device_data->phybase = res->start;
device_data->base = ioremap(res->start, resource_size(res)); device_data->base = devm_ioremap_resource(dev, res);
if (!device_data->base) { if (!device_data->base) {
dev_err(dev, "[%s]: ioremap failed!", __func__); dev_err(dev, "[%s]: ioremap failed!", __func__);
ret = -ENOMEM; ret = -ENOMEM;
goto out_free_mem; goto out;
} }
spin_lock_init(&device_data->ctx_lock); spin_lock_init(&device_data->ctx_lock);
@ -1463,11 +1455,11 @@ static int ux500_cryp_probe(struct platform_device *pdev)
dev_err(dev, "[%s]: could not get cryp regulator", __func__); dev_err(dev, "[%s]: could not get cryp regulator", __func__);
ret = PTR_ERR(device_data->pwr_regulator); ret = PTR_ERR(device_data->pwr_regulator);
device_data->pwr_regulator = NULL; device_data->pwr_regulator = NULL;
goto out_unmap; goto out;
} }
/* Enable the clk for CRYP hardware block */ /* Enable the clk for CRYP hardware block */
device_data->clk = clk_get(&pdev->dev, NULL); device_data->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(device_data->clk)) { if (IS_ERR(device_data->clk)) {
dev_err(dev, "[%s]: clk_get() failed!", __func__); dev_err(dev, "[%s]: clk_get() failed!", __func__);
ret = PTR_ERR(device_data->clk); ret = PTR_ERR(device_data->clk);
@ -1477,7 +1469,7 @@ static int ux500_cryp_probe(struct platform_device *pdev)
ret = clk_prepare(device_data->clk); ret = clk_prepare(device_data->clk);
if (ret) { if (ret) {
dev_err(dev, "[%s]: clk_prepare() failed!", __func__); dev_err(dev, "[%s]: clk_prepare() failed!", __func__);
goto out_clk; goto out_regulator;
} }
/* Enable device power (and clock) */ /* Enable device power (and clock) */
@ -1510,11 +1502,8 @@ static int ux500_cryp_probe(struct platform_device *pdev)
goto out_power; goto out_power;
} }
ret = request_irq(res_irq->start, ret = devm_request_irq(&pdev->dev, res_irq->start,
cryp_interrupt_handler, cryp_interrupt_handler, 0, "cryp1", device_data);
0,
"cryp1",
device_data);
if (ret) { if (ret) {
dev_err(dev, "[%s]: Unable to request IRQ", __func__); dev_err(dev, "[%s]: Unable to request IRQ", __func__);
goto out_power; goto out_power;
@ -1550,28 +1539,15 @@ static int ux500_cryp_probe(struct platform_device *pdev)
out_clk_unprepare: out_clk_unprepare:
clk_unprepare(device_data->clk); clk_unprepare(device_data->clk);
out_clk:
clk_put(device_data->clk);
out_regulator: out_regulator:
regulator_put(device_data->pwr_regulator); regulator_put(device_data->pwr_regulator);
out_unmap:
iounmap(device_data->base);
out_free_mem:
release_mem_region(res->start, resource_size(res));
out_kfree:
kfree(device_data);
out: out:
return ret; return ret;
} }
static int ux500_cryp_remove(struct platform_device *pdev) static int ux500_cryp_remove(struct platform_device *pdev)
{ {
struct resource *res = NULL;
struct resource *res_irq = NULL;
struct cryp_device_data *device_data; struct cryp_device_data *device_data;
dev_dbg(&pdev->dev, "[%s]", __func__); dev_dbg(&pdev->dev, "[%s]", __func__);
@ -1607,37 +1583,18 @@ static int ux500_cryp_remove(struct platform_device *pdev)
if (list_empty(&driver_data.device_list.k_list)) if (list_empty(&driver_data.device_list.k_list))
cryp_algs_unregister_all(); cryp_algs_unregister_all();
res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!res_irq)
dev_err(&pdev->dev, "[%s]: IORESOURCE_IRQ, unavailable",
__func__);
else {
disable_irq(res_irq->start);
free_irq(res_irq->start, device_data);
}
if (cryp_disable_power(&pdev->dev, device_data, false)) if (cryp_disable_power(&pdev->dev, device_data, false))
dev_err(&pdev->dev, "[%s]: cryp_disable_power() failed", dev_err(&pdev->dev, "[%s]: cryp_disable_power() failed",
__func__); __func__);
clk_unprepare(device_data->clk); clk_unprepare(device_data->clk);
clk_put(device_data->clk);
regulator_put(device_data->pwr_regulator); regulator_put(device_data->pwr_regulator);
iounmap(device_data->base);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (res)
release_mem_region(res->start, resource_size(res));
kfree(device_data);
return 0; return 0;
} }
static void ux500_cryp_shutdown(struct platform_device *pdev) static void ux500_cryp_shutdown(struct platform_device *pdev)
{ {
struct resource *res_irq = NULL;
struct cryp_device_data *device_data; struct cryp_device_data *device_data;
dev_dbg(&pdev->dev, "[%s]", __func__); dev_dbg(&pdev->dev, "[%s]", __func__);
@ -1673,15 +1630,6 @@ static void ux500_cryp_shutdown(struct platform_device *pdev)
if (list_empty(&driver_data.device_list.k_list)) if (list_empty(&driver_data.device_list.k_list))
cryp_algs_unregister_all(); cryp_algs_unregister_all();
res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!res_irq)
dev_err(&pdev->dev, "[%s]: IORESOURCE_IRQ, unavailable",
__func__);
else {
disable_irq(res_irq->start);
free_irq(res_irq->start, device_data);
}
if (cryp_disable_power(&pdev->dev, device_data, false)) if (cryp_disable_power(&pdev->dev, device_data, false))
dev_err(&pdev->dev, "[%s]: cryp_disable_power() failed", dev_err(&pdev->dev, "[%s]: cryp_disable_power() failed",
__func__); __func__);

49
drivers/crypto/ux500/hash/hash_core.c
View File

@ -1657,7 +1657,7 @@ static int ux500_hash_probe(struct platform_device *pdev)
struct hash_device_data *device_data; struct hash_device_data *device_data;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
device_data = kzalloc(sizeof(*device_data), GFP_ATOMIC); device_data = devm_kzalloc(dev, sizeof(*device_data), GFP_ATOMIC);
if (!device_data) { if (!device_data) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
@ -1670,22 +1670,15 @@ static int ux500_hash_probe(struct platform_device *pdev)
if (!res) { if (!res) {
dev_dbg(dev, "%s: platform_get_resource() failed!\n", __func__); dev_dbg(dev, "%s: platform_get_resource() failed!\n", __func__);
ret = -ENODEV; ret = -ENODEV;
goto out_kfree; goto out;
}
res = request_mem_region(res->start, resource_size(res), pdev->name);
if (res == NULL) {
dev_dbg(dev, "%s: request_mem_region() failed!\n", __func__);
ret = -EBUSY;
goto out_kfree;
} }
device_data->phybase = res->start; device_data->phybase = res->start;
device_data->base = ioremap(res->start, resource_size(res)); device_data->base = devm_ioremap_resource(dev, res);
if (!device_data->base) { if (!device_data->base) {
dev_err(dev, "%s: ioremap() failed!\n", __func__); dev_err(dev, "%s: ioremap() failed!\n", __func__);
ret = -ENOMEM; ret = -ENOMEM;
goto out_free_mem; goto out;
} }
spin_lock_init(&device_data->ctx_lock); spin_lock_init(&device_data->ctx_lock);
spin_lock_init(&device_data->power_state_lock); spin_lock_init(&device_data->power_state_lock);
@ -1696,11 +1689,11 @@ static int ux500_hash_probe(struct platform_device *pdev)
dev_err(dev, "%s: regulator_get() failed!\n", __func__); dev_err(dev, "%s: regulator_get() failed!\n", __func__);
ret = PTR_ERR(device_data->regulator); ret = PTR_ERR(device_data->regulator);
device_data->regulator = NULL; device_data->regulator = NULL;
goto out_unmap; goto out;
} }
/* Enable the clock for HASH1 hardware block */ /* Enable the clock for HASH1 hardware block */
device_data->clk = clk_get(dev, NULL); device_data->clk = devm_clk_get(dev, NULL);
if (IS_ERR(device_data->clk)) { if (IS_ERR(device_data->clk)) {
dev_err(dev, "%s: clk_get() failed!\n", __func__); dev_err(dev, "%s: clk_get() failed!\n", __func__);
ret = PTR_ERR(device_data->clk); ret = PTR_ERR(device_data->clk);
@ -1710,7 +1703,7 @@ static int ux500_hash_probe(struct platform_device *pdev)
ret = clk_prepare(device_data->clk); ret = clk_prepare(device_data->clk);
if (ret) { if (ret) {
dev_err(dev, "%s: clk_prepare() failed!\n", __func__); dev_err(dev, "%s: clk_prepare() failed!\n", __func__);
goto out_clk; goto out_regulator;
} }
/* Enable device power (and clock) */ /* Enable device power (and clock) */
@ -1752,20 +1745,9 @@ static int ux500_hash_probe(struct platform_device *pdev)
out_clk_unprepare: out_clk_unprepare:
clk_unprepare(device_data->clk); clk_unprepare(device_data->clk);
out_clk:
clk_put(device_data->clk);
out_regulator: out_regulator:
regulator_put(device_data->regulator); regulator_put(device_data->regulator);
out_unmap:
iounmap(device_data->base);
out_free_mem:
release_mem_region(res->start, resource_size(res));
out_kfree:
kfree(device_data);
out: out:
return ret; return ret;
} }
@ -1776,7 +1758,6 @@ static int ux500_hash_probe(struct platform_device *pdev)
*/ */
static int ux500_hash_remove(struct platform_device *pdev) static int ux500_hash_remove(struct platform_device *pdev)
{ {
struct resource *res;
struct hash_device_data *device_data; struct hash_device_data *device_data;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@ -1816,17 +1797,8 @@ static int ux500_hash_remove(struct platform_device *pdev)
__func__); __func__);
clk_unprepare(device_data->clk); clk_unprepare(device_data->clk);
clk_put(device_data->clk);
regulator_put(device_data->regulator); regulator_put(device_data->regulator);
iounmap(device_data->base);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (res)
release_mem_region(res->start, resource_size(res));
kfree(device_data);
return 0; return 0;
} }
@ -1836,7 +1808,6 @@ static int ux500_hash_remove(struct platform_device *pdev)
*/ */
static void ux500_hash_shutdown(struct platform_device *pdev) static void ux500_hash_shutdown(struct platform_device *pdev)
{ {
struct resource *res = NULL;
struct hash_device_data *device_data; struct hash_device_data *device_data;
device_data = platform_get_drvdata(pdev); device_data = platform_get_drvdata(pdev);
@ -1870,12 +1841,6 @@ static void ux500_hash_shutdown(struct platform_device *pdev)
if (list_empty(&driver_data.device_list.k_list)) if (list_empty(&driver_data.device_list.k_list))
ahash_algs_unregister_all(device_data); ahash_algs_unregister_all(device_data);
iounmap(device_data->base);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (res)
release_mem_region(res->start, resource_size(res));
if (hash_disable_power(device_data, false)) if (hash_disable_power(device_data, false))
dev_err(&pdev->dev, "%s: hash_disable_power() failed\n", dev_err(&pdev->dev, "%s: hash_disable_power() failed\n",
__func__); __func__);