Message ID | 1376471493-22215-5-git-send-email-Julia.Lawall@lip6.fr |
---|---|
State | Accepted |
Commit | 7a96541a8e9fe720bec3900679ca514fefd2d516 |
Headers | show |
On Wed, 2013-08-14 at 11:11 +0200, Julia Lawall wrote: > From: Julia Lawall <Julia.Lawall@lip6.fr> > > Remove unneeded error handling on the result of a call to > platform_get_resource when the value is passed to devm_ioremap_resource. > > Move the call to platform_get_resource adjacent to the call to > devm_ioremap_resource to make the connection between them more clear. Pushed to l2-mtd.git, thanks!
diff --git a/drivers/mtd/devices/elm.c b/drivers/mtd/devices/elm.c index 4f683d2..d1dd6a3 100644 --- a/drivers/mtd/devices/elm.c +++ b/drivers/mtd/devices/elm.c @@ -368,11 +368,6 @@ static int elm_probe(struct platform_device *pdev) } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(&pdev->dev, "no memory resource defined\n"); - return -ENODEV; - } - info->elm_base = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(info->elm_base)) return PTR_ERR(info->elm_base); diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c index 440b570..235714a 100644 --- a/drivers/mtd/nand/txx9ndfmc.c +++ b/drivers/mtd/nand/txx9ndfmc.c @@ -281,12 +281,10 @@ static int __init txx9ndfmc_probe(struct platform_device *dev) unsigned long gbusclk = plat->gbus_clock; struct resource *res; - res = platform_get_resource(dev, IORESOURCE_MEM, 0); - if (!res) - return -ENODEV; drvdata = devm_kzalloc(&dev->dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) return -ENOMEM; + res = platform_get_resource(dev, IORESOURCE_MEM, 0); drvdata->base = devm_ioremap_resource(&dev->dev, res); if (IS_ERR(drvdata->base)) return PTR_ERR(drvdata->base);