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@xxxxxxx>
---
drivers/hwmon/xgene-hwmon.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/hwmon/xgene-hwmon.c b/drivers/hwmon/xgene-hwmon.c
index 5783436..85c4e3d 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)
}
} else {
struct acpi_pcct_hw_reduced *cppc_ss;
- int version = XGENE_HWMON_V1;
-#ifdef CONFIG_ACPI
const struct acpi_device_id *acpi_id;
+ int version = XGENE_HWMON_V1;
- acpi_id = acpi_match_device(xgene_hwmon_acpi_match, &pdev->dev);
+ acpi_id = acpi_match_device(pdev->dev.driver->acpi_match_table,
+ &pdev->dev);
if (!acpi_id)
return -EINVAL;
version = (int)acpi_id->driver_data;
-#endif
if (device_property_read_u32(&pdev->dev, "pcc-channel",
&ctx->mbox_idx)) {
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-hwmon" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
