From patchwork Thu Aug 20 18:51:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 11727053 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 C7402109B for ; Thu, 20 Aug 2020 18:51:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AAF1E207DE for ; Thu, 20 Aug 2020 18:51:33 +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="CwdUD7bR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726947AbgHTSva (ORCPT ); Thu, 20 Aug 2020 14:51:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726836AbgHTSvY (ORCPT ); Thu, 20 Aug 2020 14:51:24 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FD5AC061386 for ; Thu, 20 Aug 2020 11:51:23 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id x5so2699171wmi.2 for ; Thu, 20 Aug 2020 11:51:23 -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=uv7hHl7aFFg/dtBaNnTtB1uheR9EHi8Ydj3NPgXGEak=; b=CwdUD7bRdaeloxtxEuMYCoLi8deIUqyQOlznmDfaRlCD4ukH2wArGUK0TaboQ2xrZQ DEt+AtQ57coF625wZ94Sbz8vW8/8Lds7XGfRSky2Glelq2QV0H8C9KVL8zSktcJ0H2Pn biJpwqvtRDigocgm3ZPYWqZqmLH5+ealGmaNndfZ4g8hJCSRoqkzUe1zv6P6bHkmqX+5 ulZE/p5RM5QKoRP8iwnB6ZmzT1V5ImaKcqiiHcXfjom0hQsVnMs44RRBIFu5Y60UixOu VdYIxRsQb033lTSlpgOaGsjOfuSb8NCgd+Ydhwnh+tkMcWpUR7F9236WSH+XeW2SZ6gk IRBA== 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=uv7hHl7aFFg/dtBaNnTtB1uheR9EHi8Ydj3NPgXGEak=; b=nLKcUbVCsXYMF+IuqIkxPFAnFdOW0iIDrhoa1UKH79eiurAwBpQP3oZTq+AwCCXIgW 7KQQV8uwHL4RcTYWNECUbiHid0TKaXIA8DeiSlj7boDrGmqe/uNzo3sOSZwCFDsY/8Zw 6eXJs9vNbBzUxD6Gbs8ZqWfhrO5S5qowT4b23eHWGNNKEIFiAy/3ZhvFllCDABEZ65c+ LeBT/IMf+zdbwyL3gtuEoZWvOTjF73RL+ropC4gyHsPK1DazFlzYzaXnety9ZdeLzDlK LYOVLzGFHmoFvw64HvdLc/XsfRKZPpK10dOwo/Yw5TCuJKeL1VZX6JjxO2FhonF3AXko z9yQ== X-Gm-Message-State: AOAM533aYCkdnyQ8PgfhBqRjJ91CAHguGI6ph+Vsb8BMIlu7C6hrPogo TxXpu3GGqabYQrPMqq2e1GbIX+AnAQTQ5g== X-Google-Smtp-Source: ABdhPJzBLFm2zKl1rZKZ4wgauOkY1PzMVkHQWrlrxUZLPMnLMsNFDFFPWHPRPEx0WqN9FfML0F0VDA== X-Received: by 2002:a1c:cc0c:: with SMTP id h12mr43729wmb.57.1597949481978; Thu, 20 Aug 2020 11:51:21 -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 q2sm5694019wro.8.2020.08.20.11.51.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2020 11:51:21 -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 v8 1/3] devres: provide devm_krealloc() Date: Thu, 20 Aug 2020 20:51:08 +0200 Message-Id: <20200820185110.17828-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200820185110.17828-1-brgl@bgdev.pl> References: <20200820185110.17828-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 Reviewed-by: Andy Shevchenko --- .../driver-api/driver-model/devres.rst | 1 + drivers/base/devres.c | 114 ++++++++++++++++++ include/linux/device.h | 2 + 3 files changed, 117 insertions(+) diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst index eaaaafc21134..f318a5c0033c 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 ed615d3b9cf1..55f3abb966ee 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -36,6 +36,16 @@ struct devres { u8 __aligned(ARCH_KMALLOC_MINALIGN) data[]; }; +static struct devres *to_devres(void *data) +{ + return data - ALIGN(sizeof(struct devres), ARCH_KMALLOC_MINALIGN); +} + +static size_t devres_data_size(size_t total_size) +{ + return total_size - ALIGN(sizeof(struct devres), ARCH_KMALLOC_MINALIGN); +} + struct devres_group { struct devres_node node[2]; void *id; @@ -126,6 +136,14 @@ static void add_dr(struct device *dev, struct devres_node *node) list_add_tail(&node->entry, &dev->devres_head); } +static void replace_dr(struct device *dev, + struct devres_node *old, struct devres_node *new) +{ + devres_log(dev, old, "REPLACE"); + BUG_ON(!list_empty(&new->entry)); + list_replace(&old->entry, &new->entry); +} + #ifdef CONFIG_DEBUG_DEVRES void * __devres_alloc_node(dr_release_t release, size_t size, gfp_t gfp, int nid, const char *name) @@ -837,6 +855,102 @@ 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 frees the + * previously allocated memory and 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() or when freeing + * resources when new_size is zero). 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) +{ + size_t total_new_size, total_old_size; + struct devres *old_dr, *new_dr; + unsigned long flags; + + 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_new_size)) + return NULL; + + total_old_size = ksize(to_devres(ptr)); + if (total_old_size == 0) { + WARN(1, "Pointer doesn't point to dynamically allocated memory."); + return NULL; + } + + /* + * If new size is smaller or equal to the actual number of bytes + * allocated previously - just return the same pointer. + */ + if (total_new_size <= total_old_size) + return ptr; + + /* + * Otherwise: allocate new, larger chunk. We need to allocate before + * taking the lock as most probably the caller uses GFP_KERNEL. + */ + new_dr = alloc_dr(devm_kmalloc_release, + total_new_size, gfp, dev_to_node(dev)); + if (!new_dr) + return NULL; + + /* + * The spinlock protects the linked list against concurrent + * modifications but not the resource itself. + */ + 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); + devres_free(new_dr); + WARN(1, "Memory chunk not managed or managed by a different device."); + return NULL; + } + + replace_dr(dev, &old_dr->node, &new_dr->node); + + spin_unlock_irqrestore(&dev->devres_lock, flags); + + /* + * We can copy the memory contents after releasing the lock as we're + * no longer modyfing the list links. + */ + memcpy(new_dr->data, old_dr->data, devres_data_size(total_old_size)); + /* + * Same for releasing the old devres - it's now been removed from the + * list. This is also the reason why we must not use devm_kfree() - the + * links are no longer valid. + */ + kfree(old_dr); + + return new_dr->data; +} +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 ca18da4768e3..5da7d5f0a7ff 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 Thu Aug 20 18:51:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 11727055 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 32666109B for ; Thu, 20 Aug 2020 18:51:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A9F2207DE for ; Thu, 20 Aug 2020 18:51:40 +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="iwarKzYy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727914AbgHTSvg (ORCPT ); Thu, 20 Aug 2020 14:51:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727887AbgHTSvZ (ORCPT ); Thu, 20 Aug 2020 14:51:25 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18273C061387 for ; Thu, 20 Aug 2020 11:51:25 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id c80so2698811wme.0 for ; Thu, 20 Aug 2020 11:51:25 -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=8Y9xTv9MTk+DYQZI9tVbj30/uWX0D0ZC3rsteP6Q+Zs=; b=iwarKzYyK4MKjJW/4BzhLQmtU+H8hW6h05HtZHyxDAz+nC5pJoxUpbY2HF5XhTIeQu c77ui33ScwYXE81kdCnr3IghIageEAAQRR8YC8AXSqkOgme0P7wQMwl/Yty3iEq/Jd89 rXfJXnQUWdPYdQVZVHDCorDJf9RRjvJ/PtrBvUmO38x8preXWRmgaohWeMvTw6IQcvpQ s1qN9tsrpxY7JGHxeZmz4WmHPh1gZz0JcTJ1PmoRE/O1kYn6abSDLbnhqpgI+lTXE/t+ aY86hNiy8Vh/C/F3cN7gCw49cwwvmOj8Ak8He1yjXlAfchwBtXjw8PDKOgs6B96RtO8i e+jw== 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=8Y9xTv9MTk+DYQZI9tVbj30/uWX0D0ZC3rsteP6Q+Zs=; b=hX5+Qi8TaVwIYXwU84/7qPlAfOBwe0eSUQIdlFANS8SV04ASovAOljUKj1E4dVJyyn gXkvov8L72IZMWesZ7aNuUiwD41D6kOLhWbknXWBhZQIl3Gy/XqVuxIg14HsdtRmvYNZ ne34qq72ycBemMZLqwdIdOLIlR89aXZyeReuBsVNyzI3U2Um81q+EOkwLjNwdX/MsRmi BMF0IH+3Zz2Nya/AC3xvKyGP4ZcqOEzXBX7rAbIqN9QbM5tM5CHlATFCokqKb9FoX5tY orE4q8+plhUBz63mQ3WAARJYntfWLYZm4ueBOYjJnl1y4auxGlpA17pEF2sXeoPWDPQH dPmA== X-Gm-Message-State: AOAM533FABccSy6g4W+xW+0DE/AMccx6uihRxDFHZ8SPrrfl/n2zIk/J 9R9nI488XJS5aaOmHgAJJZTdoA== X-Google-Smtp-Source: ABdhPJyi93EpGUHDhn1RcT/hobwWURvQP6QtBccpZMz7jNGPAcMuH1elqP6hkoFeMAOkZrFBFXKrew== X-Received: by 2002:a1c:2d8d:: with SMTP id t135mr73516wmt.76.1597949483778; Thu, 20 Aug 2020 11:51:23 -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 q2sm5694019wro.8.2020.08.20.11.51.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2020 11:51:23 -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 v8 2/3] hwmon: pmbus: use more devres helpers Date: Thu, 20 Aug 2020 20:51:09 +0200 Message-Id: <20200820185110.17828-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200820185110.17828-1-brgl@bgdev.pl> References: <20200820185110.17828-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 44535add3a4a..91839979cf6c 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 Thu Aug 20 18:51:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 11727057 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 D3F3A13A4 for ; Thu, 20 Aug 2020 18:51:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BD7EB207DF for ; Thu, 20 Aug 2020 18:51:40 +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="ds8FchHZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727924AbgHTSvk (ORCPT ); Thu, 20 Aug 2020 14:51:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727900AbgHTSv3 (ORCPT ); Thu, 20 Aug 2020 14:51:29 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CBEEC061343 for ; Thu, 20 Aug 2020 11:51:28 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id k20so2703419wmi.5 for ; Thu, 20 Aug 2020 11:51:28 -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=QPQnmI/58kOYJX5JO2+CM6DvjdssZDc2jVBjt8SVn9Y=; b=ds8FchHZgRuxGCcCkfqi5SN58L2+FMba1tz0losixTRhpXlqakfrOTqrbbVnokDN7f WheHwZbtxeZPlOV4zb65MCYoGXAMGE5xVq/Idi3wyXUyRrsLVO4rc/xo9Ni2Ap70Zrln ynhRFKQdeKG3/n3MpIXmtpXc8PiWpVShani05RJZfwaHRiM/mJlDf1/T1urQOTb7OF+n E3S2YOSoJBYv2fiaSbYSjMYeZFKmJYkr4SLL/TqZWgAUyusGabPyP7GqG5K2ZNsu2uZD qXOABGS19VmFHX3oLEuCVW74JDowihEpLnyDpBNKyfNtaK5PrnF6XWwOyQLeYHSci/CY eEUA== 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=QPQnmI/58kOYJX5JO2+CM6DvjdssZDc2jVBjt8SVn9Y=; b=nAT8U70hqETeAcKkf7nhA9ItHeobzu6RXrxNvqh3I4kKv7ZASboMufHIhvD/gAj/r5 81GTEqZiK6EhE8jet/MT7W95cAt992yLKJc+hJTiiw8R0bsg+GXSDPpskgVgtfYSFGrS bGf1A/BgQn6sELGImgAcmdRDecjuLUM48En28BhZLZo95arP3Jd02IvXflPRRDSbayHj DmaLLRItdcgSnZpNpZBm8viezm5bbVMYHn6T4iaJh05mV5fIS4dJ50Z1sgKGNCt3EBk/ Ta6NbCRmUTCRLb4qFXHyrMFu45ENYdvYK7Ls4+VuAaa0LyDpOc+KzTjUS6SB/ufiSbWD H9RA== X-Gm-Message-State: AOAM532ymGU8i1UnH9AKwWn6ZAYXH3rpZZYHcukXwb20rM2e20n4i+Hu Au7rL0wRnVwPBV/D36y2uxKj5mOHhslL5w== X-Google-Smtp-Source: ABdhPJyp/NWmznNP/KusvFX00GaOA7bor3jeE+T3/KSaaSpCfA6GXoWHo3uB2PcjIe/9X/tKfJQ0Pw== X-Received: by 2002:a7b:cbcc:: with SMTP id n12mr38361wmi.105.1597949487036; Thu, 20 Aug 2020 11:51:27 -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 q2sm5694019wro.8.2020.08.20.11.51.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2020 11:51:26 -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 , Jonathan Cameron Subject: [PATCH v8 3/3] iio: adc: xilinx-xadc: use devm_krealloc() Date: Thu, 20 Aug 2020 20:51:10 +0200 Message-Id: <20200820185110.17828-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200820185110.17828-1-brgl@bgdev.pl> References: <20200820185110.17828-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 Acked-by: Jonathan Cameron --- 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 d0b7ef296afb..f93c34fe5873 100644 --- a/drivers/iio/adc/xilinx-xadc-core.c +++ b/drivers/iio/adc/xilinx-xadc-core.c @@ -1092,6 +1092,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; @@ -1136,7 +1137,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; @@ -1172,8 +1174,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; @@ -1225,14 +1228,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)) { @@ -1350,8 +1353,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; } @@ -1371,7 +1372,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; }