Skip to content

Commit a726483

Browse files
krzkWim Van Sebroeck
authored andcommitted
watchdog: s3c2410_wdt: Drop S3C2410 support
Samsung S3C2410 SoC was removed from Linux kernel in the commit 61b7f89 ("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>
1 parent f2cfba2 commit a726483

1 file changed

Lines changed: 1 addition & 21 deletions

File tree

drivers/watchdog/s3c2410_wdt.c

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,6 @@ struct s3c2410_wdt {
208208
u32 max_cnt;
209209
};
210210

211-
static const struct s3c2410_wdt_variant drv_data_s3c2410 = {
212-
.quirks = 0
213-
};
214-
215-
#ifdef CONFIG_OF
216211
static const struct s3c2410_wdt_variant drv_data_s3c6410 = {
217212
.quirks = QUIRK_HAS_WTCLRINT_REG,
218213
};
@@ -378,8 +373,6 @@ static const struct s3c2410_wdt_variant drv_data_exynosautov920_cl1 = {
378373
static const struct of_device_id s3c2410_wdt_match[] = {
379374
{ .compatible = "google,gs101-wdt",
380375
.data = &drv_data_gs101_cl0 },
381-
{ .compatible = "samsung,s3c2410-wdt",
382-
.data = &drv_data_s3c2410 },
383376
{ .compatible = "samsung,s3c6410-wdt",
384377
.data = &drv_data_s3c6410 },
385378
{ .compatible = "samsung,exynos5250-wdt",
@@ -399,16 +392,6 @@ static const struct of_device_id s3c2410_wdt_match[] = {
399392
{},
400393
};
401394
MODULE_DEVICE_TABLE(of, s3c2410_wdt_match);
402-
#endif
403-
404-
static const struct platform_device_id s3c2410_wdt_ids[] = {
405-
{
406-
.name = "s3c2410-wdt",
407-
.driver_data = (unsigned long)&drv_data_s3c2410,
408-
},
409-
{}
410-
};
411-
MODULE_DEVICE_TABLE(platform, s3c2410_wdt_ids);
412395

413396
/* functions */
414397

@@ -720,7 +703,6 @@ s3c2410_get_wdt_drv_data(struct platform_device *pdev, struct s3c2410_wdt *wdt)
720703
platform_get_device_id(pdev)->driver_data;
721704
}
722705

723-
#ifdef CONFIG_OF
724706
/* Choose Exynos850/ExynosAutov9 driver data w.r.t. cluster index */
725707
if (variant == &drv_data_exynos850_cl0 ||
726708
variant == &drv_data_exynosautov9_cl0 ||
@@ -756,7 +738,6 @@ s3c2410_get_wdt_drv_data(struct platform_device *pdev, struct s3c2410_wdt *wdt)
756738
return dev_err_probe(dev, -EINVAL, "wrong cluster index: %u\n", index);
757739
}
758740
}
759-
#endif
760741

761742
wdt->drv_data = variant;
762743
return 0;
@@ -949,11 +930,10 @@ static DEFINE_SIMPLE_DEV_PM_OPS(s3c2410wdt_pm_ops,
949930
static struct platform_driver s3c2410wdt_driver = {
950931
.probe = s3c2410wdt_probe,
951932
.shutdown = s3c2410wdt_shutdown,
952-
.id_table = s3c2410_wdt_ids,
953933
.driver = {
954934
.name = "s3c2410-wdt",
955935
.pm = pm_sleep_ptr(&s3c2410wdt_pm_ops),
956-
.of_match_table = of_match_ptr(s3c2410_wdt_match),
936+
.of_match_table = s3c2410_wdt_match,
957937
},
958938
};
959939

0 commit comments

Comments
 (0)