From patchwork Mon Aug 17 17:05: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: 11718937 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 7352F15E6 for ; Mon, 17 Aug 2020 17:29:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5A53620657 for ; Mon, 17 Aug 2020 17:29:34 +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="qwpkWQsz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389312AbgHQR33 (ORCPT ); Mon, 17 Aug 2020 13:29:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388455AbgHQRFn (ORCPT ); Mon, 17 Aug 2020 13:05:43 -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 35A95C061343 for ; Mon, 17 Aug 2020 10:05:41 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id g75so14499862wme.4 for ; Mon, 17 Aug 2020 10:05:41 -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=2ppXwFfraTQM+joRLep3NDQF8tVHJ1ee0dymwQ438l4=; b=qwpkWQszAeTcIOVQClBm7OUU7yvOqxouNptJiW5TzPM+y8IP8dXVk06w4q4N4ZMbmB iscXGX1e8h4g/uzv2iHKCyBAlvT/l8tCY/WRMC0yKfANHE2Y1W/jSjLvEGa02NH6BDDk eq38E90AKRl2ARO4SR5dnXezG9WG5HhwzNKC8EbQMsPPIfgfewww7AOJ5aDUcS+ii/2Y 0PqhLL8NbG6RQTtJLEojmsZj2+J7+ZnM92Y6SLVKlfVoKEQuRpSDV34grq8cVTPh9VWR s+qhuOjQnND5AAwbUZNlWCsWObVSAb8NzX8NDHzSL3dJWf1EvyJ/2QP7srTU+KbqE2ZS vQwA== 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=2ppXwFfraTQM+joRLep3NDQF8tVHJ1ee0dymwQ438l4=; b=rpmGGXbhgGIhJudifXeKzXFy5XJbukgJC68a0/KCjaZN4k/3ZsLZ6+ngzLF3G9RVPH /A0LF13fdSxh5S918lldndD4wVw1JN2EDKof8R54rWf0HJ4bi43iR4JvpDugGAMmC6gN DJcpRJOOC6jHkIsyPvb9Au2T5Z8En9LrT1nc4HR91oeQ8QokZNyaHeHw4rLKyLcNNEBc AbaKM+CV3XYRv5N3QjTO+SI88S4Xd1qhHu5GUuw/sWKs8xAzx1X2YNdw1p4SpPRBEXl1 2L0D0s1OLy1/5+S9OimMtDPWgeG/aTEKtl9fiU/YakqgtnFUA8bu/SUHmocXhitJywZX J2KQ== X-Gm-Message-State: AOAM530GIB6kS3gEQMOCcHmboNjOGbi9yYvMDHR7TEvisART8a5TJ0Qj C03rnoMd0ud68InFi0L97lqkSw== X-Google-Smtp-Source: ABdhPJz9Jid19DV7ctHwh+x2zDOnvpSQodhQiDyVVNFAeXKoUGkGRyRcjZtjZiKWMvR0JlGPWoBw+g== X-Received: by 2002:a05:600c:410b:: with SMTP id j11mr16058569wmi.38.1597683940681; Mon, 17 Aug 2020 10:05:40 -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 k184sm29747177wme.1.2020.08.17.10.05.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 10:05:40 -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 v7 1/3] devres: provide devm_krealloc() Date: Mon, 17 Aug 2020 19:05:33 +0200 Message-Id: <20200817170535.17041-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200817170535.17041-1-brgl@bgdev.pl> References: <20200817170535.17041-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 | 93 +++++++++++++++++++ include/linux/device.h | 2 + 3 files changed, 96 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..bfe46e83147e 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -36,6 +36,17 @@ struct devres { u8 __aligned(ARCH_KMALLOC_MINALIGN) data[]; }; +static struct devres *to_devres(void *data) +{ + return (struct devres *)((u8 *)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 +137,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 +856,80 @@ 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 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; + + new_dr = alloc_dr(devm_kmalloc_release, + total_new_size, gfp, dev_to_node(dev)); + if (!new_dr) + 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); + 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); + + memcpy(new_dr->data, old_dr->data, devres_data_size(total_old_size)); + 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 Mon Aug 17 17:05: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: 11718857 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 0F291722 for ; Mon, 17 Aug 2020 17:09:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E8CAB20716 for ; Mon, 17 Aug 2020 17:09:58 +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="Fx+WmWRg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389383AbgHQRJz (ORCPT ); Mon, 17 Aug 2020 13:09:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388465AbgHQRFn (ORCPT ); Mon, 17 Aug 2020 13:05:43 -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 32E82C061345 for ; Mon, 17 Aug 2020 10:05:43 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id k20so14504717wmi.5 for ; Mon, 17 Aug 2020 10:05:43 -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=Fx+WmWRgfr0mflhkLJ74+msNBLBy0EPtTitUpI7fH2cbRlxfGDsxPb22XTGidDpn6z 578bGEK8cSGp6XbZrNa4+1KI9nFHrQic7Cx7U0Ph2PRWmjRKEaEuZHxQKwNxkH1FNhiT 24bYnn/L8FNNwfLfJU2by7fFZtPx2c1PuI+gq8iKJANmqbJwQw5wO5K4d0Ss1ZU3yO1T 9FsmnsV1apgyWtGo4WGptWM5dbrpful2QmrK8OXh7wZl7PUudknHZ42YUNSy40/1bugC zdB0NbEmV0IbIypDt0T/1qpPbPQFb66qEcYWUQ0uFbzrWzAVPuAaWS9T4JnjXrtAguX1 Xt8g== 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=dtmTo8GvJI+qfv5r4Jdw1Uu4PIEWFypg9zMQ0C8J/fw6xn26++a1IKMlO/tNjchQKZ d+tAlWVGhJSYvvXrFsye9C9LZOEe5a8Do5sFq4cW33YmtyyXiD0FatyW2Zf70v1QLEUO Z0cAN3Y2YNrsVfcy6op7X7UzsNRk30PcWUeG6A2LqOg0nSRg4Og2M3DKCdwE/LvB0AEH toc8RcwgTo/D9pTdq7TaLCKVQyQvK59EhT0jRcT9UXLE1VrGx6da7X5+JnRu0YATuoU1 XnM9QRlEbb9KYhMwy04eoBKG6Q2cXQqBy0bjIuACcSg/BE2msIxXKNeDa5v5/xnimTJ6 fCEA== X-Gm-Message-State: AOAM5301RFhAe7USJ+YGXeo2BlKhSkO49JRSzXJsML6Nk+OayChYOS0+ k3Bd74d8jFLTGJyAErbBk4dNEQ== X-Google-Smtp-Source: ABdhPJw0YhmfuJvsFy4mf0KmtSdpljVxHGj9ockaJ0FFHKKjx2eRxG/8HNwYyN23bACjUAbKwjJ+MQ== X-Received: by 2002:a1c:b487:: with SMTP id d129mr16340568wmf.185.1597683941879; Mon, 17 Aug 2020 10:05:41 -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 k184sm29747177wme.1.2020.08.17.10.05.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 10:05:41 -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 v7 2/3] hwmon: pmbus: use more devres helpers Date: Mon, 17 Aug 2020 19:05:34 +0200 Message-Id: <20200817170535.17041-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200817170535.17041-1-brgl@bgdev.pl> References: <20200817170535.17041-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 Mon Aug 17 17:05:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 11718855 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 E33DF14F6 for ; Mon, 17 Aug 2020 17:09:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C463020716 for ; Mon, 17 Aug 2020 17:09:52 +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="YuiXi/ki" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389378AbgHQRJr (ORCPT ); Mon, 17 Aug 2020 13:09:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388507AbgHQRGG (ORCPT ); Mon, 17 Aug 2020 13:06:06 -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 D2E17C061348 for ; Mon, 17 Aug 2020 10:05:44 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id z18so15690330wrm.12 for ; Mon, 17 Aug 2020 10:05:44 -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=YuiXi/kinFP88R0aPiCU55Nprn56KeOKbH+KhhoCxduo6j7FzXH12C+I/rUVFF2MTP rUNab8Es+pEUJ0mOl0o47LkZ9vxB88jk2clqVQO4YC3EMN54iij8Dg8f1X9T9s8V8I+t K67UfagZ+rIkHxaCUmX6dl/fnHdP01O4+yLsnKvnlNwfJ0VVDsBuk2m/Wi0mwtG58Ypl AT44t4dH86MBjKLlQOp8xEQEF9c3YypxpUYLgQAuAR9MU4UWZR68FGdiuu+hNZEmv4Tm pX8UkOQzp2mYLfUXDwUq29cTK6tNS0ySm+dy5EOekUvDleo+l/oguSRijKxKZraz93xt 27hQ== 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=lM9BhcR51De1VLZFqNkneV1j+bllB8WeoQ96MPyBcg3hyK1A4pho7U/B3pnoE1FydY 1xttHx3QniGgulTrlctXQOm9xhyU0s3i4UL7NKn+y58zHa5y9IBS1CLI/f8f/1PZrCZi iYFn6PMPSNBVwETzC+j5A2Wk/mYjahIcqiToOjiKEy67daetUZFkRkyaqfySSF9hU/rs 7Pop/vt/amWSKwNb8aGZwUnCTOkKhttn85uH3hTbpPOHPI4Vc09bcfojPJ4L6Xc+WnVQ wdELSvE4TJHqu41AfytmZO+/W4tWTFGIfzrSQltWTQDg+yjPolhP6zzpOUFXaNeIiwfx IfKg== X-Gm-Message-State: AOAM533cdBxyg7+HbzSNTxg36LYHgsBb+S0XBQNC/SXoA4frCGwY3zcK 34qo+w5q4EBQyQBIOb7R/jxj0Q== X-Google-Smtp-Source: ABdhPJzidFcB7ZIzIx5H9eHYngnMFhnJsHpdbQQUC3IPtgHxLJxrUgwpePI6OmXWPyKufiK3Jko02g== X-Received: by 2002:adf:ef92:: with SMTP id d18mr17541341wro.71.1597683943032; Mon, 17 Aug 2020 10:05:43 -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 k184sm29747177wme.1.2020.08.17.10.05.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 10:05:42 -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 v7 3/3] iio: adc: xilinx-xadc: use devm_krealloc() Date: Mon, 17 Aug 2020 19:05:35 +0200 Message-Id: <20200817170535.17041-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200817170535.17041-1-brgl@bgdev.pl> References: <20200817170535.17041-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; }