aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2014-10-20 10:21:56 -0400
committerWolfram Sang <wsa@the-dreams.de>2014-10-20 10:21:56 -0400
commitfa21a580dea456c03fcf69203dcd0195df3f7dee (patch)
tree1ee19579d2a51c15c1d5ab3a7c75d87283f3b37e /drivers/watchdog
parentce882ad3c93fc076457ce9b97c19735b52b88c45 (diff)
watchdog: drop owner assignment from platform_drivers
A platform_driver does not need to set an owner, it will be populated by the driver core. Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/acquirewdt.c1
-rw-r--r--drivers/watchdog/advantechwdt.c1
-rw-r--r--drivers/watchdog/ar7_wdt.c1
-rw-r--r--drivers/watchdog/at32ap700x_wdt.c1
-rw-r--r--drivers/watchdog/at91rm9200_wdt.c1
-rw-r--r--drivers/watchdog/at91sam9_wdt.c1
-rw-r--r--drivers/watchdog/ath79_wdt.c1
-rw-r--r--drivers/watchdog/bcm2835_wdt.c1
-rw-r--r--drivers/watchdog/bcm47xx_wdt.c1
-rw-r--r--drivers/watchdog/bcm63xx_wdt.c1
-rw-r--r--drivers/watchdog/bcm_kona_wdt.c1
-rw-r--r--drivers/watchdog/bfin_wdt.c1
-rw-r--r--drivers/watchdog/coh901327_wdt.c1
-rw-r--r--drivers/watchdog/cpwd.c1
-rw-r--r--drivers/watchdog/davinci_wdt.c1
-rw-r--r--drivers/watchdog/dw_wdt.c1
-rw-r--r--drivers/watchdog/ep93xx_wdt.c1
-rw-r--r--drivers/watchdog/gef_wdt.c1
-rw-r--r--drivers/watchdog/geodewdt.c1
-rw-r--r--drivers/watchdog/gpio_wdt.c1
-rw-r--r--drivers/watchdog/iTCO_wdt.c1
-rw-r--r--drivers/watchdog/ib700wdt.c1
-rw-r--r--drivers/watchdog/ie6xx_wdt.c1
-rw-r--r--drivers/watchdog/imx2_wdt.c1
-rw-r--r--drivers/watchdog/intel-mid_wdt.c1
-rw-r--r--drivers/watchdog/jz4740_wdt.c1
-rw-r--r--drivers/watchdog/kempld_wdt.c1
-rw-r--r--drivers/watchdog/ks8695_wdt.c1
-rw-r--r--drivers/watchdog/lantiq_wdt.c1
-rw-r--r--drivers/watchdog/max63xx_wdt.c1
-rw-r--r--drivers/watchdog/menf21bmc_wdt.c1
-rw-r--r--drivers/watchdog/moxart_wdt.c1
-rw-r--r--drivers/watchdog/mpc8xxx_wdt.c1
-rw-r--r--drivers/watchdog/mv64x60_wdt.c1
-rw-r--r--drivers/watchdog/nuc900_wdt.c1
-rw-r--r--drivers/watchdog/nv_tco.c1
-rw-r--r--drivers/watchdog/of_xilinx_wdt.c1
-rw-r--r--drivers/watchdog/omap_wdt.c1
-rw-r--r--drivers/watchdog/orion_wdt.c1
-rw-r--r--drivers/watchdog/pnx4008_wdt.c1
-rw-r--r--drivers/watchdog/rdc321x_wdt.c1
-rw-r--r--drivers/watchdog/riowd.c1
-rw-r--r--drivers/watchdog/rt2880_wdt.c1
-rw-r--r--drivers/watchdog/s3c2410_wdt.c1
-rw-r--r--drivers/watchdog/sch311x_wdt.c1
-rw-r--r--drivers/watchdog/shwdt.c1
-rw-r--r--drivers/watchdog/sirfsoc_wdt.c1
-rw-r--r--drivers/watchdog/sp5100_tco.c1
-rw-r--r--drivers/watchdog/sunxi_wdt.c1
-rw-r--r--drivers/watchdog/tegra_wdt.c1
-rw-r--r--drivers/watchdog/ts72xx_wdt.c1
-rw-r--r--drivers/watchdog/twl4030_wdt.c1
-rw-r--r--drivers/watchdog/txx9wdt.c1
-rw-r--r--drivers/watchdog/ux500_wdt.c1
-rw-r--r--drivers/watchdog/xen_wdt.c1
55 files changed, 0 insertions, 55 deletions
diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 5614416f1032..d6210d946082 100644
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -294,7 +294,6 @@ static struct platform_driver acquirewdt_driver = {
294 .remove = acq_remove, 294 .remove = acq_remove,
295 .shutdown = acq_shutdown, 295 .shutdown = acq_shutdown,
296 .driver = { 296 .driver = {
297 .owner = THIS_MODULE,
298 .name = DRV_NAME, 297 .name = DRV_NAME,
299 }, 298 },
300}; 299};
diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c
index 7796db7fa6e1..7d7db0c5a64e 100644
--- a/drivers/watchdog/advantechwdt.c
+++ b/drivers/watchdog/advantechwdt.c
@@ -302,7 +302,6 @@ static struct platform_driver advwdt_driver = {
302 .remove = advwdt_remove, 302 .remove = advwdt_remove,
303 .shutdown = advwdt_shutdown, 303 .shutdown = advwdt_shutdown,
304 .driver = { 304 .driver = {
305 .owner = THIS_MODULE,
306 .name = DRV_NAME, 305 .name = DRV_NAME,
307 }, 306 },
308}; 307};
diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c
index ae6c287a49cb..6d5ae251e309 100644
--- a/drivers/watchdog/ar7_wdt.c
+++ b/drivers/watchdog/ar7_wdt.c
@@ -324,7 +324,6 @@ static struct platform_driver ar7_wdt_driver = {
324 .remove = ar7_wdt_remove, 324 .remove = ar7_wdt_remove,
325 .shutdown = ar7_wdt_shutdown, 325 .shutdown = ar7_wdt_shutdown,
326 .driver = { 326 .driver = {
327 .owner = THIS_MODULE,
328 .name = "ar7_wdt", 327 .name = "ar7_wdt",
329 }, 328 },
330}; 329};
diff --git a/drivers/watchdog/at32ap700x_wdt.c b/drivers/watchdog/at32ap700x_wdt.c
index 25b5c67d3af9..81ba8920f127 100644
--- a/drivers/watchdog/at32ap700x_wdt.c
+++ b/drivers/watchdog/at32ap700x_wdt.c
@@ -422,7 +422,6 @@ static struct platform_driver at32_wdt_driver = {
422 .resume = at32_wdt_resume, 422 .resume = at32_wdt_resume,
423 .driver = { 423 .driver = {
424 .name = "at32_wdt", 424 .name = "at32_wdt",
425 .owner = THIS_MODULE,
426 }, 425 },
427 .shutdown = at32_wdt_shutdown, 426 .shutdown = at32_wdt_shutdown,
428}; 427};
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index dee6cc21d270..d244112d5b6f 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -268,7 +268,6 @@ static struct platform_driver at91wdt_driver = {
268 .resume = at91wdt_resume, 268 .resume = at91wdt_resume,
269 .driver = { 269 .driver = {
270 .name = "at91_wdt", 270 .name = "at91_wdt",
271 .owner = THIS_MODULE,
272 .of_match_table = at91_wdt_dt_ids, 271 .of_match_table = at91_wdt_dt_ids,
273 }, 272 },
274}; 273};
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 489729b26298..6df940528fd2 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -393,7 +393,6 @@ static struct platform_driver at91wdt_driver = {
393 .remove = __exit_p(at91wdt_remove), 393 .remove = __exit_p(at91wdt_remove),
394 .driver = { 394 .driver = {
395 .name = "at91_wdt", 395 .name = "at91_wdt",
396 .owner = THIS_MODULE,
397 .of_match_table = of_match_ptr(at91_wdt_dt_ids), 396 .of_match_table = of_match_ptr(at91_wdt_dt_ids),
398 }, 397 },
399}; 398};
diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
index 41ac4660fb89..835d310081e1 100644
--- a/drivers/watchdog/ath79_wdt.c
+++ b/drivers/watchdog/ath79_wdt.c
@@ -326,7 +326,6 @@ static struct platform_driver ath79_wdt_driver = {
326 .shutdown = ath97_wdt_shutdown, 326 .shutdown = ath97_wdt_shutdown,
327 .driver = { 327 .driver = {
328 .name = DRIVER_NAME, 328 .name = DRIVER_NAME,
329 .owner = THIS_MODULE,
330 .of_match_table = of_match_ptr(ath79_wdt_match), 329 .of_match_table = of_match_ptr(ath79_wdt_match),
331 }, 330 },
332}; 331};
diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
index 8df450c090a9..2b5a9bbf80b7 100644
--- a/drivers/watchdog/bcm2835_wdt.c
+++ b/drivers/watchdog/bcm2835_wdt.c
@@ -167,7 +167,6 @@ static struct platform_driver bcm2835_wdt_driver = {
167 .shutdown = bcm2835_wdt_shutdown, 167 .shutdown = bcm2835_wdt_shutdown,
168 .driver = { 168 .driver = {
169 .name = "bcm2835-wdt", 169 .name = "bcm2835-wdt",
170 .owner = THIS_MODULE,
171 .of_match_table = bcm2835_wdt_of_match, 170 .of_match_table = bcm2835_wdt_of_match,
172 }, 171 },
173}; 172};
diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c
index b61fcc535979..9816485f6825 100644
--- a/drivers/watchdog/bcm47xx_wdt.c
+++ b/drivers/watchdog/bcm47xx_wdt.c
@@ -242,7 +242,6 @@ static int bcm47xx_wdt_remove(struct platform_device *pdev)
242 242
243static struct platform_driver bcm47xx_wdt_driver = { 243static struct platform_driver bcm47xx_wdt_driver = {
244 .driver = { 244 .driver = {
245 .owner = THIS_MODULE,
246 .name = "bcm47xx-wdt", 245 .name = "bcm47xx-wdt",
247 }, 246 },
248 .probe = bcm47xx_wdt_probe, 247 .probe = bcm47xx_wdt_probe,
diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c
index 5a8e879a430a..ab26fd90729e 100644
--- a/drivers/watchdog/bcm63xx_wdt.c
+++ b/drivers/watchdog/bcm63xx_wdt.c
@@ -304,7 +304,6 @@ static struct platform_driver bcm63xx_wdt_driver = {
304 .remove = bcm63xx_wdt_remove, 304 .remove = bcm63xx_wdt_remove,
305 .shutdown = bcm63xx_wdt_shutdown, 305 .shutdown = bcm63xx_wdt_shutdown,
306 .driver = { 306 .driver = {
307 .owner = THIS_MODULE,
308 .name = "bcm63xx-wdt", 307 .name = "bcm63xx-wdt",
309 } 308 }
310}; 309};
diff --git a/drivers/watchdog/bcm_kona_wdt.c b/drivers/watchdog/bcm_kona_wdt.c
index 9c248099f4a2..4e37db3539a4 100644
--- a/drivers/watchdog/bcm_kona_wdt.c
+++ b/drivers/watchdog/bcm_kona_wdt.c
@@ -352,7 +352,6 @@ MODULE_DEVICE_TABLE(of, bcm_kona_wdt_of_match);
352static struct platform_driver bcm_kona_wdt_driver = { 352static struct platform_driver bcm_kona_wdt_driver = {
353 .driver = { 353 .driver = {
354 .name = BCM_KONA_WDT_NAME, 354 .name = BCM_KONA_WDT_NAME,
355 .owner = THIS_MODULE,
356 .of_match_table = bcm_kona_wdt_of_match, 355 .of_match_table = bcm_kona_wdt_of_match,
357 }, 356 },
358 .probe = bcm_kona_wdt_probe, 357 .probe = bcm_kona_wdt_probe,
diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
index a3b6a5b30f9f..aa4d2e8a8ef9 100644
--- a/drivers/watchdog/bfin_wdt.c
+++ b/drivers/watchdog/bfin_wdt.c
@@ -407,7 +407,6 @@ static struct platform_driver bfin_wdt_driver = {
407 .resume = bfin_wdt_resume, 407 .resume = bfin_wdt_resume,
408 .driver = { 408 .driver = {
409 .name = WATCHDOG_NAME, 409 .name = WATCHDOG_NAME,
410 .owner = THIS_MODULE,
411 }, 410 },
412}; 411};
413 412
diff --git a/drivers/watchdog/coh901327_wdt.c b/drivers/watchdog/coh901327_wdt.c
index 4bd070f524e5..ce12f437f195 100644
--- a/drivers/watchdog/coh901327_wdt.c
+++ b/drivers/watchdog/coh901327_wdt.c
@@ -448,7 +448,6 @@ static const struct of_device_id coh901327_dt_match[] = {
448 448
449static struct platform_driver coh901327_driver = { 449static struct platform_driver coh901327_driver = {
450 .driver = { 450 .driver = {
451 .owner = THIS_MODULE,
452 .name = "coh901327_wdog", 451 .name = "coh901327_wdog",
453 .of_match_table = coh901327_dt_match, 452 .of_match_table = coh901327_dt_match,
454 }, 453 },
diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index e55ed702209f..02007689e9ca 100644
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -679,7 +679,6 @@ MODULE_DEVICE_TABLE(of, cpwd_match);
679static struct platform_driver cpwd_driver = { 679static struct platform_driver cpwd_driver = {
680 .driver = { 680 .driver = {
681 .name = DRIVER_NAME, 681 .name = DRIVER_NAME,
682 .owner = THIS_MODULE,
683 .of_match_table = cpwd_match, 682 .of_match_table = cpwd_match,
684 }, 683 },
685 .probe = cpwd_probe, 684 .probe = cpwd_probe,
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index d09ad2254b57..cfdf8a408aea 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -218,7 +218,6 @@ MODULE_DEVICE_TABLE(of, davinci_wdt_of_match);
218static struct platform_driver platform_wdt_driver = { 218static struct platform_driver platform_wdt_driver = {
219 .driver = { 219 .driver = {
220 .name = "davinci-wdt", 220 .name = "davinci-wdt",
221 .owner = THIS_MODULE,
222 .of_match_table = davinci_wdt_of_match, 221 .of_match_table = davinci_wdt_of_match,
223 }, 222 },
224 .probe = davinci_wdt_probe, 223 .probe = davinci_wdt_probe,
diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index 9f210299de24..5693c5e21b10 100644
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -348,7 +348,6 @@ static struct platform_driver dw_wdt_driver = {
348 .remove = dw_wdt_drv_remove, 348 .remove = dw_wdt_drv_remove,
349 .driver = { 349 .driver = {
350 .name = "dw_wdt", 350 .name = "dw_wdt",
351 .owner = THIS_MODULE,
352 .of_match_table = of_match_ptr(dw_wdt_of_match), 351 .of_match_table = of_match_ptr(dw_wdt_of_match),
353 .pm = &dw_wdt_pm_ops, 352 .pm = &dw_wdt_pm_ops,
354 }, 353 },
diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c
index 5f54e1e5819a..7a2cc7191c58 100644
--- a/drivers/watchdog/ep93xx_wdt.c
+++ b/drivers/watchdog/ep93xx_wdt.c
@@ -156,7 +156,6 @@ static int ep93xx_wdt_remove(struct platform_device *pdev)
156 156
157static struct platform_driver ep93xx_wdt_driver = { 157static struct platform_driver ep93xx_wdt_driver = {
158 .driver = { 158 .driver = {
159 .owner = THIS_MODULE,
160 .name = "ep93xx-wdt", 159 .name = "ep93xx-wdt",
161 }, 160 },
162 .probe = ep93xx_wdt_probe, 161 .probe = ep93xx_wdt_probe,
diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c
index 25beb30878d7..cc1bdfc2ff71 100644
--- a/drivers/watchdog/gef_wdt.c
+++ b/drivers/watchdog/gef_wdt.c
@@ -307,7 +307,6 @@ static const struct of_device_id gef_wdt_ids[] = {
307static struct platform_driver gef_wdt_driver = { 307static struct platform_driver gef_wdt_driver = {
308 .driver = { 308 .driver = {
309 .name = "gef_wdt", 309 .name = "gef_wdt",
310 .owner = THIS_MODULE,
311 .of_match_table = gef_wdt_ids, 310 .of_match_table = gef_wdt_ids,
312 }, 311 },
313 .probe = gef_wdt_probe, 312 .probe = gef_wdt_probe,
diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c
index 4c43e3fa8bd2..88e01238f01b 100644
--- a/drivers/watchdog/geodewdt.c
+++ b/drivers/watchdog/geodewdt.c
@@ -258,7 +258,6 @@ static struct platform_driver geodewdt_driver = {
258 .remove = geodewdt_remove, 258 .remove = geodewdt_remove,
259 .shutdown = geodewdt_shutdown, 259 .shutdown = geodewdt_shutdown,
260 .driver = { 260 .driver = {
261 .owner = THIS_MODULE,
262 .name = DRV_NAME, 261 .name = DRV_NAME,
263 }, 262 },
264}; 263};
diff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c
index 220a9e07cfd5..bbdb19b45332 100644
--- a/drivers/watchdog/gpio_wdt.c
+++ b/drivers/watchdog/gpio_wdt.c
@@ -241,7 +241,6 @@ MODULE_DEVICE_TABLE(of, gpio_wdt_dt_ids);
241static struct platform_driver gpio_wdt_driver = { 241static struct platform_driver gpio_wdt_driver = {
242 .driver = { 242 .driver = {
243 .name = "gpio-wdt", 243 .name = "gpio-wdt",
244 .owner = THIS_MODULE,
245 .of_match_table = gpio_wdt_dt_ids, 244 .of_match_table = gpio_wdt_dt_ids,
246 }, 245 },
247 .probe = gpio_wdt_probe, 246 .probe = gpio_wdt_probe,
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 0ba1b7c99760..05ee0bf88ce9 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -576,7 +576,6 @@ static struct platform_driver iTCO_wdt_driver = {
576 .remove = iTCO_wdt_remove, 576 .remove = iTCO_wdt_remove,
577 .shutdown = iTCO_wdt_shutdown, 577 .shutdown = iTCO_wdt_shutdown,
578 .driver = { 578 .driver = {
579 .owner = THIS_MODULE,
580 .name = DRV_NAME, 579 .name = DRV_NAME,
581 }, 580 },
582}; 581};
diff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c
index 4247c498ee78..f2e4e1eeb8dd 100644
--- a/drivers/watchdog/ib700wdt.c
+++ b/drivers/watchdog/ib700wdt.c
@@ -339,7 +339,6 @@ static struct platform_driver ibwdt_driver = {
339 .remove = ibwdt_remove, 339 .remove = ibwdt_remove,
340 .shutdown = ibwdt_shutdown, 340 .shutdown = ibwdt_shutdown,
341 .driver = { 341 .driver = {
342 .owner = THIS_MODULE,
343 .name = DRV_NAME, 342 .name = DRV_NAME,
344 }, 343 },
345}; 344};
diff --git a/drivers/watchdog/ie6xx_wdt.c b/drivers/watchdog/ie6xx_wdt.c
index 07f88f54e5c0..9bc39ae51624 100644
--- a/drivers/watchdog/ie6xx_wdt.c
+++ b/drivers/watchdog/ie6xx_wdt.c
@@ -313,7 +313,6 @@ static struct platform_driver ie6xx_wdt_driver = {
313 .remove = ie6xx_wdt_remove, 313 .remove = ie6xx_wdt_remove,
314 .driver = { 314 .driver = {
315 .name = DRIVER_NAME, 315 .name = DRIVER_NAME,
316 .owner = THIS_MODULE,
317 }, 316 },
318}; 317};
319 318
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index 68c3d379ffa8..92a5c279c2ea 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -306,7 +306,6 @@ static struct platform_driver imx2_wdt_driver = {
306 .shutdown = imx2_wdt_shutdown, 306 .shutdown = imx2_wdt_shutdown,
307 .driver = { 307 .driver = {
308 .name = DRIVER_NAME, 308 .name = DRIVER_NAME,
309 .owner = THIS_MODULE,
310 .of_match_table = imx2_wdt_dt_ids, 309 .of_match_table = imx2_wdt_dt_ids,
311 }, 310 },
312}; 311};
diff --git a/drivers/watchdog/intel-mid_wdt.c b/drivers/watchdog/intel-mid_wdt.c
index ca66e8e74635..84f6701c391f 100644
--- a/drivers/watchdog/intel-mid_wdt.c
+++ b/drivers/watchdog/intel-mid_wdt.c
@@ -172,7 +172,6 @@ static struct platform_driver mid_wdt_driver = {
172 .probe = mid_wdt_probe, 172 .probe = mid_wdt_probe,
173 .remove = mid_wdt_remove, 173 .remove = mid_wdt_remove,
174 .driver = { 174 .driver = {
175 .owner = THIS_MODULE,
176 .name = "intel_mid_wdt", 175 .name = "intel_mid_wdt",
177 }, 176 },
178}; 177};
diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c
index 91e45ca589e6..18e41afa4da3 100644
--- a/drivers/watchdog/jz4740_wdt.c
+++ b/drivers/watchdog/jz4740_wdt.c
@@ -211,7 +211,6 @@ static struct platform_driver jz4740_wdt_driver = {
211 .remove = jz4740_wdt_remove, 211 .remove = jz4740_wdt_remove,
212 .driver = { 212 .driver = {
213 .name = "jz4740-wdt", 213 .name = "jz4740-wdt",
214 .owner = THIS_MODULE,
215 }, 214 },
216}; 215};
217 216
diff --git a/drivers/watchdog/kempld_wdt.c b/drivers/watchdog/kempld_wdt.c
index d9c1a1601926..5bf931ce1353 100644
--- a/drivers/watchdog/kempld_wdt.c
+++ b/drivers/watchdog/kempld_wdt.c
@@ -563,7 +563,6 @@ static int kempld_wdt_resume(struct platform_device *pdev)
563static struct platform_driver kempld_wdt_driver = { 563static struct platform_driver kempld_wdt_driver = {
564 .driver = { 564 .driver = {
565 .name = "kempld-wdt", 565 .name = "kempld-wdt",
566 .owner = THIS_MODULE,
567 }, 566 },
568 .probe = kempld_wdt_probe, 567 .probe = kempld_wdt_probe,
569 .remove = kempld_wdt_remove, 568 .remove = kempld_wdt_remove,
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c
index 40ca5594a336..b7ea39b455c8 100644
--- a/drivers/watchdog/ks8695_wdt.c
+++ b/drivers/watchdog/ks8695_wdt.c
@@ -296,7 +296,6 @@ static struct platform_driver ks8695wdt_driver = {
296 .resume = ks8695wdt_resume, 296 .resume = ks8695wdt_resume,
297 .driver = { 297 .driver = {
298 .name = "ks8695_wdt", 298 .name = "ks8695_wdt",
299 .owner = THIS_MODULE,
300 }, 299 },
301}; 300};
302 301
diff --git a/drivers/watchdog/lantiq_wdt.c b/drivers/watchdog/lantiq_wdt.c
index 021e84eb88eb..582f2fa1b8d9 100644
--- a/drivers/watchdog/lantiq_wdt.c
+++ b/drivers/watchdog/lantiq_wdt.c
@@ -232,7 +232,6 @@ static struct platform_driver ltq_wdt_driver = {
232 .remove = ltq_wdt_remove, 232 .remove = ltq_wdt_remove,
233 .driver = { 233 .driver = {
234 .name = "wdt", 234 .name = "wdt",
235 .owner = THIS_MODULE,
236 .of_match_table = ltq_wdt_match, 235 .of_match_table = ltq_wdt_match,
237 }, 236 },
238}; 237};
diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c
index 0e9cc6f5a919..08da3114accb 100644
--- a/drivers/watchdog/max63xx_wdt.c
+++ b/drivers/watchdog/max63xx_wdt.c
@@ -231,7 +231,6 @@ static struct platform_driver max63xx_wdt_driver = {
231 .id_table = max63xx_id_table, 231 .id_table = max63xx_id_table,
232 .driver = { 232 .driver = {
233 .name = "max63xx_wdt", 233 .name = "max63xx_wdt",
234 .owner = THIS_MODULE,
235 }, 234 },
236}; 235};
237 236
diff --git a/drivers/watchdog/menf21bmc_wdt.c b/drivers/watchdog/menf21bmc_wdt.c
index 2042874d5ce3..59f0913c7341 100644
--- a/drivers/watchdog/menf21bmc_wdt.c
+++ b/drivers/watchdog/menf21bmc_wdt.c
@@ -187,7 +187,6 @@ static void menf21bmc_wdt_shutdown(struct platform_device *pdev)
187 187
188static struct platform_driver menf21bmc_wdt = { 188static struct platform_driver menf21bmc_wdt = {
189 .driver = { 189 .driver = {
190 .owner = THIS_MODULE,
191 .name = DEVNAME, 190 .name = DEVNAME,
192 }, 191 },
193 .probe = menf21bmc_wdt_probe, 192 .probe = menf21bmc_wdt_probe,
diff --git a/drivers/watchdog/moxart_wdt.c b/drivers/watchdog/moxart_wdt.c
index a64405b82596..2789da2c0515 100644
--- a/drivers/watchdog/moxart_wdt.c
+++ b/drivers/watchdog/moxart_wdt.c
@@ -174,7 +174,6 @@ static struct platform_driver moxart_wdt_driver = {
174 .remove = moxart_wdt_remove, 174 .remove = moxart_wdt_remove,
175 .driver = { 175 .driver = {
176 .name = "moxart-watchdog", 176 .name = "moxart-watchdog",
177 .owner = THIS_MODULE,
178 .of_match_table = moxart_watchdog_match, 177 .of_match_table = moxart_watchdog_match,
179 }, 178 },
180}; 179};
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
index 7831955cd9e1..689381a24887 100644
--- a/drivers/watchdog/mpc8xxx_wdt.c
+++ b/drivers/watchdog/mpc8xxx_wdt.c
@@ -249,7 +249,6 @@ static struct platform_driver mpc8xxx_wdt_driver = {
249 .remove = mpc8xxx_wdt_remove, 249 .remove = mpc8xxx_wdt_remove,
250 .driver = { 250 .driver = {
251 .name = "mpc8xxx_wdt", 251 .name = "mpc8xxx_wdt",
252 .owner = THIS_MODULE,
253 .of_match_table = mpc8xxx_wdt_match, 252 .of_match_table = mpc8xxx_wdt_match,
254 }, 253 },
255}; 254};
diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c
index f9fa58409396..315275d7bab6 100644
--- a/drivers/watchdog/mv64x60_wdt.c
+++ b/drivers/watchdog/mv64x60_wdt.c
@@ -300,7 +300,6 @@ static struct platform_driver mv64x60_wdt_driver = {
300 .probe = mv64x60_wdt_probe, 300 .probe = mv64x60_wdt_probe,
301 .remove = mv64x60_wdt_remove, 301 .remove = mv64x60_wdt_remove,
302 .driver = { 302 .driver = {
303 .owner = THIS_MODULE,
304 .name = MV64x60_WDT_NAME, 303 .name = MV64x60_WDT_NAME,
305 }, 304 },
306}; 305};
diff --git a/drivers/watchdog/nuc900_wdt.c b/drivers/watchdog/nuc900_wdt.c
index 7135803ca1a3..d5bed78c4d9f 100644
--- a/drivers/watchdog/nuc900_wdt.c
+++ b/drivers/watchdog/nuc900_wdt.c
@@ -297,7 +297,6 @@ static struct platform_driver nuc900wdt_driver = {
297 .remove = nuc900wdt_remove, 297 .remove = nuc900wdt_remove,
298 .driver = { 298 .driver = {
299 .name = "nuc900-wdt", 299 .name = "nuc900-wdt",
300 .owner = THIS_MODULE,
301 }, 300 },
302}; 301};
303 302
diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c
index 0b9ec61e1313..c028454be66c 100644
--- a/drivers/watchdog/nv_tco.c
+++ b/drivers/watchdog/nv_tco.c
@@ -471,7 +471,6 @@ static struct platform_driver nv_tco_driver = {
471 .remove = nv_tco_remove, 471 .remove = nv_tco_remove,
472 .shutdown = nv_tco_shutdown, 472 .shutdown = nv_tco_shutdown,
473 .driver = { 473 .driver = {
474 .owner = THIS_MODULE,
475 .name = TCO_MODULE_NAME, 474 .name = TCO_MODULE_NAME,
476 }, 475 },
477}; 476};
diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c
index 1e6e28df5d7b..b2e1b4cbbdc1 100644
--- a/drivers/watchdog/of_xilinx_wdt.c
+++ b/drivers/watchdog/of_xilinx_wdt.c
@@ -236,7 +236,6 @@ static struct platform_driver xwdt_driver = {
236 .probe = xwdt_probe, 236 .probe = xwdt_probe,
237 .remove = xwdt_remove, 237 .remove = xwdt_remove,
238 .driver = { 238 .driver = {
239 .owner = THIS_MODULE,
240 .name = WATCHDOG_NAME, 239 .name = WATCHDOG_NAME,
241 .of_match_table = xwdt_of_match, 240 .of_match_table = xwdt_of_match,
242 }, 241 },
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 3691b157516a..9f2709db61ca 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -353,7 +353,6 @@ static struct platform_driver omap_wdt_driver = {
353 .suspend = omap_wdt_suspend, 353 .suspend = omap_wdt_suspend,
354 .resume = omap_wdt_resume, 354 .resume = omap_wdt_resume,
355 .driver = { 355 .driver = {
356 .owner = THIS_MODULE,
357 .name = "omap_wdt", 356 .name = "omap_wdt",
358 .of_match_table = omap_wdt_of_match, 357 .of_match_table = omap_wdt_of_match,
359 }, 358 },
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 00d0741228fc..469031e528e1 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -593,7 +593,6 @@ static struct platform_driver orion_wdt_driver = {
593 .remove = orion_wdt_remove, 593 .remove = orion_wdt_remove,
594 .shutdown = orion_wdt_shutdown, 594 .shutdown = orion_wdt_shutdown,
595 .driver = { 595 .driver = {
596 .owner = THIS_MODULE,
597 .name = "orion_wdt", 596 .name = "orion_wdt",
598 .of_match_table = orion_wdt_of_match_table, 597 .of_match_table = orion_wdt_of_match_table,
599 }, 598 },
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 15fb316e9437..55e220150103 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -207,7 +207,6 @@ MODULE_DEVICE_TABLE(of, pnx4008_wdt_match);
207static struct platform_driver platform_wdt_driver = { 207static struct platform_driver platform_wdt_driver = {
208 .driver = { 208 .driver = {
209 .name = "pnx4008-watchdog", 209 .name = "pnx4008-watchdog",
210 .owner = THIS_MODULE,
211 .of_match_table = of_match_ptr(pnx4008_wdt_match), 210 .of_match_table = of_match_ptr(pnx4008_wdt_match),
212 }, 211 },
213 .probe = pnx4008_wdt_probe, 212 .probe = pnx4008_wdt_probe,
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
index 29cf4dcbc59c..47a8f1b1087d 100644
--- a/drivers/watchdog/rdc321x_wdt.c
+++ b/drivers/watchdog/rdc321x_wdt.c
@@ -287,7 +287,6 @@ static struct platform_driver rdc321x_wdt_driver = {
287 .probe = rdc321x_wdt_probe, 287 .probe = rdc321x_wdt_probe,
288 .remove = rdc321x_wdt_remove, 288 .remove = rdc321x_wdt_remove,
289 .driver = { 289 .driver = {
290 .owner = THIS_MODULE,
291 .name = "rdc321x-wdt", 290 .name = "rdc321x-wdt",
292 }, 291 },
293}; 292};
diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index cfed0fe264dc..aba53424605e 100644
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -237,7 +237,6 @@ MODULE_DEVICE_TABLE(of, riowd_match);
237static struct platform_driver riowd_driver = { 237static struct platform_driver riowd_driver = {
238 .driver = { 238 .driver = {
239 .name = DRIVER_NAME, 239 .name = DRIVER_NAME,
240 .owner = THIS_MODULE,
241 .of_match_table = riowd_match, 240 .of_match_table = riowd_match,
242 }, 241 },
243 .probe = riowd_probe, 242 .probe = riowd_probe,
diff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c
index d92c2d5859ce..11aad5b7aafe 100644
--- a/drivers/watchdog/rt2880_wdt.c
+++ b/drivers/watchdog/rt2880_wdt.c
@@ -194,7 +194,6 @@ static struct platform_driver rt288x_wdt_driver = {
194 .shutdown = rt288x_wdt_shutdown, 194 .shutdown = rt288x_wdt_shutdown,
195 .driver = { 195 .driver = {
196 .name = KBUILD_MODNAME, 196 .name = KBUILD_MODNAME,
197 .owner = THIS_MODULE,
198 .of_match_table = rt288x_wdt_match, 197 .of_match_table = rt288x_wdt_match,
199 }, 198 },
200}; 199};
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 7c6ccd071baf..c411196e9b00 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -694,7 +694,6 @@ static struct platform_driver s3c2410wdt_driver = {
694 .shutdown = s3c2410wdt_shutdown, 694 .shutdown = s3c2410wdt_shutdown,
695 .id_table = s3c2410_wdt_ids, 695 .id_table = s3c2410_wdt_ids,
696 .driver = { 696 .driver = {
697 .owner = THIS_MODULE,
698 .name = "s3c2410-wdt", 697 .name = "s3c2410-wdt",
699 .pm = &s3c2410wdt_pm_ops, 698 .pm = &s3c2410wdt_pm_ops,
700 .of_match_table = of_match_ptr(s3c2410_wdt_match), 699 .of_match_table = of_match_ptr(s3c2410_wdt_match),
diff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c
index b96127ea3de1..43d0cbb7ba0b 100644
--- a/drivers/watchdog/sch311x_wdt.c
+++ b/drivers/watchdog/sch311x_wdt.c
@@ -453,7 +453,6 @@ static struct platform_driver sch311x_wdt_driver = {
453 .remove = sch311x_wdt_remove, 453 .remove = sch311x_wdt_remove,
454 .shutdown = sch311x_wdt_shutdown, 454 .shutdown = sch311x_wdt_shutdown,
455 .driver = { 455 .driver = {
456 .owner = THIS_MODULE,
457 .name = DRV_NAME, 456 .name = DRV_NAME,
458 }, 457 },
459}; 458};
diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c
index fa89bb30d004..567458b137a6 100644
--- a/drivers/watchdog/shwdt.c
+++ b/drivers/watchdog/shwdt.c
@@ -303,7 +303,6 @@ static void sh_wdt_shutdown(struct platform_device *pdev)
303static struct platform_driver sh_wdt_driver = { 303static struct platform_driver sh_wdt_driver = {
304 .driver = { 304 .driver = {
305 .name = DRV_NAME, 305 .name = DRV_NAME,
306 .owner = THIS_MODULE,
307 }, 306 },
308 307
309 .probe = sh_wdt_probe, 308 .probe = sh_wdt_probe,
diff --git a/drivers/watchdog/sirfsoc_wdt.c b/drivers/watchdog/sirfsoc_wdt.c
index 702d07870808..42fa5c0c518a 100644
--- a/drivers/watchdog/sirfsoc_wdt.c
+++ b/drivers/watchdog/sirfsoc_wdt.c
@@ -210,7 +210,6 @@ MODULE_DEVICE_TABLE(of, sirfsoc_wdt_of_match);
210static struct platform_driver sirfsoc_wdt_driver = { 210static struct platform_driver sirfsoc_wdt_driver = {
211 .driver = { 211 .driver = {
212 .name = "sirfsoc-wdt", 212 .name = "sirfsoc-wdt",
213 .owner = THIS_MODULE,
214 .pm = &sirfsoc_wdt_pm_ops, 213 .pm = &sirfsoc_wdt_pm_ops,
215 .of_match_table = sirfsoc_wdt_of_match, 214 .of_match_table = sirfsoc_wdt_of_match,
216 }, 215 },
diff --git a/drivers/watchdog/sp5100_tco.c b/drivers/watchdog/sp5100_tco.c
index 5cca9cddb87d..eb8044ef0ea0 100644
--- a/drivers/watchdog/sp5100_tco.c
+++ b/drivers/watchdog/sp5100_tco.c
@@ -538,7 +538,6 @@ static struct platform_driver sp5100_tco_driver = {
538 .remove = sp5100_tco_remove, 538 .remove = sp5100_tco_remove,
539 .shutdown = sp5100_tco_shutdown, 539 .shutdown = sp5100_tco_shutdown,
540 .driver = { 540 .driver = {
541 .owner = THIS_MODULE,
542 .name = TCO_MODULE_NAME, 541 .name = TCO_MODULE_NAME,
543 }, 542 },
544}; 543};
diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c
index 480bb557f353..93d3ee71c9c7 100644
--- a/drivers/watchdog/sunxi_wdt.c
+++ b/drivers/watchdog/sunxi_wdt.c
@@ -253,7 +253,6 @@ static struct platform_driver sunxi_wdt_driver = {
253 .remove = sunxi_wdt_remove, 253 .remove = sunxi_wdt_remove,
254 .shutdown = sunxi_wdt_shutdown, 254 .shutdown = sunxi_wdt_shutdown,
255 .driver = { 255 .driver = {
256 .owner = THIS_MODULE,
257 .name = DRV_NAME, 256 .name = DRV_NAME,
258 .of_match_table = sunxi_wdt_dt_ids, 257 .of_match_table = sunxi_wdt_dt_ids,
259 }, 258 },
diff --git a/drivers/watchdog/tegra_wdt.c b/drivers/watchdog/tegra_wdt.c
index 750e2a26cb12..30451ea46902 100644
--- a/drivers/watchdog/tegra_wdt.c
+++ b/drivers/watchdog/tegra_wdt.c
@@ -289,7 +289,6 @@ static struct platform_driver tegra_wdt_driver = {
289 .probe = tegra_wdt_probe, 289 .probe = tegra_wdt_probe,
290 .remove = tegra_wdt_remove, 290 .remove = tegra_wdt_remove,
291 .driver = { 291 .driver = {
292 .owner = THIS_MODULE,
293 .name = "tegra-wdt", 292 .name = "tegra-wdt",
294 .pm = &tegra_wdt_pm_ops, 293 .pm = &tegra_wdt_pm_ops,
295 .of_match_table = tegra_wdt_of_match, 294 .of_match_table = tegra_wdt_of_match,
diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c
index afa9d6ef353a..d5bc870229e0 100644
--- a/drivers/watchdog/ts72xx_wdt.c
+++ b/drivers/watchdog/ts72xx_wdt.c
@@ -440,7 +440,6 @@ static struct platform_driver ts72xx_wdt_driver = {
440 .remove = ts72xx_wdt_remove, 440 .remove = ts72xx_wdt_remove,
441 .driver = { 441 .driver = {
442 .name = "ts72xx-wdt", 442 .name = "ts72xx-wdt",
443 .owner = THIS_MODULE,
444 }, 443 },
445}; 444};
446 445
diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
index 2d4535dc2676..12c15903d098 100644
--- a/drivers/watchdog/twl4030_wdt.c
+++ b/drivers/watchdog/twl4030_wdt.c
@@ -140,7 +140,6 @@ static struct platform_driver twl4030_wdt_driver = {
140 .suspend = twl4030_wdt_suspend, 140 .suspend = twl4030_wdt_suspend,
141 .resume = twl4030_wdt_resume, 141 .resume = twl4030_wdt_resume,
142 .driver = { 142 .driver = {
143 .owner = THIS_MODULE,
144 .name = "twl4030_wdt", 143 .name = "twl4030_wdt",
145 .of_match_table = twl_wdt_of_match, 144 .of_match_table = twl_wdt_of_match,
146 }, 145 },
diff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c
index 6a447e321dd0..7f615933d31a 100644
--- a/drivers/watchdog/txx9wdt.c
+++ b/drivers/watchdog/txx9wdt.c
@@ -167,7 +167,6 @@ static struct platform_driver txx9wdt_driver = {
167 .shutdown = txx9wdt_shutdown, 167 .shutdown = txx9wdt_shutdown,
168 .driver = { 168 .driver = {
169 .name = "txx9wdt", 169 .name = "txx9wdt",
170 .owner = THIS_MODULE,
171 }, 170 },
172}; 171};
173 172
diff --git a/drivers/watchdog/ux500_wdt.c b/drivers/watchdog/ux500_wdt.c
index 5aed9d7ad47e..9de09ab00838 100644
--- a/drivers/watchdog/ux500_wdt.c
+++ b/drivers/watchdog/ux500_wdt.c
@@ -156,7 +156,6 @@ static struct platform_driver ux500_wdt_driver = {
156 .suspend = ux500_wdt_suspend, 156 .suspend = ux500_wdt_suspend,
157 .resume = ux500_wdt_resume, 157 .resume = ux500_wdt_resume,
158 .driver = { 158 .driver = {
159 .owner = THIS_MODULE,
160 .name = "ux500_wdt", 159 .name = "ux500_wdt",
161 }, 160 },
162}; 161};
diff --git a/drivers/watchdog/xen_wdt.c b/drivers/watchdog/xen_wdt.c
index 7a42dffd39e5..cf0e650c2015 100644
--- a/drivers/watchdog/xen_wdt.c
+++ b/drivers/watchdog/xen_wdt.c
@@ -320,7 +320,6 @@ static struct platform_driver xen_wdt_driver = {
320 .suspend = xen_wdt_suspend, 320 .suspend = xen_wdt_suspend,
321 .resume = xen_wdt_resume, 321 .resume = xen_wdt_resume,
322 .driver = { 322 .driver = {
323 .owner = THIS_MODULE,
324 .name = DRV_NAME, 323 .name = DRV_NAME,
325 }, 324 },
326}; 325};