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: 11696287 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 8E70F1731 for ; Sun, 2 Aug 2020 08:35:27 +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 66995207BB for ; Sun, 2 Aug 2020 08:35:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="IAPzjQyM"; 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="Gc+/wFA/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 66995207BB 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=IAPzjQyM68KR+XblBDJZew3T+ Y85DCtNBbQi7IfPCh0lm/y5iGfPcbDqhKcXlGCDd1xQyIFjnW/q/1Eu/ELTN13MEqlcxIG7EmkT6z j/AN/+UBy1ZPcf4dJUz73/9ijvG1OoBVGaQQVEn8tjz9aTHK5IgZpbXhYd7YVSMxDyEUChtSXFC1E RSQXBHviMiaKtlA0+BqreG+yibw5X0uWdC2qmmIFiO63ekOqCeNWkufEHvdRxSInFQzjdUyQcikv1 pB7LtrTPUuAZVgVK9Od5/0pzuk2q/7TEpivCEVFn3vEyjD7CG4lVjw5lMAkPZ8ho5hpuMNTDXzPsl oiW0Xr0YQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k29SZ-00017O-Bi; Sun, 02 Aug 2020 08:35:11 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k29ST-00016A-R0 for linux-arm-kernel@lists.infradead.org; Sun, 02 Aug 2020 08:35:06 +0000 Received: by mail-wr1-x443.google.com with SMTP id z18so27902825wrm.12 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=fxf3UXOkmQh/LBFbUIf6Sq3yOHveGS/GHKjdJHIPVP1WInUrx3w389Z+UZcKBhZl+/ tKNFymgzVluuzlbirHssDyUt9UQtjSC3BSXj/83HOGeWA2ozxCv0q7EeZ0UWeGXKtHgD Jt2/ssiCXgaWYOYc6v2p34EME8D/nqQEmnWZX6fD+fi2VKG2MUuZTRLUGyF6Js99QxDC cTXQLb0aVjrrK8eSmjvPa3Rb0MDt3wqcgcNvgWh5enMNJrPeYIXAK7A38/XtNq2OWNs8 D5dzkxc0QjNz+fDuswHqrtnqSaDl0UgGuS1JCRzl0Qc1TWCE9cASpP7ZH1E8kqYa+gX1 Vtxg== X-Gm-Message-State: AOAM533pmbYvdu78U8KgrJQd3dst9uXOSi/QelazHPaG64uSjGEGsnn0 vK0dpTyL2wCjSvk1L3b8tRsDgQ== 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200802_043505_919967_BB4F920C X-CRM114-Status: GOOD ( 16.54 ) 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:443 listed in] [list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 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);