enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/drivers/watchdog/moxart_wdt.c
..
..
@@ -91,8 +91,6 @@
91
91
 {
92
92
 	struct moxart_wdt_dev *moxart_wdt;
93
93
 	struct device *dev = &pdev->dev;
94
-	struct device_node *node = dev->of_node;
95
-	struct resource *res;
96
94
 	struct clk *clk;
97
95
 	int err;
98
96
 	unsigned int max_timeout;
..
..
@@ -104,12 +102,11 @@
104
102
 
105
103
 	platform_set_drvdata(pdev, moxart_wdt);
106
104
 
107
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
108
-	moxart_wdt->base = devm_ioremap_resource(dev, res);
105
+	moxart_wdt->base = devm_platform_ioremap_resource(pdev, 0);
109
106
 	if (IS_ERR(moxart_wdt->base))
110
107
 		return PTR_ERR(moxart_wdt->base);
111
108
 
112
-	clk = of_clk_get(node, 0);
109
+	clk = devm_clk_get(dev, NULL);
113
110
 	if (IS_ERR(clk)) {
114
111
 		pr_err("%s: of_clk_get failed\n", __func__);
115
112
 		return PTR_ERR(clk);
..
..
@@ -136,21 +133,13 @@
136
133
 
137
134
 	watchdog_set_drvdata(&moxart_wdt->dev, moxart_wdt);
138
135
 
139
-	err = watchdog_register_device(&moxart_wdt->dev);
136
+	watchdog_stop_on_unregister(&moxart_wdt->dev);
137
+	err = devm_watchdog_register_device(dev, &moxart_wdt->dev);
140
138
 	if (err)
141
139
 		return err;
142
140
 
143
141
 	dev_dbg(dev, "Watchdog enabled (heartbeat=%d sec, nowayout=%d)\n",
144
142
 		moxart_wdt->dev.timeout, nowayout);
145
-
146
-	return 0;
147
-}
148
-
149
-static int moxart_wdt_remove(struct platform_device *pdev)
150
-{
151
-	struct moxart_wdt_dev *moxart_wdt = platform_get_drvdata(pdev);
152
-
153
-	moxart_wdt_stop(&moxart_wdt->dev);
154
143
 
155
144
 	return 0;
156
145
 }
..
..
@@ -163,7 +152,6 @@
163
152
 
164
153
 static struct platform_driver moxart_wdt_driver = {
165
154
 	.probe      = moxart_wdt_probe,
166
-	.remove     = moxart_wdt_remove,
167
155
 	.driver     = {
168
156
 		.name		= "moxart-watchdog",
169
157
 		.of_match_table	= moxart_watchdog_match,