Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-12 14:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

mtd: nand/fsmc: Use devm routines

Browse Source 
fsmc_nand driver currently uses normal kzalloc, request_mem etc routines. This
patch replaces these routines with devm_kzalloc and devm_request_mem_region etc.
Consequently, the error and driver removal scenarios are curtailed.

Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
Reviewed-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Vipin Kumar 2012-03-14 11:47:15 +05:30 committed by David Woodhouse
parent e2f6bce8d9
commit 82b9dbe2e0
1 changed files with 45 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
drivers/mtd/nand/fsmc_nand.c
View File

@ -298,11 +298,6 @@ struct fsmc_nand_data {
unsigned int bank;
struct clk *clk;
struct resource *resregs;
struct resource *rescmd;
struct resource *resaddr;
struct resource *resdata;
struct fsmc_nand_timings *dev_timings;
void __iomem *data_va;
@ -706,88 +701,81 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
}
/* Allocate memory for the device structure (and zero it) */
host = kzalloc(sizeof(*host), GFP_KERNEL);
host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL);
if (!host) {
dev_err(&pdev->dev, "failed to allocate device structure\n");
return -ENOMEM;
}
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_data");
if (!res) {
ret = -EIO;
goto err_probe1;
if (!res)
return -EINVAL;
if (!devm_request_mem_region(&pdev->dev, res->start, resource_size(res),
pdev->name)) {
dev_err(&pdev->dev, "Failed to get memory data resourse\n");
return -ENOENT;
}
host->resdata = request_mem_region(res->start, resource_size(res),
pdev->name);
if (!host->resdata) {
ret = -EIO;
goto err_probe1;
}
host->data_va = ioremap(res->start, resource_size(res));
host->data_va = devm_ioremap(&pdev->dev, res->start,
resource_size(res));
if (!host->data_va) {
ret = -EIO;
goto err_probe1;
dev_err(&pdev->dev, "data ioremap failed\n");
return -ENOMEM;
}
host->resaddr = request_mem_region(res->start + pdata->ale_off,
resource_size(res), pdev->name);
if (!host->resaddr) {
ret = -EIO;
goto err_probe1;
if (!devm_request_mem_region(&pdev->dev, res->start + pdata->ale_off,
resource_size(res), pdev->name)) {
dev_err(&pdev->dev, "Failed to get memory ale resourse\n");
return -ENOENT;
}
host->addr_va = ioremap(res->start + pdata->ale_off,
host->addr_va = devm_ioremap(&pdev->dev, res->start + pdata->ale_off,
resource_size(res));
if (!host->addr_va) {
ret = -EIO;
goto err_probe1;
dev_err(&pdev->dev, "ale ioremap failed\n");
return -ENOMEM;
}
host->rescmd = request_mem_region(res->start + pdata->cle_off,
resource_size(res), pdev->name);
if (!host->rescmd) {
ret = -EIO;
goto err_probe1;
if (!devm_request_mem_region(&pdev->dev, res->start + pdata->cle_off,
resource_size(res), pdev->name)) {
dev_err(&pdev->dev, "Failed to get memory cle resourse\n");
return -ENOENT;
}
host->cmd_va = ioremap(res->start + pdata->cle_off, resource_size(res));
host->cmd_va = devm_ioremap(&pdev->dev, res->start + pdata->cle_off,
resource_size(res));
if (!host->cmd_va) {
ret = -EIO;
goto err_probe1;
dev_err(&pdev->dev, "ale ioremap failed\n");
return -ENOMEM;
}
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fsmc_regs");
if (!res) {
ret = -EIO;
goto err_probe1;
if (!res)
return -EINVAL;
if (!devm_request_mem_region(&pdev->dev, res->start, resource_size(res),
pdev->name)) {
dev_err(&pdev->dev, "Failed to get memory regs resourse\n");
return -ENOENT;
}
host->resregs = request_mem_region(res->start, resource_size(res),
pdev->name);
if (!host->resregs) {
ret = -EIO;
goto err_probe1;
}
host->regs_va = ioremap(res->start, resource_size(res));
host->regs_va = devm_ioremap(&pdev->dev, res->start,
resource_size(res));
if (!host->regs_va) {
ret = -EIO;
goto err_probe1;
dev_err(&pdev->dev, "regs ioremap failed\n");
return -ENOMEM;
}
host->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(host->clk)) {
dev_err(&pdev->dev, "failed to fetch block clock\n");
ret = PTR_ERR(host->clk);
host->clk = NULL;
goto err_probe1;
return PTR_ERR(host->clk);
}
ret = clk_enable(host->clk);
if (ret)
goto err_probe1;
goto err_clk_enable;
/*
* This device ID is actually a common AMBA ID as used on the
@ -852,7 +840,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
if (nand_scan_ident(&host->mtd, 1, NULL)) {
ret = -ENXIO;
dev_err(&pdev->dev, "No NAND Device found!\n");
goto err_probe;
goto err_scan_ident;
}
if (AMBA_REV_BITS(host->pid) >= 8) {
@ -927,32 +915,10 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
return 0;
err_probe:
err_scan_ident:
clk_disable(host->clk);
err_probe1:
if (host->clk)
clk_put(host->clk);
if (host->regs_va)
iounmap(host->regs_va);
if (host->resregs)
release_mem_region(host->resregs->start,
resource_size(host->resregs));
if (host->cmd_va)
iounmap(host->cmd_va);
if (host->rescmd)
release_mem_region(host->rescmd->start,
resource_size(host->rescmd));
if (host->addr_va)
iounmap(host->addr_va);
if (host->resaddr)
release_mem_region(host->resaddr->start,
resource_size(host->resaddr));
if (host->data_va)
iounmap(host->data_va);
if (host->resdata)
release_mem_region(host->resdata->start,
resource_size(host->resdata));
kfree(host);
err_clk_enable:
clk_put(host->clk);
return ret;
}
@ -969,22 +935,8 @@ static int fsmc_nand_remove(struct platform_device *pdev)
nand_release(&host->mtd);
clk_disable(host->clk);
clk_put(host->clk);
iounmap(host->regs_va);
release_mem_region(host->resregs->start,
resource_size(host->resregs));
iounmap(host->cmd_va);
release_mem_region(host->rescmd->start,
resource_size(host->rescmd));
iounmap(host->addr_va);
release_mem_region(host->resaddr->start,
resource_size(host->resaddr));
iounmap(host->data_va);
release_mem_region(host->resdata->start,
resource_size(host->resdata));
kfree(host);
}
return 0;
}