mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-24 17:59:32 +00:00
Code Issues Releases Wiki Activity

mtd: Convert to devm_ioremap_resource()

Browse source 
Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.

devm_ioremap_resource() provides its own error messages so all explicit
error messages can be removed from the failure code paths.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Thierry Reding 2013-01-21 11:09:12 +01:00 committed by Greg Kroah-Hartman
parent a3e2cd7f24
commit b0de774c63
9 changed files with 44 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/mtd/devices/spear_smi.c
View file

@ -949,10 +949,9 @@ static int spear_smi_probe(struct platform_device *pdev)
smi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0); smi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
dev->io_base = devm_request_and_ioremap(&pdev->dev, smi_base); dev->io_base = devm_ioremap_resource(&pdev->dev, smi_base);
if (!dev->io_base) { if (IS_ERR(dev->io_base)) {
ret = -EIO; ret = PTR_ERR(dev->io_base);
dev_err(&pdev->dev, "devm_request_and_ioremap fail\n");
goto err; goto err;
} }

9
drivers/mtd/maps/autcpu12-nvram.c
View file

@ -16,6 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <linux/err.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <linux/types.h> #include <linux/types.h>
@ -55,12 +56,10 @@ static int autcpu12_nvram_probe(struct platform_device *pdev)
priv->map.bankwidth = 4; priv->map.bankwidth = 4;
priv->map.phys = res->start; priv->map.phys = res->start;
priv->map.size = resource_size(res); priv->map.size = resource_size(res);
priv->map.virt = devm_request_and_ioremap(&pdev->dev, res); priv->map.virt = devm_ioremap_resource(&pdev->dev, res);
strcpy((char *)priv->map.name, res->name); strcpy((char *)priv->map.name, res->name);
if (!priv->map.virt) { if (IS_ERR(priv->map.virt))
dev_err(&pdev->dev, "failed to remap mem resource\n"); return PTR_ERR(priv->map.virt);
return -EBUSY;
}
simple_map_init(&priv->map); simple_map_init(&priv->map);

8
drivers/mtd/maps/lantiq-flash.c
View file

@ -7,6 +7,7 @@
* Copyright (C) 2010 John Crispin <blogic@openwrt.org> * Copyright (C) 2010 John Crispin <blogic@openwrt.org>
*/ */
#include <linux/err.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
@ -136,10 +137,9 @@ ltq_mtd_probe(struct platform_device *pdev)
ltq_mtd->map = kzalloc(sizeof(struct map_info), GFP_KERNEL); ltq_mtd->map = kzalloc(sizeof(struct map_info), GFP_KERNEL);
ltq_mtd->map->phys = ltq_mtd->res->start; ltq_mtd->map->phys = ltq_mtd->res->start;
ltq_mtd->map->size = resource_size(ltq_mtd->res); ltq_mtd->map->size = resource_size(ltq_mtd->res);
ltq_mtd->map->virt = devm_request_and_ioremap(&pdev->dev, ltq_mtd->res); ltq_mtd->map->virt = devm_ioremap_resource(&pdev->dev, ltq_mtd->res);
if (!ltq_mtd->map->virt) { if (IS_ERR(ltq_mtd->map->virt)) {
dev_err(&pdev->dev, "failed to remap mem resource\n"); err = PTR_ERR(ltq_mtd->map->virt);
err = -EBUSY;
goto err_out; goto err_out;
} }

33
drivers/mtd/nand/fsmc_nand.c
View file

@ -937,42 +937,35 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
if (!res) if (!res)
return -EINVAL; return -EINVAL;
host->data_va = devm_request_and_ioremap(&pdev->dev, res); host->data_va = devm_ioremap_resource(&pdev->dev, res);
if (!host->data_va) { if (IS_ERR(host->data_va))
dev_err(&pdev->dev, "data ioremap failed\n"); return PTR_ERR(host->data_va);
return -ENOMEM;
}
host->data_pa = (dma_addr_t)res->start; host->data_pa = (dma_addr_t)res->start;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_addr"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_addr");
if (!res) if (!res)
return -EINVAL; return -EINVAL;
host->addr_va = devm_request_and_ioremap(&pdev->dev, res); host->addr_va = devm_ioremap_resource(&pdev->dev, res);
if (!host->addr_va) { if (IS_ERR(host->addr_va))
dev_err(&pdev->dev, "ale ioremap failed\n"); return PTR_ERR(host->addr_va);
return -ENOMEM;
}
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_cmd"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_cmd");
if (!res) if (!res)
return -EINVAL; return -EINVAL;
host->cmd_va = devm_request_and_ioremap(&pdev->dev, res); host->cmd_va = devm_ioremap_resource(&pdev->dev, res);
if (!host->cmd_va) { if (IS_ERR(host->cmd_va))
dev_err(&pdev->dev, "ale ioremap failed\n"); return PTR_ERR(host->cmd_va);
return -ENOMEM;
}
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fsmc_regs"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fsmc_regs");
if (!res) if (!res)
return -EINVAL; return -EINVAL;
host->regs_va = devm_request_and_ioremap(&pdev->dev, res); host->regs_va = devm_ioremap_resource(&pdev->dev, res);
if (!host->regs_va) { if (IS_ERR(host->regs_va))
dev_err(&pdev->dev, "regs ioremap failed\n"); return PTR_ERR(host->regs_va);
return -ENOMEM;
}
host->clk = clk_get(&pdev->dev, NULL); host->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(host->clk)) { if (IS_ERR(host->clk)) {

9
drivers/mtd/nand/lpc32xx_mlc.c
View file

@ -677,11 +677,10 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
return -ENXIO; return -ENXIO;
} }
host->io_base = devm_request_and_ioremap(&pdev->dev, rc); host->io_base = devm_ioremap_resource(&pdev->dev, rc);
if (host->io_base == NULL) { if (IS_ERR(host->io_base))
dev_err(&pdev->dev, "ioremap failed\n"); return PTR_ERR(host->io_base);
return -EIO;
}
host->io_base_phy = rc->start; host->io_base_phy = rc->start;
mtd = &host->mtd; mtd = &host->mtd;

8
drivers/mtd/nand/lpc32xx_slc.c
View file

@ -778,11 +778,9 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
} }
host->io_base_dma = rc->start; host->io_base_dma = rc->start;
host->io_base = devm_request_and_ioremap(&pdev->dev, rc); host->io_base = devm_ioremap_resource(&pdev->dev, rc);
if (host->io_base == NULL) { if (IS_ERR(host->io_base))
dev_err(&pdev->dev, "ioremap failed\n"); return PTR_ERR(host->io_base);
return -ENOMEM;
}
if (pdev->dev.of_node) if (pdev->dev.of_node)
host->ncfg = lpc32xx_parse_dt(&pdev->dev); host->ncfg = lpc32xx_parse_dt(&pdev->dev);

12
drivers/mtd/nand/mxc_nand.c
View file

@ -1437,9 +1437,9 @@ static int mxcnd_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) if (!res)
return -ENODEV; return -ENODEV;
host->regs_ip = devm_request_and_ioremap(&pdev->dev, res); host->regs_ip = devm_ioremap_resource(&pdev->dev, res);
if (!host->regs_ip) if (IS_ERR(host->regs_ip))
return -ENOMEM; return PTR_ERR(host->regs_ip);
res = platform_get_resource(pdev, IORESOURCE_MEM, 1); res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
} else { } else {
@ -1449,9 +1449,9 @@ static int mxcnd_probe(struct platform_device *pdev)
if (!res) if (!res)
return -ENODEV; return -ENODEV;
host->base = devm_request_and_ioremap(&pdev->dev, res); host->base = devm_ioremap_resource(&pdev->dev, res);
if (!host->base) if (IS_ERR(host->base))
return -ENOMEM; return PTR_ERR(host->base);
host->main_area0 = host->base; host->main_area0 = host->base;

7
drivers/mtd/nand/s3c2410.c
View file

@ -952,10 +952,9 @@ static int s3c24xx_nand_probe(struct platform_device *pdev)
info->platform = plat; info->platform = plat;
info->cpu_type = cpu_type; info->cpu_type = cpu_type;
info->regs = devm_request_and_ioremap(&pdev->dev, res); info->regs = devm_ioremap_resource(&pdev->dev, res);
if (info->regs == NULL) { if (IS_ERR(info->regs)) {
dev_err(&pdev->dev, "cannot reserve register region\n"); err = PTR_ERR(info->regs);
err = -EIO;
goto exit_error; goto exit_error;
} }

7
drivers/mtd/nand/txx9ndfmc.c
View file

@ -9,6 +9,7 @@
* (C) Copyright TOSHIBA CORPORATION 2004-2007 * (C) Copyright TOSHIBA CORPORATION 2004-2007
* All Rights Reserved. * All Rights Reserved.
*/ */
#include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/module.h> #include <linux/module.h>
@ -286,9 +287,9 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)
drvdata = devm_kzalloc(&dev->dev, sizeof(*drvdata), GFP_KERNEL); drvdata = devm_kzalloc(&dev->dev, sizeof(*drvdata), GFP_KERNEL);
if (!drvdata) if (!drvdata)
return -ENOMEM; return -ENOMEM;
drvdata->base = devm_request_and_ioremap(&dev->dev, res); drvdata->base = devm_ioremap_resource(&dev->dev, res);
if (!drvdata->base) if (IS_ERR(drvdata->base))
return -EBUSY; return PTR_ERR(drvdata->base);
hold = plat->hold ?: 20; /* tDH */ hold = plat->hold ?: 20; /* tDH */
spw = plat->spw ?: 90; /* max(tREADID, tWP, tRP) */ spw = plat->spw ?: 90; /* max(tREADID, tWP, tRP) */