From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
To: David Woodhouse <dwmw2@infradead.org>,
Brian Norris <computersforpeace@gmail.com>,
Boris Brezillon <boris.brezillon@bootlin.com>,
Marek Vasut <marek.vasut@gmail.com>,
Richard Weinberger <richard@nod.at>,
Zhouyang Jia <jiazhouyang09@gmail.com>,
linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Subject: [PATCH 6/8] mtd: maps: gpio-addr-flash: Split allocation in two
Date: Tue, 21 Aug 2018 16:31:50 +0200 [thread overview]
Message-ID: <20180821143152.32293-7-ricardo.ribalda@gmail.com> (raw)
In-Reply-To: <20180821143152.32293-1-ricardo.ribalda@gmail.com>
Instead of making one allocation and then calculating the addresses of
those two pointers in that area make two allocations. This simplifies
the code.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
drivers/mtd/maps/gpio-addr-flash.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c
index 8f5e3dce9be3..9455a8448064 100644
--- a/drivers/mtd/maps/gpio-addr-flash.c
+++ b/drivers/mtd/maps/gpio-addr-flash.c
@@ -205,7 +205,7 @@ static const char * const part_probe_types[] = {
*/
static int gpio_flash_probe(struct platform_device *pdev)
{
- size_t i, arr_size;
+ size_t i;
struct physmap_flash_data *pdata;
struct resource *memory;
struct resource *gpios;
@@ -218,8 +218,7 @@ static int gpio_flash_probe(struct platform_device *pdev)
if (!memory || !gpios || !gpios->end)
return -EINVAL;
- arr_size = sizeof(state->gpio_addrs[0]) * gpios->end;
- state = devm_kzalloc(&pdev->dev, sizeof(*state) + arr_size, GFP_KERNEL);
+ state = devm_kzalloc(&pdev->dev, sizeof(*state), GFP_KERNEL);
if (!state)
return -ENOMEM;
@@ -228,7 +227,12 @@ static int gpio_flash_probe(struct platform_device *pdev)
* away their pointer types here to the known types (gpios->xxx).
*/
state->gpio_count = gpios->end;
- state->gpio_addrs = (void *)(unsigned long)gpios->start;
+ state->gpio_addrs = devm_kzalloc(&pdev->dev,
+ sizeof(state->gpio_addrs[0]) *
+ gpios->end,
+ GFP_KERNEL);
+ if (!state->gpio_addrs)
+ return -ENOMEM;
state->win_order = get_bitmask_order(resource_size(memory)) - 1;
state->map.name = DRIVER_NAME;
--
2.18.0
next prev parent reply other threads:[~2018-08-21 14:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-21 14:31 [PATCH 0/8] gpio-addr-flash: Support for device-tree and cleanup Ricardo Ribalda Delgado
2018-08-21 14:31 ` [PATCH 1/8] mtd: maps: gpio-addr-flash: Replace custom printk Ricardo Ribalda Delgado
2018-08-21 14:31 ` [PATCH 2/8] mtd: maps: gpio-addr-flash: Fix ioremapped size Ricardo Ribalda Delgado
2018-08-28 14:26 ` Boris Brezillon
2018-08-28 14:44 ` Ricardo Ribalda Delgado
2018-08-21 14:31 ` [PATCH 3/8] mtd: maps: gpio-addr-flash: Use devm_* functions Ricardo Ribalda Delgado
2018-08-21 14:31 ` [PATCH 4/8] mtd: maps: gpio-addr-flash: Use order insted of size Ricardo Ribalda Delgado
2018-08-21 14:31 ` [PATCH 5/8] mtd: maps: gpio-addr-flash: Replace array with an integer Ricardo Ribalda Delgado
2018-08-21 14:31 ` Ricardo Ribalda Delgado [this message]
2018-08-21 14:31 ` [PATCH 7/8] mtd: maps: gpio-addr-flash: Add support for device-tree devices Ricardo Ribalda Delgado
2018-08-21 14:31 ` [PATCH 8/8] dt-binding: mtd: Document gpio-addr-flash Ricardo Ribalda Delgado
2018-08-31 12:17 ` Rob Herring
2018-08-31 12:20 ` Ricardo Ribalda Delgado
2018-09-04 14:04 ` [PATCH 0/8] gpio-addr-flash: Support for device-tree and cleanup Ricardo Ribalda Delgado
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=20180821143152.32293-7-ricardo.ribalda@gmail.com \
--to=ricardo.ribalda@gmail.com \
--cc=boris.brezillon@bootlin.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=jiazhouyang09@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=marek.vasut@gmail.com \
--cc=richard@nod.at \
/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).