From 3361ff9572c8cde1d47fb8462dd2d4c5d99c3fc0 Mon Sep 17 00:00:00 2001 From: Pawel Dembicki Date: Tue, 21 Nov 2023 10:46:13 +0100 Subject: [PATCH] mpc85xx: Get rid of 'of_flat_dt_is_compatible' This patch replaces 'of_flat_dt_is_compatible' with 'of_machine_is_compatible'. The TL-WDR4900 platform file won't compile in the 6.1 kernel. The platform files for the rest of the routers have been reworked or based on newer solutions. Let's make the TL-WDR4900 consistent with them. Signed-off-by: Pawel Dembicki --- .../files/arch/powerpc/platforms/85xx/tl_wdr4900_v1.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/tl_wdr4900_v1.c b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/tl_wdr4900_v1.c index 0b2ebcd002..87a97e65c8 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/tl_wdr4900_v1.c +++ b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/tl_wdr4900_v1.c @@ -121,11 +121,8 @@ machine_arch_initcall(tl_wdr4900_v1, mpc85xx_common_publish_devices); */ static int __init tl_wdr4900_v1_probe(void) { - unsigned long root = of_get_flat_dt_root(); - - if (of_flat_dt_is_compatible(root, "tplink,tl-wdr4900-v1")) + if (of_machine_is_compatible("tplink,tl-wdr4900-v1")) return 1; - return 0; } -- 2.30.2