platform/x86/intel/ifs: IFS cleanup

Cleanup incorporating misc review comments

 - Remove the subdirectory intel_ifs/0 for devicenode [1]
 - Make plat_ifs_groups non static and use it directly without using a
    function [2]

Link: https://lore.kernel.org/lkml/Y+4kQOtrHt5pdsSO@kroah.com/
Link: https://lore.kernel.org/lkml/Y9nyxNesVHCUXAcH@kroah.com/
Signed-off-by: Jithu Joseph <jithu.joseph@intel.com>
Reviewed-by: Tony Luck <tony.luck@intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20230322003359.213046-4-jithu.joseph@intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/platform/x86/intel/ifs/core.c b/drivers/platform/x86/intel/ifs/core.c
index e2bf728eefdf2ff96ab9e70907201f34224d91cf..f272644617a33460ab47eb09e1d5e3a657748497 100644 (file)
--- a/drivers/platform/x86/intel/ifs/core.c
+++ b/drivers/platform/x86/intel/ifs/core.c
@@ -20,6 +20,8 @@ static const struct x86_cpu_id ifs_cpu_ids[] __initconst = {
 };
 MODULE_DEVICE_TABLE(x86cpu, ifs_cpu_ids);
 
+ATTRIBUTE_GROUPS(plat_ifs);
+
 bool *ifs_pkg_auth;
 
 static const struct ifs_test_caps scan_test = {
@@ -31,8 +33,8 @@ static struct ifs_device ifs_device = {
        .test_caps = &scan_test,
        .misc = {
                .name = "intel_ifs_0",
-               .nodename = "intel_ifs/0",
                .minor = MISC_DYNAMIC_MINOR,
+               .groups = plat_ifs_groups,
        },
 };
 
@@ -55,8 +57,6 @@ static int __init ifs_init(void)
        if (rdmsrl_safe(MSR_INTEGRITY_CAPS, &msrval))
                return -ENODEV;
 
-       ifs_device.misc.groups = ifs_get_groups();
-
        if (!(msrval & BIT(ifs_device.test_caps->integrity_cap_bit)))
                return -ENODEV;
 

diff --git a/drivers/platform/x86/intel/ifs/ifs.h b/drivers/platform/x86/intel/ifs/ifs.h
index d9c1a1f3e31dd178ff173885043691094a50d196..55bcc70c296602c2b4029ed870c92b75e8962697 100644 (file)
--- a/drivers/platform/x86/intel/ifs/ifs.h
+++ b/drivers/platform/x86/intel/ifs/ifs.h
@@ -252,6 +252,6 @@ static inline const struct ifs_test_caps *ifs_get_test_caps(struct device *dev)
 extern bool *ifs_pkg_auth;
 int ifs_load_firmware(struct device *dev);
 int do_core_test(int cpu, struct device *dev);
-const struct attribute_group **ifs_get_groups(void);
+extern struct attribute *plat_ifs_attrs[];
 
 #endif

diff --git a/drivers/platform/x86/intel/ifs/sysfs.c b/drivers/platform/x86/intel/ifs/sysfs.c
index ee636a76b083ab26d3afa956307a9d3c38f3babb..2007d8054f04286eb06bd3691c47b66e1e1f5036 100644 (file)
--- a/drivers/platform/x86/intel/ifs/sysfs.c
+++ b/drivers/platform/x86/intel/ifs/sysfs.c
@@ -141,7 +141,7 @@ static ssize_t image_version_show(struct device *dev,
 static DEVICE_ATTR_RO(image_version);
 
 /* global scan sysfs attributes */
-static struct attribute *plat_ifs_attrs[] = {
+struct attribute *plat_ifs_attrs[] = {
        &dev_attr_details.attr,
        &dev_attr_status.attr,
        &dev_attr_run_test.attr,
@@ -149,10 +149,3 @@ static struct attribute *plat_ifs_attrs[] = {
        &dev_attr_image_version.attr,
        NULL
 };
-
-ATTRIBUTE_GROUPS(plat_ifs);
-
-const struct attribute_group **ifs_get_groups(void)
-{
-       return plat_ifs_groups;
-}