tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

watchdog: s3c2410_wdt: Drop S3C2410 support

Samsung S3C2410 SoC was removed from Linux kernel in the
commit 61b7f8920b17 ("ARM: s3c: remove all s3c24xx support"), in January
2023. There are no in-kernel users of samsung,s3c2410-wdt compatible
and s3c2410-wdt platform device name, so drop both. This leaves the
driver boundable only via compatibles, so drop any CONFIG_OF ifdefs.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

authored by

Krzysztof Kozlowski and committed by
Wim Van Sebroeck a7264838 f2cfba28

+1 -21
+1 -21
drivers/watchdog/s3c2410_wdt.c
··· 208 208 u32 max_cnt; 209 209 }; 210 210 211 - static const struct s3c2410_wdt_variant drv_data_s3c2410 = { 212 - .quirks = 0 213 - }; 214 - 215 - #ifdef CONFIG_OF 216 211 static const struct s3c2410_wdt_variant drv_data_s3c6410 = { 217 212 .quirks = QUIRK_HAS_WTCLRINT_REG, 218 213 }; ··· 373 378 static const struct of_device_id s3c2410_wdt_match[] = { 374 379 { .compatible = "google,gs101-wdt", 375 380 .data = &drv_data_gs101_cl0 }, 376 - { .compatible = "samsung,s3c2410-wdt", 377 - .data = &drv_data_s3c2410 }, 378 381 { .compatible = "samsung,s3c6410-wdt", 379 382 .data = &drv_data_s3c6410 }, 380 383 { .compatible = "samsung,exynos5250-wdt", ··· 392 399 {}, 393 400 }; 394 401 MODULE_DEVICE_TABLE(of, s3c2410_wdt_match); 395 - #endif 396 - 397 - static const struct platform_device_id s3c2410_wdt_ids[] = { 398 - { 399 - .name = "s3c2410-wdt", 400 - .driver_data = (unsigned long)&drv_data_s3c2410, 401 - }, 402 - {} 403 - }; 404 - MODULE_DEVICE_TABLE(platform, s3c2410_wdt_ids); 405 402 406 403 /* functions */ 407 404 ··· 703 720 platform_get_device_id(pdev)->driver_data; 704 721 } 705 722 706 - #ifdef CONFIG_OF 707 723 /* Choose Exynos850/ExynosAutov9 driver data w.r.t. cluster index */ 708 724 if (variant == &drv_data_exynos850_cl0 || 709 725 variant == &drv_data_exynosautov9_cl0 || ··· 738 756 return dev_err_probe(dev, -EINVAL, "wrong cluster index: %u\n", index); 739 757 } 740 758 } 741 - #endif 742 759 743 760 wdt->drv_data = variant; 744 761 return 0; ··· 930 949 static struct platform_driver s3c2410wdt_driver = { 931 950 .probe = s3c2410wdt_probe, 932 951 .shutdown = s3c2410wdt_shutdown, 933 - .id_table = s3c2410_wdt_ids, 934 952 .driver = { 935 953 .name = "s3c2410-wdt", 936 954 .pm = pm_sleep_ptr(&s3c2410wdt_pm_ops), 937 - .of_match_table = of_match_ptr(s3c2410_wdt_match), 955 + .of_match_table = s3c2410_wdt_match, 938 956 }, 939 957 }; 940 958