bus: hisi_lpc: Don't guard ACPI IDs with ACPI_PTR()

The OF ID table is not guarded, and the ACPI table does not needs it either.
The IDs do not depend on the configuration. Hence drop ACPI_PTR() from the
code and move ID table closer to its user.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>

diff --git a/drivers/bus/hisi_lpc.c b/drivers/bus/hisi_lpc.c
index a6513a5..74f4448 100644 (file)
--- a/drivers/bus/hisi_lpc.c
+++ b/drivers/bus/hisi_lpc.c
@@ -589,11 +589,6 @@ static int hisi_lpc_acpi_probe(struct device *hostdev)
 
        return ret;
 }
-
-static const struct acpi_device_id hisi_lpc_acpi_match[] = {
-       {"HISI0191"},
-       {}
-};
 #else
 static int hisi_lpc_acpi_probe(struct device *dev)
 {
@@ -688,11 +683,16 @@ static const struct of_device_id hisi_lpc_of_match[] = {
        {}
 };
 
+static const struct acpi_device_id hisi_lpc_acpi_match[] = {
+       {"HISI0191"},
+       {}
+};
+
 static struct platform_driver hisi_lpc_driver = {
        .driver = {
                .name           = DRV_NAME,
                .of_match_table = hisi_lpc_of_match,
-               .acpi_match_table = ACPI_PTR(hisi_lpc_acpi_match),
+               .acpi_match_table = hisi_lpc_acpi_match,
        },
        .probe = hisi_lpc_probe,
        .remove = hisi_lpc_remove,