]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
watchdog: s3c2410_wdt: Drop S3C2410 support
authorKrzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Wed, 17 Dec 2025 09:51:55 +0000 (10:51 +0100)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Sun, 18 Jan 2026 09:56:11 +0000 (10:56 +0100)
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>
drivers/watchdog/s3c2410_wdt.c

index b774477190b60c4f0a8db7c6fe16f408d2672bc5..e31f93db050966a0724c6caee6acae8db47f1c24 100644 (file)
@@ -208,11 +208,6 @@ struct s3c2410_wdt {
        u32 max_cnt;
 };
 
-static const struct s3c2410_wdt_variant drv_data_s3c2410 = {
-       .quirks = 0
-};
-
-#ifdef CONFIG_OF
 static const struct s3c2410_wdt_variant drv_data_s3c6410 = {
        .quirks = QUIRK_HAS_WTCLRINT_REG,
 };
@@ -378,8 +373,6 @@ static const struct s3c2410_wdt_variant drv_data_exynosautov920_cl1 = {
 static const struct of_device_id s3c2410_wdt_match[] = {
        { .compatible = "google,gs101-wdt",
          .data = &drv_data_gs101_cl0 },
-       { .compatible = "samsung,s3c2410-wdt",
-         .data = &drv_data_s3c2410 },
        { .compatible = "samsung,s3c6410-wdt",
          .data = &drv_data_s3c6410 },
        { .compatible = "samsung,exynos5250-wdt",
@@ -399,16 +392,6 @@ static const struct of_device_id s3c2410_wdt_match[] = {
        {},
 };
 MODULE_DEVICE_TABLE(of, s3c2410_wdt_match);
-#endif
-
-static const struct platform_device_id s3c2410_wdt_ids[] = {
-       {
-               .name = "s3c2410-wdt",
-               .driver_data = (unsigned long)&drv_data_s3c2410,
-       },
-       {}
-};
-MODULE_DEVICE_TABLE(platform, s3c2410_wdt_ids);
 
 /* functions */
 
@@ -720,7 +703,6 @@ s3c2410_get_wdt_drv_data(struct platform_device *pdev, struct s3c2410_wdt *wdt)
                           platform_get_device_id(pdev)->driver_data;
        }
 
-#ifdef CONFIG_OF
        /* Choose Exynos850/ExynosAutov9 driver data w.r.t. cluster index */
        if (variant == &drv_data_exynos850_cl0 ||
            variant == &drv_data_exynosautov9_cl0 ||
@@ -756,7 +738,6 @@ s3c2410_get_wdt_drv_data(struct platform_device *pdev, struct s3c2410_wdt *wdt)
                        return dev_err_probe(dev, -EINVAL, "wrong cluster index: %u\n", index);
                }
        }
-#endif
 
        wdt->drv_data = variant;
        return 0;
@@ -949,11 +930,10 @@ static DEFINE_SIMPLE_DEV_PM_OPS(s3c2410wdt_pm_ops,
 static struct platform_driver s3c2410wdt_driver = {
        .probe          = s3c2410wdt_probe,
        .shutdown       = s3c2410wdt_shutdown,
-       .id_table       = s3c2410_wdt_ids,
        .driver         = {
                .name   = "s3c2410-wdt",
                .pm     = pm_sleep_ptr(&s3c2410wdt_pm_ops),
-               .of_match_table = of_match_ptr(s3c2410_wdt_match),
+               .of_match_table = s3c2410_wdt_match,
        },
 };