From patchwork Sun Aug 2 08:34:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 11696291 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 46158912 for ; Sun, 2 Aug 2020 08:35:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2D95C2054F for ; Sun, 2 Aug 2020 08:35: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="Odwr5dnQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727968AbgHBIfG (ORCPT ); Sun, 2 Aug 2020 04:35:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726356AbgHBIfF (ORCPT ); Sun, 2 Aug 2020 04:35:05 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B853EC06174A for ; Sun, 2 Aug 2020 01:35:04 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id r4so28495145wrx.9 for ; Sun, 02 Aug 2020 01:35:04 -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=kWeOEykzpMG2Cw53yqfEgcb8EdReZnui27iCByahu8k=; b=Odwr5dnQlxxeq7nnAYc7r4M4OLEp/GYR7Ca7FnhDm45xiG7z476gWeuD/Ye+dFU80W yF6u1ln9DArAzDV1he4Dypbqs4/+qSmQrWnvigb5+LKcxOkHwWaGYJM25fIaEZRPcwGC C05giYnvs5Sa4zovdbKwLu6vadrtoTRupccM4a2GKt/1UEvMth8e7z1wIk1G6mfs4kym EcZyj+4zPbup65n0uo8TUsnHZW71bLjS4BFiLkOyKvlBRnqqkJvJH+S2UbG6pUOPiRqV RMc03ez2ntlv3a2degZucfenRvuKaVrxNZq6Mw2r8isAdyRD44z8chAPQbFJtzLFlpH/ AJ9g== 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=kWeOEykzpMG2Cw53yqfEgcb8EdReZnui27iCByahu8k=; b=sHjsMZztJB8u+omwSoK/ygRuNntBzQ0tdtFQldlNDg3UC72c/ihK3NpdRLjEoU+UF8 R0eTwjGUo8Ys+y7gr8xyLCTJSnbDQr/S5h6RQp3aNIc2UShaJRly+2DfXlFrXXquQsmo UbM8rKhl+i5/wL3MvKy4MuVrSM2rheXHkgi2TCM65A6Aj7rPUg/1x3wZQqBZ7WlA8W14 fWxE2eSD1bzsfZnb8h8I5mAXm5+/SyeRKvAtQDC5OdMK5MZgFeOUppydJwpuxYlaQQjD +auCGTf0pBclSXCF1YyAXn9ZwjUMvqoNw3ZaixjMEGZz0LyTaSryfm5atV0fbEpzQVUQ Q+xQ== X-Gm-Message-State: AOAM530nJKzmtfgu9Sgmf+Kou7DY5buhP+p7WANZtuXWl9LgraDSs3se zWuLsjh3eG12GZ9H3s/XX61isg== X-Google-Smtp-Source: ABdhPJxKfVyRi6t5LbVxjQKeHdJnjlcFkUW5ThdSeo1/NDJhPMSDZStGtc9IbVpxiTwqKpLbvOJ22Q== X-Received: by 2002:a5d:4750:: with SMTP id o16mr11212856wrs.204.1596357303465; Sun, 02 Aug 2020 01:35:03 -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 d14sm19281466wre.44.2020.08.02.01.35.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Aug 2020 01:35:02 -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 v6 1/3] devres: provide devm_krealloc() Date: Sun, 2 Aug 2020 10:34:56 +0200 Message-Id: <20200802083458.24323-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200802083458.24323-1-brgl@bgdev.pl> References: <20200802083458.24323-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 | 65 +++++++++++++++++++ include/linux/device.h | 2 + 3 files changed, 68 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..68a5a7201065 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -837,6 +837,71 @@ 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) +{ + struct devres *old_dr, *new_dr; + struct list_head old_head; + unsigned long flags; + size_t total_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, &total_size)) + return NULL; + + spin_lock_irqsave(&dev->devres_lock, flags); + old_dr = find_dr(dev, devm_kmalloc_release, devm_kmalloc_match, ptr); + spin_unlock_irqrestore(&dev->devres_lock, flags); + if (!old_dr) { + 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) + return NULL; + + if (new_dr != old_dr) { + spin_lock_irqsave(&dev->devres_lock, flags); + list_replace(&old_head, &new_dr->node.entry); + spin_unlock_irqrestore(&dev->devres_lock, flags); + } + + 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 79ce404619e6..51fb33400d7a 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 Sun Aug 2 08:34:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 11696295 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 6B63217C7 for ; Sun, 2 Aug 2020 08:35:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4A4B82054F for ; Sun, 2 Aug 2020 08:35: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="Gc+/wFA/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725882AbgHBIfI (ORCPT ); Sun, 2 Aug 2020 04:35:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726358AbgHBIfH (ORCPT ); Sun, 2 Aug 2020 04:35:07 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15B65C061756 for ; Sun, 2 Aug 2020 01:35:06 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id 88so31440305wrh.3 for ; Sun, 02 Aug 2020 01:35:05 -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=Gc+/wFA/StiehQxlzMY8fqj0bVBf1C0jXtl9hg8d9wg77qkCoTNxBo3K/xZntr8iHZ 3hfsckOk9hn48ROcXZrPYwrffMmWh++RsxoD+BKShP8uuW8X1mtb+ds1gwpKv0abtEpl YK5V20N9qogrS4K1qKx0DV56EEFU65cz7ft6MQfG24bljea3C3IeHpAgSe41mMbrlv87 7+MqM8bZRMH2ZaLvn65KqGp0leYZxzRk2HE0jyx4nLO3inSK8vVDoRKif25jW+E8fvtR rwOie0xF6MiUCIONp0DPkZQOhR5B746TM+2WuvHXSPYtvPlsxaxkBoBTeaaJJ/DT5Oit w/JQ== 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=I8jxC9bafHpw9y8gakvkAprnE+ExuZE7TA2TXzRx+FwqxCEb2gW0Qshwf2JhCHXBcJ uaIvFw2AKv1b2hDr2dmDDQbytyc6rO8d32LnViomvhykjssKsIwfoZe/eZHRcwYWGdNq DbuCCY/Sp137kv6LFJ6YX3tEgrAUzeHz1+Zd5Nrp6uY93MGCWqNmZuRrFJA90llISbRO RkPNVHR6wlVukVUzq6PchxXR8nHLR0SnvMezt48fxXqSi4oGU6KcNcLlR3AwtbsTYuKh hgsoGWvzPnXocphpfzp7Ze2aO8YJd+5hjbpl/ypUEZppcfr/mtTtVV1HcDuw+CTC7G5v ydjQ== X-Gm-Message-State: AOAM530JRdrgO7b+lf8KdS7hY+drLu7BPuqAzaJVTnUeJsyog2Ik0oIw YWGEfGFXbpm0q29x8EUET5yPkQ== X-Google-Smtp-Source: ABdhPJyYHSswcTuNsg2F7JNqYkN23/0HBUDj3ea/z8shHnQyi8ZZj96oa0Q3T6KT13bGDG1cRROKbg== X-Received: by 2002:adf:bb0a:: with SMTP id r10mr9877323wrg.23.1596357304796; Sun, 02 Aug 2020 01:35:04 -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 d14sm19281466wre.44.2020.08.02.01.35.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Aug 2020 01:35:04 -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 v6 2/3] hwmon: pmbus: use more devres helpers Date: Sun, 2 Aug 2020 10:34:57 +0200 Message-Id: <20200802083458.24323-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200802083458.24323-1-brgl@bgdev.pl> References: <20200802083458.24323-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 Sun Aug 2 08:34:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 11696297 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 90F5E14DD for ; Sun, 2 Aug 2020 08:35:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6FFEC2054F for ; Sun, 2 Aug 2020 08:35: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="iO2jRFEx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728005AbgHBIfP (ORCPT ); Sun, 2 Aug 2020 04:35:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728009AbgHBIfH (ORCPT ); Sun, 2 Aug 2020 04:35:07 -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 3FE1AC061757 for ; Sun, 2 Aug 2020 01:35:07 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id a15so31445901wrh.10 for ; Sun, 02 Aug 2020 01:35:07 -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=iO2jRFEx59Eh2m1Om/5bJDJk6/MLr3z2OMyOsrMzSXjHTnYO2Yr0MJFnmUantExUSg Xsex/oX3W+VEglpLLMrC6wpt1jxfdDiWMc7IVzo2zWlxpeVRQgMfwmUv8gVmdGX89YKH /HI1+tYCx7tbOg7CvzYtnATitPyFEf8B41jGH4xE+awMJ0YdnPHpO/OvgIhfwXvExvFp oAU2wb6m44XZoZpVqs87WsGaHIUAfhC/GyOforarHWOxfupdWdDKtNs4usKA04nxmgw8 kP6x54XgAV24encfK0kNboTawG1oMc5zlvZ+OQ0RsWbrjip2tQWY9lTkgM5gle6bVUWc Z1/A== 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=RWpqyPadlsVIb/dOXdf9CZCS77v+bENCYdcQV6fKqlUcUajpoHFzD0I8uyUDCmlJEP qBICHEHZUfeE/8F4J2mJyoLNFCdaD0ycC6zCz5OQttCyUBukWRNA74mgUG1kDdI5wNtK uxshWhp9gnm0ONXQRxHMDd4IRmwuJBlFxAJUgfpd92whY7tz1GUfL1+JGlxDcUot43Hf d75TWIObwBqggU9fK9EhIDVW8e5SuWN8iWAkD8FhOAWm5NIabn/GAB0RTN1rh6FB7R1q f6ffC7NvHg3Kf/+dF9egc6KybzUzVcC/sNprLMqFSRYMq85wBw7ORrlbal3e9j0SintI CaVw== X-Gm-Message-State: AOAM532XDSEzDy3jgsVLaWkG9PQ2sMjZeZ/ODxLPisBGtGIlSiFTV4qv nCkYgTnWFMrpjMybykbpIlZr4g== X-Google-Smtp-Source: ABdhPJy4rrs4Yd+dSBltlP9MU+WoUAnn2Nr859YwbSPgNkZJwkSvEt7W6+PVPE5XkvK5+KUEjAVJ9g== X-Received: by 2002:a5d:6641:: with SMTP id f1mr10312582wrw.307.1596357306003; Sun, 02 Aug 2020 01:35:06 -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 d14sm19281466wre.44.2020.08.02.01.35.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Aug 2020 01:35:05 -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 v6 3/3] iio: adc: xilinx-xadc: use devm_krealloc() Date: Sun, 2 Aug 2020 10:34:58 +0200 Message-Id: <20200802083458.24323-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200802083458.24323-1-brgl@bgdev.pl> References: <20200802083458.24323-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; }