From: Boris Brezillon <boris.brezillon@collabora.com>
To: Anton Vorontsov <anton@enomsg.org>,
Miquel Raynal <miquel.raynal@bootlin.com>,
linux-mtd@lists.infradead.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Vignesh Raghavendra <vigneshr@ti.com>,
Tudor Ambarus <tudor.ambarus@microchip.com>,
Richard Weinberger <richard@nod.at>,
Boris Brezillon <boris.brezillon@collabora.com>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 05/10] mtd: rawnand: fsl_upm: Use platform_get_resource() + devm_ioremap_resource()
Date: Wed, 3 Jun 2020 15:49:17 +0200 [thread overview]
Message-ID: <20200603134922.1352340-6-boris.brezillon@collabora.com> (raw)
In-Reply-To: <20200603134922.1352340-1-boris.brezillon@collabora.com>
Replace the of_address_to_resource() + devm_ioremap() calls by
platform_get_resource() + devm_ioremap_resource() ones which allows us
to get rid of one error message since devm_ioremap_resource() already
takes care of that.
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
---
drivers/mtd/nand/raw/fsl_upm.c | 23 +++++++----------------
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/drivers/mtd/nand/raw/fsl_upm.c b/drivers/mtd/nand/raw/fsl_upm.c
index a3e3a968891d..54851e9ea784 100644
--- a/drivers/mtd/nand/raw/fsl_upm.c
+++ b/drivers/mtd/nand/raw/fsl_upm.c
@@ -14,7 +14,6 @@
#include <linux/mtd/nand_ecc.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/mtd.h>
-#include <linux/of_address.h>
#include <linux/of_platform.h>
#include <linux/of_gpio.h>
#include <linux/io.h>
@@ -197,7 +196,7 @@ static int fun_chip_init(struct fsl_upm_nand *fun,
static int fun_probe(struct platform_device *ofdev)
{
struct fsl_upm_nand *fun;
- struct resource io_res;
+ struct resource *io_res;
const __be32 *prop;
int rnb_gpio;
int ret;
@@ -208,13 +207,12 @@ static int fun_probe(struct platform_device *ofdev)
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");
- return ret;
- }
+ io_res = platform_get_resource(ofdev, IORESOURCE_MEM, 0);
+ fun->io_base = devm_ioremap_resource(&ofdev->dev, io_res);
+ if (IS_ERR(fun->io_base))
+ return PTR_ERR(fun->io_base);
- ret = fsl_upm_find(io_res.start, &fun->upm);
+ ret = fsl_upm_find(io_res->start, &fun->upm);
if (ret) {
dev_err(&ofdev->dev, "can't find UPM\n");
return ret;
@@ -280,17 +278,10 @@ static int fun_probe(struct platform_device *ofdev)
fun->wait_flags = FSL_UPM_WAIT_RUN_PATTERN |
FSL_UPM_WAIT_WRITE_BYTE;
- fun->io_base = devm_ioremap(&ofdev->dev, io_res.start,
- resource_size(&io_res));
- if (!fun->io_base) {
- ret = -ENOMEM;
- goto err2;
- }
-
fun->dev = &ofdev->dev;
fun->last_ctrl = NAND_CLE;
- ret = fun_chip_init(fun, ofdev->dev.of_node, &io_res);
+ ret = fun_chip_init(fun, ofdev->dev.of_node, io_res);
if (ret)
goto err2;
--
2.25.4
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-06-03 13:51 UTC|newest]
Thread overview: 32+ 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 ` [PATCH 01/10] mtd: rawnand: fsl_upm: Remove unused mtd var Boris Brezillon
2020-06-03 13:50 ` 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:50 ` 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:52 ` 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:55 ` Miquel Raynal
2020-06-03 13:59 ` Boris Brezillon
2020-06-15 9:02 ` Miquel Raynal
2020-06-03 13:49 ` Boris Brezillon [this message]
2020-06-03 13:58 ` [PATCH 05/10] mtd: rawnand: fsl_upm: Use platform_get_resource() + devm_ioremap_resource() Miquel Raynal
2020-06-03 14:00 ` Boris Brezillon
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:59 ` 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 14: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 14:08 ` 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-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:52 ` [PATCH 10/10] dt-bindings: mtd: fsl-upm-nand: Deprecate chip-delay and fsl,upm-wait-flags 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
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=20200603134922.1352340-6-boris.brezillon@collabora.com \
--to=boris.brezillon@collabora.com \
--cc=anton@enomsg.org \
--cc=benh@kernel.crashing.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=miquel.raynal@bootlin.com \
--cc=mpe@ellerman.id.au \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).