From: Miquel Raynal <miquel.raynal@bootlin.com> To: Boris Brezillon <boris.brezillon@collabora.com> Cc: Vignesh Raghavendra <vigneshr@ti.com>, Tudor Ambarus <tudor.ambarus@microchip.com>, Anton Vorontsov <anton@enomsg.org>, Richard Weinberger <richard@nod.at>, linux-mtd@lists.infradead.org, Paul Mackerras <paulus@samba.org>, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH 03/10] mtd: rawnand: fsl_upm: Allocate the fsl_upm_nand object using devm_kzalloc() Date: Wed, 3 Jun 2020 15:52:34 +0200 [thread overview] Message-ID: <20200603155234.4594f501@xps13> (raw) In-Reply-To: <20200603134922.1352340-4-boris.brezillon@collabora.com> Boris Brezillon <boris.brezillon@collabora.com> wrote on Wed, 3 Jun 2020 15:49:15 +0200: > This simplifies the init error patch and remove function. path? Otherwise: Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> > > Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> > --- > drivers/mtd/nand/raw/fsl_upm.c | 18 ++++++------------ > 1 file changed, 6 insertions(+), 12 deletions(-) > > diff --git a/drivers/mtd/nand/raw/fsl_upm.c b/drivers/mtd/nand/raw/fsl_upm.c > index 6eba2f4a2f5a..9cf79c62ef22 100644 > --- a/drivers/mtd/nand/raw/fsl_upm.c > +++ b/drivers/mtd/nand/raw/fsl_upm.c > @@ -205,36 +205,34 @@ static int fun_probe(struct platform_device *ofdev) > int size; > int i; > > - fun = kzalloc(sizeof(*fun), GFP_KERNEL); > + fun = devm_kzalloc(&ofdev->dev, sizeof(*fun), GFP_KERNEL); > if (!fun) > return -ENOMEM; > > ret = of_address_to_resource(ofdev->dev.of_node, 0, &io_res); > if (ret) { > dev_err(&ofdev->dev, "can't get IO base\n"); > - goto err1; > + return ret; > } > > ret = fsl_upm_find(io_res.start, &fun->upm); > if (ret) { > dev_err(&ofdev->dev, "can't find UPM\n"); > - goto err1; > + return ret; > } > > prop = of_get_property(ofdev->dev.of_node, "fsl,upm-addr-offset", > &size); > if (!prop || size != sizeof(uint32_t)) { > dev_err(&ofdev->dev, "can't get UPM address offset\n"); > - ret = -EINVAL; > - goto err1; > + return -EINVAL; > } > fun->upm_addr_offset = *prop; > > prop = of_get_property(ofdev->dev.of_node, "fsl,upm-cmd-offset", &size); > if (!prop || size != sizeof(uint32_t)) { > dev_err(&ofdev->dev, "can't get UPM command offset\n"); > - ret = -EINVAL; > - goto err1; > + return -EINVAL; > } > fun->upm_cmd_offset = *prop; > > @@ -244,7 +242,7 @@ static int fun_probe(struct platform_device *ofdev) > fun->mchip_count = size / sizeof(uint32_t); > if (fun->mchip_count >= NAND_MAX_CHIPS) { > dev_err(&ofdev->dev, "too much multiple chips\n"); > - goto err1; > + return -EINVAL; > } > for (i = 0; i < fun->mchip_count; i++) > fun->mchip_offsets[i] = be32_to_cpu(prop[i]); > @@ -306,8 +304,6 @@ static int fun_probe(struct platform_device *ofdev) > break; > gpio_free(fun->rnb_gpio[i]); > } > -err1: > - kfree(fun); > > return ret; > } > @@ -330,8 +326,6 @@ static int fun_remove(struct platform_device *ofdev) > gpio_free(fun->rnb_gpio[i]); > } > > - kfree(fun); > - > return 0; > } >
WARNING: multiple messages have this Message-ID (diff)
From: Miquel Raynal <miquel.raynal@bootlin.com> To: Boris Brezillon <boris.brezillon@collabora.com> Cc: Vignesh Raghavendra <vigneshr@ti.com>, Tudor Ambarus <tudor.ambarus@microchip.com>, Michael Ellerman <mpe@ellerman.id.au>, Anton Vorontsov <anton@enomsg.org>, Richard Weinberger <richard@nod.at>, linux-mtd@lists.infradead.org, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH 03/10] mtd: rawnand: fsl_upm: Allocate the fsl_upm_nand object using devm_kzalloc() Date: Wed, 3 Jun 2020 15:52:34 +0200 [thread overview] Message-ID: <20200603155234.4594f501@xps13> (raw) In-Reply-To: <20200603134922.1352340-4-boris.brezillon@collabora.com> Boris Brezillon <boris.brezillon@collabora.com> wrote on Wed, 3 Jun 2020 15:49:15 +0200: > This simplifies the init error patch and remove function. path? Otherwise: Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> > > Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> > --- > drivers/mtd/nand/raw/fsl_upm.c | 18 ++++++------------ > 1 file changed, 6 insertions(+), 12 deletions(-) > > diff --git a/drivers/mtd/nand/raw/fsl_upm.c b/drivers/mtd/nand/raw/fsl_upm.c > index 6eba2f4a2f5a..9cf79c62ef22 100644 > --- a/drivers/mtd/nand/raw/fsl_upm.c > +++ b/drivers/mtd/nand/raw/fsl_upm.c > @@ -205,36 +205,34 @@ static int fun_probe(struct platform_device *ofdev) > int size; > int i; > > - fun = kzalloc(sizeof(*fun), GFP_KERNEL); > + fun = devm_kzalloc(&ofdev->dev, sizeof(*fun), GFP_KERNEL); > if (!fun) > return -ENOMEM; > > ret = of_address_to_resource(ofdev->dev.of_node, 0, &io_res); > if (ret) { > dev_err(&ofdev->dev, "can't get IO base\n"); > - goto err1; > + return ret; > } > > ret = fsl_upm_find(io_res.start, &fun->upm); > if (ret) { > dev_err(&ofdev->dev, "can't find UPM\n"); > - goto err1; > + return ret; > } > > prop = of_get_property(ofdev->dev.of_node, "fsl,upm-addr-offset", > &size); > if (!prop || size != sizeof(uint32_t)) { > dev_err(&ofdev->dev, "can't get UPM address offset\n"); > - ret = -EINVAL; > - goto err1; > + return -EINVAL; > } > fun->upm_addr_offset = *prop; > > prop = of_get_property(ofdev->dev.of_node, "fsl,upm-cmd-offset", &size); > if (!prop || size != sizeof(uint32_t)) { > dev_err(&ofdev->dev, "can't get UPM command offset\n"); > - ret = -EINVAL; > - goto err1; > + return -EINVAL; > } > fun->upm_cmd_offset = *prop; > > @@ -244,7 +242,7 @@ static int fun_probe(struct platform_device *ofdev) > fun->mchip_count = size / sizeof(uint32_t); > if (fun->mchip_count >= NAND_MAX_CHIPS) { > dev_err(&ofdev->dev, "too much multiple chips\n"); > - goto err1; > + return -EINVAL; > } > for (i = 0; i < fun->mchip_count; i++) > fun->mchip_offsets[i] = be32_to_cpu(prop[i]); > @@ -306,8 +304,6 @@ static int fun_probe(struct platform_device *ofdev) > break; > gpio_free(fun->rnb_gpio[i]); > } > -err1: > - kfree(fun); > > return ret; > } > @@ -330,8 +326,6 @@ static int fun_remove(struct platform_device *ofdev) > gpio_free(fun->rnb_gpio[i]); > } > > - kfree(fun); > - > return 0; > } > ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-06-03 14:01 UTC|newest] Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-03 13:49 [PATCH 00/10] mtd: rawnand: fsl_upm: Convert to exec_op() (and more) Boris Brezillon 2020-06-03 13:49 ` Boris Brezillon 2020-06-03 13:49 ` [PATCH 01/10] mtd: rawnand: fsl_upm: Remove unused mtd var Boris Brezillon 2020-06-03 13:49 ` Boris Brezillon 2020-06-03 13:50 ` Miquel Raynal 2020-06-03 13:50 ` Miquel Raynal 2020-06-15 9:02 ` Miquel Raynal 2020-06-15 9:02 ` Miquel Raynal 2020-06-03 13:49 ` [PATCH 02/10] mtd: rawnand: fsl_upm: Get rid of the unused fsl_upm_nand.parts field Boris Brezillon 2020-06-03 13:49 ` Boris Brezillon 2020-06-03 13:50 ` Miquel Raynal 2020-06-03 13:50 ` Miquel Raynal 2020-06-15 9:02 ` Miquel Raynal 2020-06-15 9:02 ` Miquel Raynal 2020-06-03 13:49 ` [PATCH 03/10] mtd: rawnand: fsl_upm: Allocate the fsl_upm_nand object using devm_kzalloc() Boris Brezillon 2020-06-03 13:49 ` Boris Brezillon 2020-06-03 13:52 ` Miquel Raynal [this message] 2020-06-03 13:52 ` Miquel Raynal 2020-06-15 9:02 ` Miquel Raynal 2020-06-15 9:02 ` Miquel Raynal 2020-06-03 13:49 ` [PATCH 04/10] mtd: rawnand: fsl_upm: Use devm_kasprintf() to allocate the MTD name Boris Brezillon 2020-06-03 13:49 ` Boris Brezillon 2020-06-03 13:55 ` Miquel Raynal 2020-06-03 13:55 ` Miquel Raynal 2020-06-03 13:59 ` Boris Brezillon 2020-06-03 13:59 ` Boris Brezillon 2020-06-15 9:02 ` Miquel Raynal 2020-06-15 9:02 ` Miquel Raynal 2020-06-03 13:49 ` [PATCH 05/10] mtd: rawnand: fsl_upm: Use platform_get_resource() + devm_ioremap_resource() Boris Brezillon 2020-06-03 13:49 ` Boris Brezillon 2020-06-03 13:58 ` Miquel Raynal 2020-06-03 13:58 ` Miquel Raynal 2020-06-03 14:00 ` Boris Brezillon 2020-06-03 14:00 ` Boris Brezillon 2020-06-15 9:01 ` Miquel Raynal 2020-06-15 9:01 ` Miquel Raynal 2020-06-03 13:49 ` [PATCH 06/10] mtd: rawnand: fsl_upm: Use gpio descriptors Boris Brezillon 2020-06-03 13:49 ` Boris Brezillon 2020-06-03 13:59 ` Miquel Raynal 2020-06-03 13:59 ` Miquel Raynal 2020-06-15 9:01 ` Miquel Raynal 2020-06-15 9:01 ` Miquel Raynal 2020-06-03 13:49 ` [PATCH 07/10] mtd: rawnand: fsl_upm: Inherit from nand_controller Boris Brezillon 2020-06-03 13:49 ` Boris Brezillon 2020-06-03 14:01 ` Miquel Raynal 2020-06-03 14:01 ` Miquel Raynal 2020-06-15 9:01 ` Miquel Raynal 2020-06-15 9:01 ` Miquel Raynal 2020-06-03 13:49 ` [PATCH 08/10] mtd: rawnand: fsl_upm: Implement exec_op() Boris Brezillon 2020-06-03 13:49 ` Boris Brezillon 2020-06-03 14:08 ` Miquel Raynal 2020-06-03 14:08 ` Miquel Raynal 2020-06-15 9:01 ` Miquel Raynal 2020-06-15 9:01 ` Miquel Raynal 2020-06-03 13:49 ` [PATCH 09/10] mtd: rawnand: fsl_upm: Get rid of the legacy interface implementation Boris Brezillon 2020-06-03 13:49 ` Boris Brezillon 2020-06-15 9:01 ` Miquel Raynal 2020-06-15 9:01 ` Miquel Raynal 2020-06-03 13:49 ` [PATCH 10/10] dt-bindings: mtd: fsl-upm-nand: Deprecate chip-delay and fsl, upm-wait-flags Boris Brezillon 2020-06-03 13:49 ` Boris Brezillon 2020-06-03 13:52 ` [PATCH 10/10] dt-bindings: mtd: fsl-upm-nand: Deprecate chip-delay and fsl,upm-wait-flags Boris Brezillon 2020-06-03 13:52 ` Boris Brezillon 2020-06-03 13:52 ` Boris Brezillon 2020-07-07 19:04 ` [PATCH 10/10] dt-bindings: mtd: fsl-upm-nand: Deprecate chip-delay and fsl, upm-wait-flags Miquel Raynal 2020-07-07 19:04 ` Miquel Raynal
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200603155234.4594f501@xps13 \ --to=miquel.raynal@bootlin.com \ --cc=anton@enomsg.org \ --cc=boris.brezillon@collabora.com \ --cc=linux-mtd@lists.infradead.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=paulus@samba.org \ --cc=richard@nod.at \ --cc=tudor.ambarus@microchip.com \ --cc=vigneshr@ti.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.