diff options
author | hotran <hotran@apm.com> | 2017-10-31 16:58:07 -0400 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2017-11-01 09:14:52 -0400 |
commit | 2305a18ba9ffa105ad1686f40a7861718c338e3c (patch) | |
tree | f63cc22fa4561f19c197b22fa195add6ea46d79a | |
parent | 5813da157f7dbe03d268c8d0dd9425d0e3944910 (diff) |
hwmon: (xgene) Minor clean up of ifdef and acpi_match_table reference
This patch removes the un-necessary ifdef CONFIG_ACPI and directly
uses the acpi_match_table from the driver pdev.
Signed-off-by: Hoan Tran <hotran@apm.com>
[groeck: Dropped unnecessary initialization]
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r-- | drivers/hwmon/xgene-hwmon.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/hwmon/xgene-hwmon.c b/drivers/hwmon/xgene-hwmon.c index 57834361fb3c..a3cd91f23267 100644 --- a/drivers/hwmon/xgene-hwmon.c +++ b/drivers/hwmon/xgene-hwmon.c | |||
@@ -665,16 +665,15 @@ static int xgene_hwmon_probe(struct platform_device *pdev) | |||
665 | } | 665 | } |
666 | } else { | 666 | } else { |
667 | struct acpi_pcct_hw_reduced *cppc_ss; | 667 | struct acpi_pcct_hw_reduced *cppc_ss; |
668 | int version = XGENE_HWMON_V1; | ||
669 | #ifdef CONFIG_ACPI | ||
670 | const struct acpi_device_id *acpi_id; | 668 | const struct acpi_device_id *acpi_id; |
669 | int version; | ||
671 | 670 | ||
672 | acpi_id = acpi_match_device(xgene_hwmon_acpi_match, &pdev->dev); | 671 | acpi_id = acpi_match_device(pdev->dev.driver->acpi_match_table, |
672 | &pdev->dev); | ||
673 | if (!acpi_id) | 673 | if (!acpi_id) |
674 | return -EINVAL; | 674 | return -EINVAL; |
675 | 675 | ||
676 | version = (int)acpi_id->driver_data; | 676 | version = (int)acpi_id->driver_data; |
677 | #endif | ||
678 | 677 | ||
679 | if (device_property_read_u32(&pdev->dev, "pcc-channel", | 678 | if (device_property_read_u32(&pdev->dev, "pcc-channel", |
680 | &ctx->mbox_idx)) { | 679 | &ctx->mbox_idx)) { |