From patchwork Mon Jul 13 14:59:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 11660013 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0F6AF13A4 for ; Mon, 13 Jul 2020 15:00:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E4F8E20773 for ; Mon, 13 Jul 2020 15:00:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="TjuSWxVQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730061AbgGMPAC (ORCPT ); Mon, 13 Jul 2020 11:00:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729930AbgGMO7s (ORCPT ); Mon, 13 Jul 2020 10:59:48 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B73AC08C5DD for ; Mon, 13 Jul 2020 07:59:48 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id o11so16938004wrv.9 for ; Mon, 13 Jul 2020 07:59:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2K0+WpAjA/clN2fcxfwCJnR+PHkjcGu57v68HdMeUGs=; b=TjuSWxVQpca2khBzPDyHDbnK38Uj8WWXhdul0NXSoye176axPOsOxp6kAwga6KNvsq jDt5y35XtzO+Ru/Z3SWAdx8kFmXIx4IU8Kf6x0ZeQliyfyCNQ97egkeuE9nGJXvovFq3 7MUiVkzlQSLGagLRSSQpzeYAjvyrYCIXkQgjKjBOBEsY8ESj8G3gvYSZmCCLqvBtSsM+ 7MQhvUDvz6v7xsGvdpeakrqoypfNhkSsQ9UDcN1f3OrIAGvmTLVv9MbA9YRFWid8l/oB 5xXcp2P7I50sZp8L114/DIbu/CveOtr/aty1Ljvh92SqdseqIoeC0p/U8690QqKpYFE9 k+dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2K0+WpAjA/clN2fcxfwCJnR+PHkjcGu57v68HdMeUGs=; b=Zof7/a2icoX5/oefLd0CguH3ChcV1nB36Rj2dG/iJVMANhqJtdW8JDWAZ5Rn3TI3jL oG3htJg6qo0HQfZ8KabwruQ8qO45IB9AEpZQ5ZgmEiUkdAIUIY3TPM2r+xWh29Gus3+G KT5yq4qywXXS0OWww5UPmNJZRQeFCnUGqwuh2vcPcja+iKNLvUb3h74dZFbYxu/ovEku cxg86puG0lJIgq28xlzhVzHs22A7j7KktthvW6LXYGfQthQ3EJuCMsJOSqe58wboCI1m 3VKU24ocUUcCYyqPO+RqVAvDAGixGIqC6QjrKG2AB0NQ73HcbvYL9BBZpw1udWdK1vj8 mmMg== X-Gm-Message-State: AOAM530VkNrQdWqksYCnUSkmDNVsBozkQxcrYVfcoCTbiCQrKr9DuJKv V7tWa7o94NC1ulBuU4A/sYYL/Q== X-Google-Smtp-Source: ABdhPJynbnzJegf5dNDoEbDXw70BU9CgzBs8/kZqPTPdIxehdfqK950VzM4VPnHZxExJobVenj5B+Q== X-Received: by 2002:a5d:6803:: with SMTP id w3mr79063986wru.200.1594652387098; Mon, 13 Jul 2020 07:59:47 -0700 (PDT) Received: from debian-brgl.home (lfbn-nic-1-68-20.w2-15.abo.wanadoo.fr. [2.15.159.20]) by smtp.gmail.com with ESMTPSA id u20sm21991145wmm.15.2020.07.13.07.59.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:59:46 -0700 (PDT) From: Bartosz Golaszewski To: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Michal Simek , Greg Kroah-Hartman , Guenter Roeck , Andy Shevchenko Cc: linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v4 1/3] devres: provide devm_krealloc() Date: Mon, 13 Jul 2020 16:59:32 +0200 Message-Id: <20200713145934.18243-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200713145934.18243-1-brgl@bgdev.pl> References: <20200713145934.18243-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org From: Bartosz Golaszewski Implement the managed variant of krealloc(). This function works with all memory allocated by devm_kmalloc() (or devres functions using it implicitly like devm_kmemdup(), devm_kstrdup() etc.). Managed realloc'ed chunks can be manually released with devm_kfree(). Signed-off-by: Bartosz Golaszewski --- .../driver-api/driver-model/devres.rst | 1 + drivers/base/devres.c | 67 +++++++++++++++++++ include/linux/device.h | 2 + 3 files changed, 70 insertions(+) diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst index eaaaafc21134f..f318a5c0033c1 100644 --- a/Documentation/driver-api/driver-model/devres.rst +++ b/Documentation/driver-api/driver-model/devres.rst @@ -354,6 +354,7 @@ MEM devm_kmalloc() devm_kmalloc_array() devm_kmemdup() + devm_krealloc() devm_kstrdup() devm_kvasprintf() devm_kzalloc() diff --git a/drivers/base/devres.c b/drivers/base/devres.c index ed615d3b9cf15..1775d35462300 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -837,6 +837,73 @@ void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp) } EXPORT_SYMBOL_GPL(devm_kmalloc); +/** + * devm_krealloc - Resource-managed krealloc() + * @dev: Device to re-allocate memory for + * @ptr: Pointer to the memory chunk to re-allocate + * @new_size: New allocation size + * @gfp: Allocation gfp flags + * + * Managed krealloc(). Resizes the memory chunk allocated with devm_kmalloc(). + * Behaves similarly to regular krealloc(): if @ptr is NULL or ZERO_SIZE_PTR, + * it's the equivalent of devm_kmalloc(). If new_size is zero, it returns + * ZERO_SIZE_PTR. This function doesn't change the order in which the release + * callback for the re-alloc'ed devres will be called (except when falling back + * to devm_kmalloc()). The contents of the memory are preserved up to the + * lesser of new and old sizes. + */ +void *devm_krealloc(struct device *dev, void *ptr, size_t new_size, gfp_t gfp) +{ + struct devres *old_dr, *new_dr; + struct list_head old_head; + unsigned long flags; + size_t total_size; + void *ret = NULL; + + if (unlikely(!new_size)) { + devm_kfree(dev, ptr); + return ZERO_SIZE_PTR; + } + + if (unlikely(ZERO_OR_NULL_PTR(ptr))) + return devm_kmalloc(dev, new_size, gfp); + + if (WARN_ON(is_kernel_rodata((unsigned long)ptr))) + /* + * We cannot reliably realloc a const string returned by + * devm_kstrdup_const(). + */ + return NULL; + + if (!check_dr_size(new_size, &total_size)) + return NULL; + + spin_lock_irqsave(&dev->devres_lock, flags); + + old_dr = find_dr(dev, devm_kmalloc_release, devm_kmalloc_match, ptr); + if (!old_dr) { + spin_unlock_irqrestore(&dev->devres_lock, flags); + WARN(1, "Memory chunk not managed or managed by a different device."); + return NULL; + } + + old_head = old_dr->node.entry; + + new_dr = krealloc(old_dr, total_size, gfp); + if (!new_dr) { + spin_unlock_irqrestore(&dev->devres_lock, flags); + return NULL; + } + + if (new_dr != old_dr) + list_replace(&old_head, &new_dr->node.entry); + + ret = new_dr->data; + spin_unlock_irqrestore(&dev->devres_lock, flags); + return ret; +} +EXPORT_SYMBOL_GPL(devm_krealloc); + /** * devm_kstrdup - Allocate resource managed space and * copy an existing string into that. diff --git a/include/linux/device.h b/include/linux/device.h index 7322c51e9c0c7..f64f408431593 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -206,6 +206,8 @@ int devres_release_group(struct device *dev, void *id); /* managed devm_k.alloc/kfree for device drivers */ void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp) __malloc; +void *devm_krealloc(struct device *dev, void *ptr, size_t size, + gfp_t gfp) __must_check; __printf(3, 0) char *devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt, va_list ap) __malloc; __printf(3, 4) char *devm_kasprintf(struct device *dev, gfp_t gfp, From patchwork Mon Jul 13 14:59:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 11660009 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C09CB722 for ; Mon, 13 Jul 2020 14:59:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A781220771 for ; Mon, 13 Jul 2020 14:59:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="UT49nUv5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730047AbgGMO7v (ORCPT ); Mon, 13 Jul 2020 10:59:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730033AbgGMO7t (ORCPT ); Mon, 13 Jul 2020 10:59:49 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 970E1C061794 for ; Mon, 13 Jul 2020 07:59:49 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id a6so16901702wrm.4 for ; Mon, 13 Jul 2020 07:59:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AR4pD/vZwN2JP47WtR5Vfk5V/YokTCEDqho1kec2JCE=; b=UT49nUv50rfkVE34LzYzCUN0MzEtJUk/hHQU7Yoiq4SYrI6OS+HIXgj7MMtYTMb/UW lS6D1Fbx2CsDabTrAve2C9SMY5SqBjKgGL0mG4UiV95E668adMxp9MERWVlBwE3HCFGd dPhLl5e75N2rR7AfxpjORZq5CPLsWT7MpAbqfHuv/F5Az3caWZcGEnq2L4Jn1qHSbcbL MtXQbsSK8a2AfYO7e64tGBeFzo0u6PylqUUDBCj8jqNVLpltCH2M0Da7LSK33uguM0V9 BH93Iujz9fKJFr8Xiq9/3a1yce/8iPU4rMTgXS1BQFq/sYsFsEWC5BJh65pv385yedp0 OBqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AR4pD/vZwN2JP47WtR5Vfk5V/YokTCEDqho1kec2JCE=; b=kMAa2Cd14WV7X/ioWILGVOZaRT6Av9y6/g6VCtN2m6uNM312STI1bQUvrB53f02W2X 87I+GDkjaJZco4n8v9u+P4hgsjPOuymjMC1vZnyphaplqj7T9oFBQlDh62xIG1moALaM xQtYGk6jw9hltTW/9BDdTT6HEYUbQpQG986uLB9gs0SsPShdnOhhcEFI17tW5CmyuZfc NdFibv+Xtcb3kQjkqa+AY3M+i/qQDpDWKjcbyawM9VYkNYbqzBAk2X0v4VCcCzfm3riH oceDEslo95JRTp32H+1I0abSTAxtlt5kIUxc2tx1qxZWj2qgyDlITP/ILP7DS+5eJM86 kgDQ== X-Gm-Message-State: AOAM531w3dx4dsdTbE+9tevm9an+QB0MY7RyugwHKFti8KHv4yEll2VQ JALjH686aTvIDo13SQcPsbbM6bkNSpg= X-Google-Smtp-Source: ABdhPJzxLWXdgm9jFVVW4np6605Vs5gN0IJc/FptyfVS18DJKRb00triNmLMkoUaIVNauvJ8+1nbXA== X-Received: by 2002:adf:8b5a:: with SMTP id v26mr79075013wra.165.1594652388415; Mon, 13 Jul 2020 07:59:48 -0700 (PDT) Received: from debian-brgl.home (lfbn-nic-1-68-20.w2-15.abo.wanadoo.fr. [2.15.159.20]) by smtp.gmail.com with ESMTPSA id u20sm21991145wmm.15.2020.07.13.07.59.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:59:47 -0700 (PDT) From: Bartosz Golaszewski To: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Michal Simek , Greg Kroah-Hartman , Guenter Roeck , Andy Shevchenko Cc: linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v4 2/3] hwmon: pmbus: use more devres helpers Date: Mon, 13 Jul 2020 16:59:33 +0200 Message-Id: <20200713145934.18243-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200713145934.18243-1-brgl@bgdev.pl> References: <20200713145934.18243-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org From: Bartosz Golaszewski Shrink pmbus code by using devm_hwmon_device_register_with_groups() and devm_krealloc() instead of their non-managed variants. Signed-off-by: Bartosz Golaszewski Acked-by: Guenter Roeck --- drivers/hwmon/pmbus/pmbus_core.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index 44535add3a4a1..91839979cf6c1 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -1018,9 +1018,9 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr) { if (data->num_attributes >= data->max_attributes - 1) { int new_max_attrs = data->max_attributes + PMBUS_ATTR_ALLOC_SIZE; - void *new_attrs = krealloc(data->group.attrs, - new_max_attrs * sizeof(void *), - GFP_KERNEL); + void *new_attrs = devm_krealloc(data->dev, data->group.attrs, + new_max_attrs * sizeof(void *), + GFP_KERNEL); if (!new_attrs) return -ENOMEM; data->group.attrs = new_attrs; @@ -2534,7 +2534,7 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id, ret = pmbus_find_attributes(client, data); if (ret) - goto out_kfree; + return ret; /* * If there are no attributes, something is wrong. @@ -2542,35 +2542,27 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id, */ if (!data->num_attributes) { dev_err(dev, "No attributes found\n"); - ret = -ENODEV; - goto out_kfree; + return -ENODEV; } data->groups[0] = &data->group; memcpy(data->groups + 1, info->groups, sizeof(void *) * groups_num); - data->hwmon_dev = hwmon_device_register_with_groups(dev, client->name, - data, data->groups); + data->hwmon_dev = devm_hwmon_device_register_with_groups(dev, + client->name, data, data->groups); if (IS_ERR(data->hwmon_dev)) { - ret = PTR_ERR(data->hwmon_dev); dev_err(dev, "Failed to register hwmon device\n"); - goto out_kfree; + return PTR_ERR(data->hwmon_dev); } ret = pmbus_regulator_register(data); if (ret) - goto out_unregister; + return ret; ret = pmbus_init_debugfs(client, data); if (ret) dev_warn(dev, "Failed to register debugfs\n"); return 0; - -out_unregister: - hwmon_device_unregister(data->hwmon_dev); -out_kfree: - kfree(data->group.attrs); - return ret; } EXPORT_SYMBOL_GPL(pmbus_do_probe); @@ -2580,8 +2572,6 @@ int pmbus_do_remove(struct i2c_client *client) debugfs_remove_recursive(data->debugfs); - hwmon_device_unregister(data->hwmon_dev); - kfree(data->group.attrs); return 0; } EXPORT_SYMBOL_GPL(pmbus_do_remove); From patchwork Mon Jul 13 14:59:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 11660011 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0A8DC722 for ; Mon, 13 Jul 2020 14:59:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E304420771 for ; Mon, 13 Jul 2020 14:59:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="zuaeamKd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730081AbgGMO7z (ORCPT ); Mon, 13 Jul 2020 10:59:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730064AbgGMO7v (ORCPT ); Mon, 13 Jul 2020 10:59:51 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 095B9C061755 for ; Mon, 13 Jul 2020 07:59:51 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id f7so16922772wrw.1 for ; Mon, 13 Jul 2020 07:59:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9PXD4vP8fC6/t9fZb9g5coIXGjPw+6LiW/rcHcw4O0Y=; b=zuaeamKd2MOWNbcgimVgdWbMCvRNXeFqsGveoccXf9UiMRMyp2Eh64VIogpLrTZbbv en7AsCseJgjsgYtIkuMlaGuViO8O84ylg4R94V5el2S2MFL3E15S2zRJWH6JfgqeemH5 nBmpSUDN+SlS6ahmpO8sRK9pviEegd8FUhAOG7Kio53ocuDxaTchRh7Kec/ZfY8rAQNF v8jwG9nbg3vGNPRudk7wqbyTDopPLKAQKVlQ7cKB32+F/X5O/WFOKQcTAfHrU5L5BjWY WHrNvfD+1mA00Hj4DQa/f8QuBc8ZOuPD0sxJ2OxIcrgz1yhDFswT8MiSlIz2emY5apE8 97Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9PXD4vP8fC6/t9fZb9g5coIXGjPw+6LiW/rcHcw4O0Y=; b=Z+zWW7x/W84jErE9E++TWIkN3AT7uvIje/sWmIsnB/Or4mLipdVRnTwu1EFs2tHoQt 8pUVXX429Wi+MF7JZ8H0Ux0xUrF2G/hZMMoxUr/N2uh5xDinFTNql+11HEpviQUgmozF RN03/Mr6umilqi50jNb9CbJP+VFXFXh+aRxJFRrLV9r9dRPBLNiOCZwTd7XVBU/A3gyP K6BYXiX25wKNzp+q3wXLhfItAooD2xpvHs7JUoLitENqg64oS4fSvj4VUT4IZFE1YlUj FdD0GayJBTdgvgIyChhMTKchL2eaYWUPDA/fFIWa1D7r9mtmoxG9uyTlbf/MHM25KcLK KktA== X-Gm-Message-State: AOAM531OlDMVKaZyzkI0AtkP1KSD6z1C+qBn3SYgfmvtxpoaWYNovrWT 1ZHt+yOpIf0IR6rdFhqXe/uvANo3vVA= X-Google-Smtp-Source: ABdhPJzjTMedChvGhWLYNaMyNCNGnKnwYsdLQG+HFCPhfJxEYwUA9Oy8TIQFHPUl0BfOjyPN0jjZ7g== X-Received: by 2002:adf:dfcd:: with SMTP id q13mr80164558wrn.295.1594652389817; Mon, 13 Jul 2020 07:59:49 -0700 (PDT) Received: from debian-brgl.home (lfbn-nic-1-68-20.w2-15.abo.wanadoo.fr. [2.15.159.20]) by smtp.gmail.com with ESMTPSA id u20sm21991145wmm.15.2020.07.13.07.59.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:59:49 -0700 (PDT) From: Bartosz Golaszewski To: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Michal Simek , Greg Kroah-Hartman , Guenter Roeck , Andy Shevchenko Cc: linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v4 3/3] iio: adc: xilinx-xadc: use devm_krealloc() Date: Mon, 13 Jul 2020 16:59:34 +0200 Message-Id: <20200713145934.18243-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200713145934.18243-1-brgl@bgdev.pl> References: <20200713145934.18243-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org From: Bartosz Golaszewski Use the managed variant of krealloc() and shrink the code a bit. Signed-off-by: Bartosz Golaszewski --- drivers/iio/adc/xilinx-xadc-core.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c index d7fecab9252e4..5bdbe502e983a 100644 --- a/drivers/iio/adc/xilinx-xadc-core.c +++ b/drivers/iio/adc/xilinx-xadc-core.c @@ -1094,6 +1094,7 @@ MODULE_DEVICE_TABLE(of, xadc_of_match_table); static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np, unsigned int *conf) { + struct device *dev = indio_dev->dev.parent; struct xadc *xadc = iio_priv(indio_dev); struct iio_chan_spec *channels, *chan; struct device_node *chan_node, *child; @@ -1138,7 +1139,8 @@ static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np, *conf |= XADC_CONF0_MUX | XADC_CONF0_CHAN(ext_mux_chan); } - channels = kmemdup(xadc_channels, sizeof(xadc_channels), GFP_KERNEL); + channels = devm_kmemdup(dev, xadc_channels, + sizeof(xadc_channels), GFP_KERNEL); if (!channels) return -ENOMEM; @@ -1174,8 +1176,9 @@ static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np, of_node_put(chan_node); indio_dev->num_channels = num_channels; - indio_dev->channels = krealloc(channels, sizeof(*channels) * - num_channels, GFP_KERNEL); + indio_dev->channels = devm_krealloc(dev, channels, + sizeof(*channels) * num_channels, + GFP_KERNEL); /* If we can't resize the channels array, just use the original */ if (!indio_dev->channels) indio_dev->channels = channels; @@ -1229,14 +1232,14 @@ static int xadc_probe(struct platform_device *pdev) ret = xadc_parse_dt(indio_dev, pdev->dev.of_node, &conf0); if (ret) - goto err_device_free; + return ret; if (xadc->ops->flags & XADC_FLAGS_BUFFERED) { ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time, &xadc_trigger_handler, &xadc_buffer_ops); if (ret) - goto err_device_free; + return ret; xadc->convst_trigger = xadc_alloc_trigger(indio_dev, "convst"); if (IS_ERR(xadc->convst_trigger)) { @@ -1354,8 +1357,6 @@ static int xadc_probe(struct platform_device *pdev) err_triggered_buffer_cleanup: if (xadc->ops->flags & XADC_FLAGS_BUFFERED) iio_triggered_buffer_cleanup(indio_dev); -err_device_free: - kfree(indio_dev->channels); return ret; } @@ -1375,7 +1376,6 @@ static int xadc_remove(struct platform_device *pdev) cancel_delayed_work_sync(&xadc->zynq_unmask_work); clk_disable_unprepare(xadc->clk); kfree(xadc->data); - kfree(indio_dev->channels); return 0; }