| Message ID | 1480433332-2090-1-git-send-email-fabio.estevam@nxp.com |
|---|---|
| State | Accepted |
| Commit | 4339b7fdbb90ab579862b0fcde6ee0f342f12692 |
| Headers | show |
On 11/29/2016 04:28 PM, Fabio Estevam wrote: > devm_ioremap_resource() does a NULL check on the 'rc' argument, so > remove the unneeded manual NULL check. > > While at it, place the 'rc' assignment just before > devm_ioremap_resource() to improve readability. > > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > --- > drivers/mtd/nand/lpc32xx_slc.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c > index 53bafe2..a0669a3 100644 > --- a/drivers/mtd/nand/lpc32xx_slc.c > +++ b/drivers/mtd/nand/lpc32xx_slc.c > @@ -797,22 +797,17 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) > struct resource *rc; > int res; > > - rc = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - if (rc == NULL) { > - dev_err(&pdev->dev, "No memory resource found for device\n"); > - return -EBUSY; > - } I can understand the original code where you avoid calling the malloc() in case of failure, but that looks like microoptimization to me. Acked-by: Marek Vasut <marek.vasut@gmail.com> > /* Allocate memory for the device structure (and zero it) */ > host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL); > if (!host) > return -ENOMEM; > - host->io_base_dma = rc->start; > > + rc = platform_get_resource(pdev, IORESOURCE_MEM, 0); > host->io_base = devm_ioremap_resource(&pdev->dev, rc); > if (IS_ERR(host->io_base)) > return PTR_ERR(host->io_base); > > + host->io_base_dma = rc->start; > if (pdev->dev.of_node) > host->ncfg = lpc32xx_parse_dt(&pdev->dev); > if (!host->ncfg) { >
Hi Marek, On Tue, Nov 29, 2016 at 3:30 PM, Marek Vasut <marek.vasut@gmail.com> wrote: > I can understand the original code where you avoid calling the malloc() > in case of failure, but that looks like microoptimization to me. I did not work on this driver before, so I did not touch the original code. > Acked-by: Marek Vasut <marek.vasut@gmail.com> Thanks!
Hi Fabio, On 11/29/2016 05:28 PM, Fabio Estevam wrote: > devm_ioremap_resource() does a NULL check on the 'rc' argument, so > remove the unneeded manual NULL check. > > While at it, place the 'rc' assignment just before > devm_ioremap_resource() to improve readability. > > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > --- thank you for the change, it is nice. Acked-by: Vladimir Zapolskiy <vz@mleia.com> -- With best wishes, Vladimir
On Tue, 29 Nov 2016 13:28:52 -0200 Fabio Estevam <fabio.estevam@nxp.com> wrote: > devm_ioremap_resource() does a NULL check on the 'rc' argument, so > remove the unneeded manual NULL check. > > While at it, place the 'rc' assignment just before > devm_ioremap_resource() to improve readability. > Applied. Thanks, Boris > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > --- > drivers/mtd/nand/lpc32xx_slc.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c > index 53bafe2..a0669a3 100644 > --- a/drivers/mtd/nand/lpc32xx_slc.c > +++ b/drivers/mtd/nand/lpc32xx_slc.c > @@ -797,22 +797,17 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) > struct resource *rc; > int res; > > - rc = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - if (rc == NULL) { > - dev_err(&pdev->dev, "No memory resource found for device\n"); > - return -EBUSY; > - } > - > /* Allocate memory for the device structure (and zero it) */ > host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL); > if (!host) > return -ENOMEM; > - host->io_base_dma = rc->start; > > + rc = platform_get_resource(pdev, IORESOURCE_MEM, 0); > host->io_base = devm_ioremap_resource(&pdev->dev, rc); > if (IS_ERR(host->io_base)) > return PTR_ERR(host->io_base); > > + host->io_base_dma = rc->start; > if (pdev->dev.of_node) > host->ncfg = lpc32xx_parse_dt(&pdev->dev); > if (!host->ncfg) {
diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c index 53bafe2..a0669a3 100644 --- a/drivers/mtd/nand/lpc32xx_slc.c +++ b/drivers/mtd/nand/lpc32xx_slc.c @@ -797,22 +797,17 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) struct resource *rc; int res; - rc = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (rc == NULL) { - dev_err(&pdev->dev, "No memory resource found for device\n"); - return -EBUSY; - } - /* Allocate memory for the device structure (and zero it) */ host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL); if (!host) return -ENOMEM; - host->io_base_dma = rc->start; + rc = platform_get_resource(pdev, IORESOURCE_MEM, 0); host->io_base = devm_ioremap_resource(&pdev->dev, rc); if (IS_ERR(host->io_base)) return PTR_ERR(host->io_base); + host->io_base_dma = rc->start; if (pdev->dev.of_node) host->ncfg = lpc32xx_parse_dt(&pdev->dev); if (!host->ncfg) {
devm_ioremap_resource() does a NULL check on the 'rc' argument, so remove the unneeded manual NULL check. While at it, place the 'rc' assignment just before devm_ioremap_resource() to improve readability. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> --- drivers/mtd/nand/lpc32xx_slc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)