Commit cf85e7c7 authored by Mika Westerberg's avatar Mika Westerberg Committed by Andy Shevchenko

platform/x86: intel_pmc_ipc: Switch to use driver->dev_groups

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent fc07ac64
...@@ -539,6 +539,11 @@ static const struct attribute_group intel_ipc_group = { ...@@ -539,6 +539,11 @@ static const struct attribute_group intel_ipc_group = {
.attrs = intel_ipc_attrs, .attrs = intel_ipc_attrs,
}; };
static const struct attribute_group *intel_ipc_groups[] = {
&intel_ipc_group,
NULL
};
static struct resource punit_res_array[] = { static struct resource punit_res_array[] = {
/* Punit BIOS */ /* Punit BIOS */
{ {
...@@ -879,18 +884,10 @@ static int ipc_plat_probe(struct platform_device *pdev) ...@@ -879,18 +884,10 @@ static int ipc_plat_probe(struct platform_device *pdev)
goto err_irq; 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; ipcdev.has_gcr_regs = true;
return 0; return 0;
err_sys:
devm_free_irq(&pdev->dev, ipcdev.irq, &ipcdev);
err_irq: err_irq:
platform_device_unregister(ipcdev.tco_dev); platform_device_unregister(ipcdev.tco_dev);
platform_device_unregister(ipcdev.punit_dev); platform_device_unregister(ipcdev.punit_dev);
...@@ -901,7 +898,6 @@ static int ipc_plat_probe(struct platform_device *pdev) ...@@ -901,7 +898,6 @@ static int ipc_plat_probe(struct platform_device *pdev)
static int ipc_plat_remove(struct platform_device *pdev) 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); devm_free_irq(&pdev->dev, ipcdev.irq, &ipcdev);
platform_device_unregister(ipcdev.tco_dev); platform_device_unregister(ipcdev.tco_dev);
platform_device_unregister(ipcdev.punit_dev); platform_device_unregister(ipcdev.punit_dev);
...@@ -916,6 +912,7 @@ static struct platform_driver ipc_plat_driver = { ...@@ -916,6 +912,7 @@ static struct platform_driver ipc_plat_driver = {
.driver = { .driver = {
.name = "pmc-ipc-plat", .name = "pmc-ipc-plat",
.acpi_match_table = ACPI_PTR(ipc_acpi_ids), .acpi_match_table = ACPI_PTR(ipc_acpi_ids),
.dev_groups = intel_ipc_groups,
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment