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: 11656983 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 A1B9F618 for ; Fri, 10 Jul 2020 16:16:48 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7A2DE20657 for ; Fri, 10 Jul 2020 16:16:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Jzyma1y4"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="c/4slGI6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7A2DE20657 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Iv6A7XitsW+BCjNIPrBNnb6XzMQYjFhixUaUuPg5VJA=; b=Jzyma1y4xRKDToLr72o+/c+/T C6qWXhlUhLaSmb/ekvT5doSFUlQ4TrAEaul22L1+MmTJ5R9CHJ4o9tzdvSGVb8JdxE/0g7aOX8UB3 zw0Ojs6Izml7wu0Mp4R3V2btvwGsOmtMpvv+Sem+CyHQGRcjeUPqOMa+VPM4xiM7FJZGoLDrcmptt ZIFFA3ObqNw0KeJ4jjNLLHhbs7KaP4cy/U+QbWc09txNmBWnC59zSmt5HrXIf8Cn3o90I00JyCQ2z Gx4IEnChADagEQSAL6M/6/fvUvqZnC+TsLhVekTGFXilQgpEjjCZpeFfFplgLE6VJy3owwABy8LD/ pZ8seGDkQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtvgT-0007iF-T3; Fri, 10 Jul 2020 16:15:33 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtvgM-0007fk-U1 for linux-arm-kernel@lists.infradead.org; Fri, 10 Jul 2020 16:15:27 +0000 Received: by mail-wm1-x342.google.com with SMTP id q15so6735733wmj.2 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=sn4PqANlTdVHZGyRdiSKiXUi9TQMLLxX9BhUTYig51PBK0g+ulgpUgW/HilA+tZ1MW lKXc27+J9/hYnXAcAvalkX4cBSd7ZkkPnpwslEtj7gY8EYGnf9iP2UsBeIScTJkzFXTc Zyi7q0scvkj/JTUUrYegPh9V5C/6FKybmUZ18hmVwPYDI6959F/ZgRzoUcHwAx5bLmzB 2uVFo0rxYcQq8aL7aPkxEFhVyXHR2GSge718G+bC97FB12VGFOmxwJtX/fTVyWB+HbNt tk+ixEEORmK0c5Mzxh0Lw4RpuAe5f0eyEo0xhXo2nOzyg5hoEC3fRMQxTeplgmAu3er2 ubUQ== X-Gm-Message-State: AOAM5302qa8vI0OJMj7sh4VZidWuCWH9gSa7uzYo0bCQpPIel7r3rpZ+ mMIXw1gnLAhFvLipIHqFxoIVDQ== 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200710_121527_163892_09E79A10 X-CRM114-Status: GOOD ( 14.40 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:342 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-iio@vger.kernel.org, Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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);