From: Suma Hegde <suma.hegde@amd.com>
To: <platform-driver-x86@vger.kernel.org>
Cc: <ilpo.jarvinen@linux.intel.com>, <hdegoede@redhat.com>,
Suma Hegde <suma.hegde@amd.com>,
Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
Subject: [PATCH] platform/x86/amd/hsmp: Remove devm_* call for sysfs and use dev_groups
Date: Wed, 10 Apr 2024 12:17:46 +0000 [thread overview]
Message-ID: <20240410121746.1955500-1-suma.hegde@amd.com> (raw)
Instead of manually calling devm_device_add_groups(), use
dev_groups.
Signed-off-by: Suma Hegde <suma.hegde@amd.com>
Reviewed-by: Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
---
This is based on the suggestions from Hans de Goede when Greg
Kroah-Hartman had suggested to switch to use device_add_groups().
drivers/platform/x86/amd/hsmp.c | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c
index 1927be901108..d6b43d8e798b 100644
--- a/drivers/platform/x86/amd/hsmp.c
+++ b/drivers/platform/x86/amd/hsmp.c
@@ -693,15 +693,29 @@ static int hsmp_create_non_acpi_sysfs_if(struct device *dev)
hsmp_create_attr_list(attr_grp, dev, i);
}
- return devm_device_add_groups(dev, hsmp_attr_grps);
+ dev->driver->dev_groups = hsmp_attr_grps;
+
+ return 0;
}
+/* Number of sysfs groups to be created in case of ACPI probing */
+#define NUM_HSMP_SYSFS_GRPS 1
+
static int hsmp_create_acpi_sysfs_if(struct device *dev)
{
+ const struct attribute_group **hsmp_attr_grps;
struct attribute_group *attr_grp;
u16 sock_ind;
int ret;
+ /* Null terminated list of attribute groups */
+ hsmp_attr_grps = devm_kcalloc(dev, NUM_HSMP_SYSFS_GRPS + 1,
+ sizeof(*hsmp_attr_grps),
+ GFP_KERNEL);
+
+ if (!hsmp_attr_grps)
+ return -ENOMEM;
+
attr_grp = devm_kzalloc(dev, sizeof(struct attribute_group), GFP_KERNEL);
if (!attr_grp)
return -ENOMEM;
@@ -716,7 +730,12 @@ static int hsmp_create_acpi_sysfs_if(struct device *dev)
if (ret)
return ret;
- return devm_device_add_group(dev, attr_grp);
+ hsmp_attr_grps[0] = attr_grp;
+ hsmp_attr_grps[1] = NULL;
+
+ dev->driver->dev_groups = hsmp_attr_grps;
+
+ return 0;
}
static int hsmp_cache_proto_ver(u16 sock_ind)
--
2.25.1
next reply other threads:[~2024-04-10 12:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-10 12:17 Suma Hegde [this message]
2024-04-10 12:24 ` [PATCH] platform/x86/amd/hsmp: Remove devm_* call for sysfs and use dev_groups Hans de Goede
2024-04-10 12:54 ` Hegde, Suma
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240410121746.1955500-1-suma.hegde@amd.com \
--to=suma.hegde@amd.com \
--cc=hdegoede@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=naveenkrishna.chatradhi@amd.com \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).