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@xxxxxxxxxx>
---
drivers/watchdog/s3c2410_wdt.c | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 40901bdac42613458f93c09654353190785ff072..f65f25fcce3ecbb1739ff98245b69601dc5353d8 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -200,11 +200,6 @@ struct s3c2410_wdt {
struct regmap *pmureg;
};
-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,
};
@@ -368,8 +363,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",
@@ -389,16 +382,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 */
@@ -705,7 +688,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 ||
@@ -741,7 +723,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;
@@ -929,11 +910,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,
},
};
--
2.48.1
