lkml.org 
[lkml]   [2023]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/7] drivers/hwmon: add local variable for newly allocated attribute_group**
Date
This allows the compiler to keep the pointer in a register and
prepares for making the struct field "const".

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
---
drivers/hwmon/hwmon.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
index c7dd3f5b2bd5..e50ab229b27d 100644
--- a/drivers/hwmon/hwmon.c
+++ b/drivers/hwmon/hwmon.c
@@ -783,6 +783,7 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,
hdev = &hwdev->dev;

if (chip) {
+ const struct attribute_group **new_groups;
struct attribute **attrs;
int ngroups = 2; /* terminating NULL plus &hwdev->groups */

@@ -790,8 +791,8 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,
for (i = 0; groups[i]; i++)
ngroups++;

- hwdev->groups = kcalloc(ngroups, sizeof(*groups), GFP_KERNEL);
- if (!hwdev->groups) {
+ hwdev->groups = new_groups = kcalloc(ngroups, sizeof(*new_groups), GFP_KERNEL);
+ if (!new_groups) {
err = -ENOMEM;
goto free_hwmon;
}
@@ -804,14 +805,14 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,

hwdev->group.attrs = attrs;
ngroups = 0;
- hwdev->groups[ngroups++] = &hwdev->group;
+ new_groups[ngroups++] = &hwdev->group;

if (groups) {
for (i = 0; groups[i]; i++)
- hwdev->groups[ngroups++] = groups[i];
+ new_groups[ngroups++] = groups[i];
}

- hdev->groups = hwdev->groups;
+ hdev->groups = new_groups;
} else {
hdev->groups = groups;
}
--
2.39.2
\
 
 \ /
  Last update: 2023-10-09 18:59    [W:1.259 / U:0.092 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site