gmac get mac form eeprom

hc

2024-05-10 37f49e37ab4cb5d0bc4c60eb5c6d4dd57db767bb

 kernel/drivers/watchdog/npcm_wdt.c
..
..
@@ -103,30 +103,29 @@
103
103
 	return 0;
104
104
 }
105
105
 
106
-
107
106
 static int npcm_wdt_set_timeout(struct watchdog_device *wdd,
108
107
 				unsigned int timeout)
109
108
 {
110
109
 	if (timeout < 2)
111
110
 		wdd->timeout = 1;
112
111
 	else if (timeout < 3)
113
-	      wdd->timeout = 2;
112
+		wdd->timeout = 2;
114
113
 	else if (timeout < 6)
115
-	      wdd->timeout = 5;
114
+		wdd->timeout = 5;
116
115
 	else if (timeout < 11)
117
-	      wdd->timeout = 10;
116
+		wdd->timeout = 10;
118
117
 	else if (timeout < 22)
119
-	      wdd->timeout = 21;
118
+		wdd->timeout = 21;
120
119
 	else if (timeout < 44)
121
-	      wdd->timeout = 43;
120
+		wdd->timeout = 43;
122
121
 	else if (timeout < 87)
123
-	      wdd->timeout = 86;
122
+		wdd->timeout = 86;
124
123
 	else if (timeout < 173)
125
-	      wdd->timeout = 172;
124
+		wdd->timeout = 172;
126
125
 	else if (timeout < 688)
127
-	      wdd->timeout = 687;
126
+		wdd->timeout = 687;
128
127
 	else
129
-	      wdd->timeout = 2750;
128
+		wdd->timeout = 2750;
130
129
 
131
130
 	if (watchdog_active(wdd))
132
131
 		npcm_wdt_start(wdd);
..
..
@@ -181,16 +180,14 @@
181
180
 {
182
181
 	struct device *dev = &pdev->dev;
183
182
 	struct npcm_wdt *wdt;
184
-	struct resource *res;
185
183
 	int irq;
186
184
 	int ret;
187
185
 
188
-	wdt = devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL);
186
+	wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
189
187
 	if (!wdt)
190
188
 		return -ENOMEM;
191
189
 
192
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
193
-	wdt->reg = devm_ioremap_resource(dev, res);
190
+	wdt->reg = devm_platform_ioremap_resource(pdev, 0);
194
191
 	if (IS_ERR(wdt->reg))
195
192
 		return PTR_ERR(wdt->reg);
196
193
 
..
..
@@ -216,16 +213,14 @@
216
213
 		set_bit(WDOG_HW_RUNNING, &wdt->wdd.status);
217
214
 	}
218
215
 
219
-	ret = devm_request_irq(dev, irq, npcm_wdt_interrupt, 0,
220
-			       "watchdog", wdt);
216
+	ret = devm_request_irq(dev, irq, npcm_wdt_interrupt, 0, "watchdog",
217
+			       wdt);
221
218
 	if (ret)
222
219
 		return ret;
223
220
 
224
221
 	ret = devm_watchdog_register_device(dev, &wdt->wdd);
225
-	if (ret) {
226
-		dev_err(dev, "failed to register watchdog\n");
222
+	if (ret)
227
223
 		return ret;
228
-	}
229
224
 
230
225
 	dev_info(dev, "NPCM watchdog driver enabled\n");
231
226