]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
platform/x86: intel_pmc_ipc: Switch to use driver->dev_groups
authorMika Westerberg <mika.westerberg@linux.intel.com>
Wed, 22 Jan 2020 16:46:19 +0000 (19:46 +0300)
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 22 Jan 2020 16:52:27 +0000 (18:52 +0200)
The driver core provides support for adding additional attributes for
devices via new ->dev_groups member of struct device_driver. Convert the
driver to use that instead of adding the attributes manually.

Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drivers/platform/x86/intel_pmc_ipc.c

index 7b180ead064af0e090353480296109fd484a1b4f..2433bf73f1eda943c73f7b4dc6e6b04293dceabc 100644 (file)
@@ -539,6 +539,11 @@ static const struct attribute_group intel_ipc_group = {
        .attrs = intel_ipc_attrs,
 };
 
+static const struct attribute_group *intel_ipc_groups[] = {
+       &intel_ipc_group,
+       NULL
+};
+
 static struct resource punit_res_array[] = {
        /* Punit BIOS */
        {
@@ -879,18 +884,10 @@ static int ipc_plat_probe(struct platform_device *pdev)
                goto err_irq;
        }
 
-       ret = sysfs_create_group(&pdev->dev.kobj, &intel_ipc_group);
-       if (ret) {
-               dev_err(&pdev->dev, "Failed to create sysfs group %d\n",
-                       ret);
-               goto err_sys;
-       }
-
        ipcdev.has_gcr_regs = true;
 
        return 0;
-err_sys:
-       devm_free_irq(&pdev->dev, ipcdev.irq, &ipcdev);
+
 err_irq:
        platform_device_unregister(ipcdev.tco_dev);
        platform_device_unregister(ipcdev.punit_dev);
@@ -901,7 +898,6 @@ err_irq:
 
 static int ipc_plat_remove(struct platform_device *pdev)
 {
-       sysfs_remove_group(&pdev->dev.kobj, &intel_ipc_group);
        devm_free_irq(&pdev->dev, ipcdev.irq, &ipcdev);
        platform_device_unregister(ipcdev.tco_dev);
        platform_device_unregister(ipcdev.punit_dev);
@@ -916,6 +912,7 @@ static struct platform_driver ipc_plat_driver = {
        .driver = {
                .name = "pmc-ipc-plat",
                .acpi_match_table = ACPI_PTR(ipc_acpi_ids),
+               .dev_groups = intel_ipc_groups,
        },
 };