From patchwork Fri Jul 1 17:47:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 12903605 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B982C43334 for ; Fri, 1 Jul 2022 17:47:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229559AbiGARrK (ORCPT ); Fri, 1 Jul 2022 13:47:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229541AbiGARrJ (ORCPT ); Fri, 1 Jul 2022 13:47:09 -0400 Received: from smtp.smtpout.orange.fr (smtp04.smtpout.orange.fr [80.12.242.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 550E036B5C for ; Fri, 1 Jul 2022 10:47:07 -0700 (PDT) Received: from pop-os.home ([90.11.190.129]) by smtp.orange.fr with ESMTPA id 7KjPoZtgDQKua7KjPo0b6V; Fri, 01 Jul 2022 19:47:05 +0200 X-ME-Helo: pop-os.home X-ME-Auth: YWZlNiIxYWMyZDliZWIzOTcwYTEyYzlhMmU3ZiQ1M2U2MzfzZDfyZTMxZTBkMTYyNDBjNDJlZmQ3ZQ== X-ME-Date: Fri, 01 Jul 2022 19:47:05 +0200 X-ME-IP: 90.11.190.129 From: Christophe JAILLET To: Ed Brindley , Denis Pauk , Jean Delvare , Guenter Roeck Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-hwmon@vger.kernel.org Subject: [PATCH] hwmon: (asus_wmi_sensors) Save a few bytes of memory Date: Fri, 1 Jul 2022 19:47:02 +0200 Message-Id: <3a494f7049f4f9a169477d872bab0c8a7c7ec48c.1656697596.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org The first 'for' loop of asus_wmi_configure_sensor_setup() only computes the number and type of sensors that exist in the system. Here, the 'temp_sensor' structure is only used to store the data collected by asus_wmi_sensor_info(). There is no point in using a devm_ variant for this first allocation and it can be freed just after this initial loop. So use kzalloc()/kfree() to save a few bytes of memory that would be kept allocated for no good reason otherwise. Signed-off-by: Christophe JAILLET --- drivers/hwmon/asus_wmi_sensors.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/hwmon/asus_wmi_sensors.c b/drivers/hwmon/asus_wmi_sensors.c index 9e935e34c998..4873edad4996 100644 --- a/drivers/hwmon/asus_wmi_sensors.c +++ b/drivers/hwmon/asus_wmi_sensors.c @@ -514,14 +514,16 @@ static int asus_wmi_configure_sensor_setup(struct device *dev, int i, idx; int err; - temp_sensor = devm_kcalloc(dev, 1, sizeof(*temp_sensor), GFP_KERNEL); + temp_sensor = kzalloc(sizeof(*temp_sensor), GFP_KERNEL); if (!temp_sensor) return -ENOMEM; for (i = 0; i < sensor_data->wmi.sensor_count; i++) { err = asus_wmi_sensor_info(i, temp_sensor); - if (err) + if (err) { + kfree(temp_sensor); return err; + } switch (temp_sensor->data_type) { case TEMPERATURE_C: @@ -536,6 +538,7 @@ static int asus_wmi_configure_sensor_setup(struct device *dev, break; } } + kfree(temp_sensor); if (nr_count[hwmon_temp]) nr_count[hwmon_chip]++, nr_types++;