driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I89TNS CVE: NA ---------------------------------------------------------------------- The mainline`s patch [1] Add ACPI support for ARM ETE, So revert the private patch. [1]: 3a2888aa1f "coresight: etm4x: Add ACPI support in platform driver" This reverts commit 4dbe4845c75318a491839c56cb6b43ef3c0b7cfa. Signed-off-by: Junhao He <hejunhao3@huawei.com> --- drivers/hwtracing/coresight/coresight-etm4x-core.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index 0a81e9d7cac2..b0755dffb8c6 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -2157,19 +2157,12 @@ static const struct of_device_id etm4_sysreg_match[] = { {} }; -static const struct acpi_device_id static_ete_ids[] = { - {"HISI0461", 0}, - {} -}; -MODULE_DEVICE_TABLE(acpi, static_ete_ids); - static struct platform_driver etm4_platform_driver = { .probe = etm4_probe_platform_dev, .remove = etm4_remove_platform_dev, .driver = { .name = "coresight-etm4x", .of_match_table = etm4_sysreg_match, - .acpi_match_table = static_ete_ids, .suppress_bind_attrs = true, }, }; -- 2.33.0