| Message ID | 1376471493-22215-26-git-send-email-Julia.Lawall@lip6.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> -----Original Message----- > From: Julia Lawall [mailto:Julia.Lawall@lip6.fr] > Sent: Wednesday, August 14, 2013 5:11 PM > To: Barry Song > Cc: kernel-janitors@vger.kernel.org; Mark Brown; > linux-arm-kernel@lists.infradead.org; linux-spi@vger.kernel.org; > linux-kernel@vger.kernel.org > Subject: [PATCH 25/29] drivers/spi/spi-sirf.c: simplify use of > devm_ioremap_resource > > 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. > > A simplified version of the semantic patch that makes this change is as > follows: (http://coccinelle.lip6.fr/) > > // <smpl> > @@ > expression pdev,res,n,e,e1; > expression ret != 0; > identifier l; > @@ > > - res = platform_get_resource(pdev, IORESOURCE_MEM, n); > ... when != res > - if (res == NULL) { ... \(goto l;\|return ret;\) } > ... when != res > + res = platform_get_resource(pdev, IORESOURCE_MEM, n); > e = devm_ioremap_resource(e1, res); > // </smpl> > > Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Acked-by: Barry Song <Baohua.Song@csr.com> > > --- > drivers/spi/spi-sirf.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
On Wed, Aug 14, 2013 at 11:11:29AM +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. Applied, thanks.
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c index 62c92c3..546fae2 100644 --- a/drivers/spi/spi-sirf.c +++ b/drivers/spi/spi-sirf.c @@ -588,12 +588,6 @@ static int spi_sirfsoc_probe(struct platform_device *pdev) platform_set_drvdata(pdev, master); sspi = spi_master_get_devdata(master); - mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!mem_res) { - dev_err(&pdev->dev, "Unable to get IO resource\n"); - ret = -ENODEV; - goto free_master; - } master->num_chipselect = num_cs; for (i = 0; i < master->num_chipselect; i++) { @@ -620,6 +614,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev) } } + mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); sspi->base = devm_ioremap_resource(&pdev->dev, mem_res); if (IS_ERR(sspi->base)) { ret = PTR_ERR(sspi->base);