diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2022-09-05 10:23:05 +0200 |
|---|---|---|
| committer | Wei Xu <xuwei5@hisilicon.com> | 2022-09-08 04:27:29 +0200 |
| commit | e8cd65061fac64d6d0b5c3f5c3059c326b1492f0 (patch) | |
| tree | 2ca626c004760b06e65830c5f988d2f0517b6858 /drivers/bus | |
| parent | bus: hisi_lpc: Correct error code for timeout (diff) | |
| download | linux-e8cd65061fac64d6d0b5c3f5c3059c326b1492f0.tar.xz linux-e8cd65061fac64d6d0b5c3f5c3059c326b1492f0.zip | |
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>
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/hisi_lpc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/bus/hisi_lpc.c b/drivers/bus/hisi_lpc.c index a6513a571d7b..74f4448bff9d 100644 --- 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, |