Messages in this thread Patch in this message |  | | From | Ricardo Ribalda Delgado <> | Subject | [PATCH 6/8] mtd: maps: gpio-addr-flash: Split allocation in two | Date | Tue, 21 Aug 2018 16:31:50 +0200 |
| |
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
|  |