From patchwork Fri Jul 10 16:15:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 11656971 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 27E73618 for ; Fri, 10 Jul 2020 16:15:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 096F6207FB for ; Fri, 10 Jul 2020 16:15:27 +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="HPME4aFf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727995AbgGJQP0 (ORCPT ); Fri, 10 Jul 2020 12:15:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728240AbgGJQPZ (ORCPT ); Fri, 10 Jul 2020 12:15:25 -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 169D2C08C5CE for ; Fri, 10 Jul 2020 09:15:25 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id k6so6553401wrn.3 for ; Fri, 10 Jul 2020 09:15: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=6VeY2q2ARwtwhxTnriPNqujWGB2wBtqSPVx5GyBvhlc=; b=HPME4aFfN5DAGO/hNKu8shxMBOKpjiUHJbJOGhTo99xKJ62hrdqOCo/1gYMqtetwLI joIHG5DbBNPLurDw77w69rKt2TzzTHMFPef7Ae9YSPcdFckr7QDEwgkiZSeS4B4mZiG4 Aye0brfxunFa1P3lI0bGf7BUjcvDs5NNH95uxOXPNNQ5uWE6yXFQW35oy5RmGrkaXj3W XT6uOuXIJnTF8VBQGfzVTwbqDOAC6IeVDifSeblH7eo4eSXXeg9RYJ36eMPX14bSLbpY 28NWQ+9Wf7ij9n9AdZsXnM7MJLn6IUHpsq1r7gEoEGKjKZwAfhB5p5uKOWdGmEep1g3A epRQ== 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=6VeY2q2ARwtwhxTnriPNqujWGB2wBtqSPVx5GyBvhlc=; b=bE87MBM66xnh8hsvtJQzaAV6RClWv0/HDDYjL5GfNL0F++R9ngrCPLKpOUhyGqMt7G 4jubb841OXFNe/YIb7XlZueP2a6uYqGN8xozXR0gFspZ5KMPevvfy3QE2shRG3Xnv+LM hmmKvgPkj3iGVOR/2U8MFMEWujD2guKbHkv9oyRIt71YkiYWFKUQ72Bc5SfNDm9TVWwH REV6xPukkCk+97EDnDE/kbDnTN/v6AfhQVqECsCb2ilkTH6daxhkdVgfMsW0e/i4+S0m YBcku92hFwpfkv3Frx0jnydxglH0gzPYZ+sTOnKVhHGMR/uM30ji9ZhX1wkobIgMtzbB 4O1Q== X-Gm-Message-State: AOAM530YDRLMTdmffVnwD4/ql3YKRv6pAYAGsFJ0z/GJdTIHlXHMLAk3 DoW5IZosFGqOFQzjlct3cKUbB0L1R7w= X-Google-Smtp-Source: ABdhPJwOtOzdkUiP2GCCTb1YJ3mjOhhSDr/YjLUB5Z33mCbFNZoBuRBbEqo72XYreuJPsOb9S088+A== X-Received: by 2002:a5d:4d0b:: with SMTP id z11mr38646926wrt.24.1594397723839; Fri, 10 Jul 2020 09:15: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 e8sm11179359wrp.26.2020.07.10.09.15.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 09:15:23 -0700 (PDT) From: Bartosz Golaszewski To: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Michal Simek , Greg Kroah-Hartman , Guenter Roeck Cc: linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v3 1/3] devres: provide devm_krealloc() Date: Fri, 10 Jul 2020 18:15:14 +0200 Message-Id: <20200710161516.11625-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200710161516.11625-1-brgl@bgdev.pl> References: <20200710161516.11625-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 | 50 +++++++++++++++++++ include/linux/device.h | 2 + 3 files changed, 53 insertions(+) diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst index eaaaafc21134..aa08f5162524 100644 --- a/Documentation/driver-api/driver-model/devres.rst +++ b/Documentation/driver-api/driver-model/devres.rst @@ -353,6 +353,7 @@ MEM devm_kfree() devm_kmalloc() devm_kmalloc_array() + devm_krealloc() devm_kmemdup() devm_kstrdup() devm_kvasprintf() diff --git a/drivers/base/devres.c b/drivers/base/devres.c index ed615d3b9cf1..4b8870ef6a3f 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -837,6 +837,56 @@ void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp) } EXPORT_SYMBOL_GPL(devm_kmalloc); +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; + void *ret = NULL; + size_t tot_size; + + 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, &tot_size)) + return NULL; + + spin_lock_irqsave(&dev->devres_lock, flags); + + old_dr = find_dr(dev, devm_kmalloc_release, devm_kmalloc_match, ptr); + if (WARN_ON(!old_dr)) + /* Memory chunk not managed or managed by a different device. */ + goto out; + + old_head = old_dr->node.entry; + + new_dr = krealloc(old_dr, tot_size, gfp); + if (!new_dr) + goto out; + + if (new_dr != old_dr) + list_replace(&old_head, &new_dr->node.entry); + + ret = new_dr->data; + +out: + 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 7322c51e9c0c..f64f40843159 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 Fri Jul 10 16:15:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 11656973 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 5EB7513B1 for ; Fri, 10 Jul 2020 16:15:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4524D2075D for ; Fri, 10 Jul 2020 16:15:31 +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="c/4slGI6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728239AbgGJQP2 (ORCPT ); Fri, 10 Jul 2020 12:15:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728399AbgGJQP1 (ORCPT ); Fri, 10 Jul 2020 12:15:27 -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 0D9D6C08C5DC for ; Fri, 10 Jul 2020 09:15:27 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id j18so6743667wmi.3 for ; Fri, 10 Jul 2020 09:15:26 -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=c/4slGI65Q34YtH+SDdFpF7G4+0XGXMuxXkoCPO0M5y54DgTEonMEEKiJ1aX4maZPI xexN1w6sXCRbXSjGckFsKvlgHkE9h/JxY7X7PpWmfzew8ZpwwygVNt39AtGUkAj3UmoD EBnLrTIEeNsMT8o8DkUgYXXRUT9UhGsXpO0aKxasSaQaHG775NqAS61maxfHI0Tx/Ty0 loEa4cMkiyYiMAd9t4EYMco07+ehqxY669oGP6mUL2I/eTMjZs1ASyVZAZTpGKcqtnby VUlCyJdLU27vsyIXZWrWe04ckJyVBQIiBmwuQ6o04DCbdNooi2BV7v4ZSIb0RPbvLwFT GRlQ== 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=UZVClVNxMjHh/nI16NDkE0N2mi8psMYtZ5OcUAqcvcuDivyqlmnx3OpykjF6G5uRki ig/4mAda7QkPZSb8sSC437aMYjAHOqsdUGgMONkalmc/gl/Y5rqFGZcP4Y8hjwTuT/1W 0GP5+QGnwUokfDWHZA6FroLLDF8okJE78UBBxuByK7pvlb/vmwI3cz9SWPCXl5kve+me 6ckVuwzR45sZxaEuyUBgHTrIxKiueq8kCE2GbvQ5OBxQ+aqxqTUHBH34QhsPdRp8X3sU 9EI0J7StlrGdE4hRIjbZnP5x8CN9K4v5TXCjVrZcEhmHJc6GyL+ZMaAexkp3dEJn2ak+ Er0A== X-Gm-Message-State: AOAM533vCRQUjT1sOvUEFwl7WzYjQ52qcAzgJiuswuNk+patKLwK28EQ A4mOtFgJOQ/XTaD4eL68CB+4Hw== X-Google-Smtp-Source: ABdhPJwt3IgeUN9TgYJhau5DYs8214C9lbhCSPsS5zQNpuTvCkT++MyByRc627aN9oAdzByltAQl/g== X-Received: by 2002:a7b:c841:: with SMTP id c1mr6268130wml.25.1594397725779; Fri, 10 Jul 2020 09:15:25 -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 e8sm11179359wrp.26.2020.07.10.09.15.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 09:15:25 -0700 (PDT) From: Bartosz Golaszewski To: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Michal Simek , Greg Kroah-Hartman , Guenter Roeck Cc: linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v3 2/3] hwmon: pmbus: use more devres helpers Date: Fri, 10 Jul 2020 18:15:15 +0200 Message-Id: <20200710161516.11625-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200710161516.11625-1-brgl@bgdev.pl> References: <20200710161516.11625-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 Fri Jul 10 16:15:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 11656975 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 07F13618 for ; Fri, 10 Jul 2020 16:15:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E22C220725 for ; Fri, 10 Jul 2020 16:15:42 +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="QuZR81fN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728392AbgGJQPg (ORCPT ); Fri, 10 Jul 2020 12:15:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727916AbgGJQPa (ORCPT ); Fri, 10 Jul 2020 12:15:30 -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 F2573C08C5CE for ; Fri, 10 Jul 2020 09:15:29 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id q15so6735875wmj.2 for ; Fri, 10 Jul 2020 09:15:29 -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=A58ALUumjjt05j/+gyv9/npKtqLpw2CKDOBqng8A+3w=; b=QuZR81fNhSUrP+8tEzSRhwiB/EBjSn8c4nKW3rzK26q91ROb63GYpHfCv8OIOr3Iye vgJv3D5760cJMIigdjaZPmqlMqcEWrmpvDFWtGjmhgsmKUCLuUnOgc6mnQBc4614vIle 0MjYT4bo/cC8bN8n4xbG+0IiNjRpGrJzdY/tb4u4oIWLbLNkdLQco2HxIJOvW2r1ieAb c6yjBsk4td8ScIrB85WUlivHVrN6yr64idhd8Kx/0YaG7zCpK8+Sskbszg9j5anS10VM /IhcpCKxO+Hg8GFw1f+PXyjRHhr2Anum/aez6NC/F3zwYHCpfVt6vHTW3tefl3+T6KRU c49Q== 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=A58ALUumjjt05j/+gyv9/npKtqLpw2CKDOBqng8A+3w=; b=ioOqavI9Ua2VvVQcNRDSLsulw1fZ9lkZfxWn+KtRC2FpAO6sOqCWU36VkJi1shnPts XlLlNnNE9FYY+mKu/R3O5d7Lquv04UU9iVRM/PrUVRw2tddI4oGWSI+Uacgze0SlWMi4 v/N378TlWNLpIXscoAsxkQkfYu22q+fvu2c1WQXQ+QnM57pJAKkeqWvfEr/8jBQR6mp7 A2lfl7YpfP42qwgP3iB42ygF/P0DZPQercKTm9nUlTJ6RE/Qp4Cf5LvMqt+6gxO+QSkH qLmnKzRLTOtpIJcZcHncd3jlaJPHOXAud2nbYh+MhZ6ac5NcWuJKOO2xcJyDqOxI7i3O ylew== X-Gm-Message-State: AOAM532YaVZ4xogDiN55gkcgtvv0B9rqXI+nHT1vH1qEsY1B39BgbJw1 pLjBSYTY3GnW0XmHJCHY56CtaY5cvQs= X-Google-Smtp-Source: ABdhPJwH+VJhu7xGq6cwXoneM1srOvV259fXHjx+PcqNcKEtcuecBaDo5y3b2FSMlJnpTTjKY51fbA== X-Received: by 2002:a7b:c14a:: with SMTP id z10mr5701020wmi.19.1594397727814; Fri, 10 Jul 2020 09:15: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 e8sm11179359wrp.26.2020.07.10.09.15.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 09:15:27 -0700 (PDT) From: Bartosz Golaszewski To: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Michal Simek , Greg Kroah-Hartman , Guenter Roeck Cc: linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v3 3/3] iio: adc: xilinx-xadc: use devm_krealloc() Date: Fri, 10 Jul 2020 18:15:16 +0200 Message-Id: <20200710161516.11625-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200710161516.11625-1-brgl@bgdev.pl> References: <20200710161516.11625-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 d7fecab9252e..5bdbe502e983 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; }