aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:21:41 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 15:00:24 -0500
commit2d991a164a61858012651e13c59521975504e260 (patch)
treec5f8dffa81d1f4fea34c108ca41f7290187cd64f /drivers/watchdog
parent82268714bdf06bc06135efb707a9de590ab2d294 (diff)
watchdog: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Wim Van Sebroeck <wim@iguana.be> Cc: Wan ZongShun <mcuos.com@gmail.com> Cc: Ben Dooks <ben-linux@fluff.org> Cc: Kukjin Kim <kgene.kim@samsung.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/acquirewdt.c2
-rw-r--r--drivers/watchdog/advantechwdt.c2
-rw-r--r--drivers/watchdog/ar7_wdt.c2
-rw-r--r--drivers/watchdog/at91rm9200_wdt.c2
-rw-r--r--drivers/watchdog/ath79_wdt.c2
-rw-r--r--drivers/watchdog/bcm63xx_wdt.c2
-rw-r--r--drivers/watchdog/bfin_wdt.c2
-rw-r--r--drivers/watchdog/cpu5wdt.c4
-rw-r--r--drivers/watchdog/cpwd.c2
-rw-r--r--drivers/watchdog/da9052_wdt.c2
-rw-r--r--drivers/watchdog/davinci_wdt.c2
-rw-r--r--drivers/watchdog/dw_wdt.c2
-rw-r--r--drivers/watchdog/ep93xx_wdt.c2
-rw-r--r--drivers/watchdog/gef_wdt.c2
-rw-r--r--drivers/watchdog/geodewdt.c2
-rw-r--r--drivers/watchdog/hpwdt.c26
-rw-r--r--drivers/watchdog/i6300esb.c6
-rw-r--r--drivers/watchdog/iTCO_wdt.c2
-rw-r--r--drivers/watchdog/ib700wdt.c2
-rw-r--r--drivers/watchdog/ie6xx_wdt.c6
-rw-r--r--drivers/watchdog/jz4740_wdt.c2
-rw-r--r--drivers/watchdog/ks8695_wdt.c2
-rw-r--r--drivers/watchdog/lantiq_wdt.c2
-rw-r--r--drivers/watchdog/max63xx_wdt.c2
-rw-r--r--drivers/watchdog/mpc8xxx_wdt.c2
-rw-r--r--drivers/watchdog/mpcore_wdt.c2
-rw-r--r--drivers/watchdog/mtx-1_wdt.c2
-rw-r--r--drivers/watchdog/mv64x60_wdt.c2
-rw-r--r--drivers/watchdog/nuc900_wdt.c2
-rw-r--r--drivers/watchdog/nv_tco.c4
-rw-r--r--drivers/watchdog/of_xilinx_wdt.c2
-rw-r--r--drivers/watchdog/omap_wdt.c2
-rw-r--r--drivers/watchdog/orion_wdt.c2
-rw-r--r--drivers/watchdog/pcwd.c4
-rw-r--r--drivers/watchdog/pcwd_pci.c2
-rw-r--r--drivers/watchdog/pnx4008_wdt.c2
-rw-r--r--drivers/watchdog/rc32434_wdt.c2
-rw-r--r--drivers/watchdog/rdc321x_wdt.c2
-rw-r--r--drivers/watchdog/riowd.c2
-rw-r--r--drivers/watchdog/s3c2410_wdt.c2
-rw-r--r--drivers/watchdog/sch311x_wdt.c2
-rw-r--r--drivers/watchdog/shwdt.c2
-rw-r--r--drivers/watchdog/sp5100_tco.c4
-rw-r--r--drivers/watchdog/sp805_wdt.c2
-rw-r--r--drivers/watchdog/stmp3xxx_wdt.c2
-rw-r--r--drivers/watchdog/ts72xx_wdt.c2
-rw-r--r--drivers/watchdog/twl4030_wdt.c2
-rw-r--r--drivers/watchdog/via_wdt.c2
-rw-r--r--drivers/watchdog/wdt_pci.c2
-rw-r--r--drivers/watchdog/wm831x_wdt.c2
-rw-r--r--drivers/watchdog/wm8350_wdt.c2
-rw-r--r--drivers/watchdog/xen_wdt.c2
52 files changed, 72 insertions, 72 deletions
diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 49e0b89ceed9..e009f938e667 100644
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -240,7 +240,7 @@ static struct miscdevice acq_miscdev = {
240 * Init & exit routines 240 * Init & exit routines
241 */ 241 */
242 242
243static int __devinit acq_probe(struct platform_device *dev) 243static int acq_probe(struct platform_device *dev)
244{ 244{
245 int ret; 245 int ret;
246 246
diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c
index 9a74156f05ee..cc50c57a3575 100644
--- a/drivers/watchdog/advantechwdt.c
+++ b/drivers/watchdog/advantechwdt.c
@@ -238,7 +238,7 @@ static struct miscdevice advwdt_miscdev = {
238 * Init & exit routines 238 * Init & exit routines
239 */ 239 */
240 240
241static int __devinit advwdt_probe(struct platform_device *dev) 241static int advwdt_probe(struct platform_device *dev)
242{ 242{
243 int ret; 243 int ret;
244 244
diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c
index eb633d9951a2..154347ec0fc3 100644
--- a/drivers/watchdog/ar7_wdt.c
+++ b/drivers/watchdog/ar7_wdt.c
@@ -274,7 +274,7 @@ static struct miscdevice ar7_wdt_miscdev = {
274 .fops = &ar7_wdt_fops, 274 .fops = &ar7_wdt_fops,
275}; 275};
276 276
277static int __devinit ar7_wdt_probe(struct platform_device *pdev) 277static int ar7_wdt_probe(struct platform_device *pdev)
278{ 278{
279 int rc; 279 int rc;
280 280
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index 75f3a6bc323b..cc290bbcb39e 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -199,7 +199,7 @@ static struct miscdevice at91wdt_miscdev = {
199 .fops = &at91wdt_fops, 199 .fops = &at91wdt_fops,
200}; 200};
201 201
202static int __devinit at91wdt_probe(struct platform_device *pdev) 202static int at91wdt_probe(struct platform_device *pdev)
203{ 203{
204 int res; 204 int res;
205 205
diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
index 367ef5ed19b7..5c0967d43021 100644
--- a/drivers/watchdog/ath79_wdt.c
+++ b/drivers/watchdog/ath79_wdt.c
@@ -224,7 +224,7 @@ static struct miscdevice ath79_wdt_miscdev = {
224 .fops = &ath79_wdt_fops, 224 .fops = &ath79_wdt_fops,
225}; 225};
226 226
227static int __devinit ath79_wdt_probe(struct platform_device *pdev) 227static int ath79_wdt_probe(struct platform_device *pdev)
228{ 228{
229 u32 ctrl; 229 u32 ctrl;
230 int err; 230 int err;
diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c
index e81b78444fa9..5a7cff6e093c 100644
--- a/drivers/watchdog/bcm63xx_wdt.c
+++ b/drivers/watchdog/bcm63xx_wdt.c
@@ -236,7 +236,7 @@ static struct miscdevice bcm63xx_wdt_miscdev = {
236}; 236};
237 237
238 238
239static int __devinit bcm63xx_wdt_probe(struct platform_device *pdev) 239static int bcm63xx_wdt_probe(struct platform_device *pdev)
240{ 240{
241 int ret; 241 int ret;
242 struct resource *r; 242 struct resource *r;
diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
index 4a85dbf5aec0..241f8af88d15 100644
--- a/drivers/watchdog/bfin_wdt.c
+++ b/drivers/watchdog/bfin_wdt.c
@@ -356,7 +356,7 @@ static const struct watchdog_info bfin_wdt_info = {
356 * Registers the misc device. Actual device 356 * Registers the misc device. Actual device
357 * initialization is handled by bfin_wdt_open(). 357 * initialization is handled by bfin_wdt_open().
358 */ 358 */
359static int __devinit bfin_wdt_probe(struct platform_device *pdev) 359static int bfin_wdt_probe(struct platform_device *pdev)
360{ 360{
361 int ret; 361 int ret;
362 362
diff --git a/drivers/watchdog/cpu5wdt.c b/drivers/watchdog/cpu5wdt.c
index 7e888393de1f..6eb710b5be76 100644
--- a/drivers/watchdog/cpu5wdt.c
+++ b/drivers/watchdog/cpu5wdt.c
@@ -215,7 +215,7 @@ static struct miscdevice cpu5wdt_misc = {
215 215
216/* init/exit function */ 216/* init/exit function */
217 217
218static int __devinit cpu5wdt_init(void) 218static int cpu5wdt_init(void)
219{ 219{
220 unsigned int val; 220 unsigned int val;
221 int err; 221 int err;
@@ -256,7 +256,7 @@ no_port:
256 return err; 256 return err;
257} 257}
258 258
259static int __devinit cpu5wdt_init_module(void) 259static int cpu5wdt_init_module(void)
260{ 260{
261 return cpu5wdt_init(); 261 return cpu5wdt_init();
262} 262}
diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index ed7f434bba79..731578b3b440 100644
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -528,7 +528,7 @@ static const struct file_operations cpwd_fops = {
528 .llseek = no_llseek, 528 .llseek = no_llseek,
529}; 529};
530 530
531static int __devinit cpwd_probe(struct platform_device *op) 531static int cpwd_probe(struct platform_device *op)
532{ 532{
533 struct device_node *options; 533 struct device_node *options;
534 const char *str_prop; 534 const char *str_prop;
diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c
index 463e9e55b560..93a316570294 100644
--- a/drivers/watchdog/da9052_wdt.c
+++ b/drivers/watchdog/da9052_wdt.c
@@ -179,7 +179,7 @@ static const struct watchdog_ops da9052_wdt_ops = {
179}; 179};
180 180
181 181
182static int __devinit da9052_wdt_probe(struct platform_device *pdev) 182static int da9052_wdt_probe(struct platform_device *pdev)
183{ 183{
184 struct da9052 *da9052 = dev_get_drvdata(pdev->dev.parent); 184 struct da9052 *da9052 = dev_get_drvdata(pdev->dev.parent);
185 struct da9052_wdt_data *driver_data; 185 struct da9052_wdt_data *driver_data;
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index ea4e96259a82..6fc22d2e5e18 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -199,7 +199,7 @@ static struct miscdevice davinci_wdt_miscdev = {
199 .fops = &davinci_wdt_fops, 199 .fops = &davinci_wdt_fops,
200}; 200};
201 201
202static int __devinit davinci_wdt_probe(struct platform_device *pdev) 202static int davinci_wdt_probe(struct platform_device *pdev)
203{ 203{
204 int ret = 0, size; 204 int ret = 0, size;
205 struct device *dev = &pdev->dev; 205 struct device *dev = &pdev->dev;
diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index 6a8448dcc20e..49e24e5ac4ac 100644
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -293,7 +293,7 @@ static struct miscdevice dw_wdt_miscdev = {
293 .minor = WATCHDOG_MINOR, 293 .minor = WATCHDOG_MINOR,
294}; 294};
295 295
296static int __devinit dw_wdt_drv_probe(struct platform_device *pdev) 296static int dw_wdt_drv_probe(struct platform_device *pdev)
297{ 297{
298 int ret; 298 int ret;
299 struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); 299 struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c
index 91703a58145d..f1bd88c5a204 100644
--- a/drivers/watchdog/ep93xx_wdt.c
+++ b/drivers/watchdog/ep93xx_wdt.c
@@ -112,7 +112,7 @@ static struct watchdog_device ep93xx_wdt_wdd = {
112 .ops = &ep93xx_wdt_ops, 112 .ops = &ep93xx_wdt_ops,
113}; 113};
114 114
115static int __devinit ep93xx_wdt_probe(struct platform_device *pdev) 115static int ep93xx_wdt_probe(struct platform_device *pdev)
116{ 116{
117 struct resource *res; 117 struct resource *res;
118 unsigned long val; 118 unsigned long val;
diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c
index 17f4cae770c6..276f0092e6db 100644
--- a/drivers/watchdog/gef_wdt.c
+++ b/drivers/watchdog/gef_wdt.c
@@ -262,7 +262,7 @@ static struct miscdevice gef_wdt_miscdev = {
262}; 262};
263 263
264 264
265static int __devinit gef_wdt_probe(struct platform_device *dev) 265static int gef_wdt_probe(struct platform_device *dev)
266{ 266{
267 int timeout = 10; 267 int timeout = 10;
268 u32 freq; 268 u32 freq;
diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c
index a340e04f2379..28a3a8717262 100644
--- a/drivers/watchdog/geodewdt.c
+++ b/drivers/watchdog/geodewdt.c
@@ -215,7 +215,7 @@ static struct miscdevice geodewdt_miscdev = {
215 .fops = &geodewdt_fops, 215 .fops = &geodewdt_fops,
216}; 216};
217 217
218static int __devinit geodewdt_probe(struct platform_device *dev) 218static int geodewdt_probe(struct platform_device *dev)
219{ 219{
220 int ret; 220 int ret;
221 221
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 03687bcc74f2..cc25ddfa84eb 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -212,7 +212,7 @@ asm(".text \n\t"
212 * 0 : SUCCESS 212 * 0 : SUCCESS
213 * <0 : FAILURE 213 * <0 : FAILURE
214 */ 214 */
215static int __devinit cru_detect(unsigned long map_entry, 215static int cru_detect(unsigned long map_entry,
216 unsigned long map_offset) 216 unsigned long map_offset)
217{ 217{
218 void *bios32_map; 218 void *bios32_map;
@@ -268,7 +268,7 @@ static int __devinit cru_detect(unsigned long map_entry,
268/* 268/*
269 * bios_checksum 269 * bios_checksum
270 */ 270 */
271static int __devinit bios_checksum(const char __iomem *ptr, int len) 271static int bios_checksum(const char __iomem *ptr, int len)
272{ 272{
273 char sum = 0; 273 char sum = 0;
274 int i; 274 int i;
@@ -293,7 +293,7 @@ static int __devinit bios_checksum(const char __iomem *ptr, int len)
293 * 0 : SUCCESS 293 * 0 : SUCCESS
294 * <0 : FAILURE 294 * <0 : FAILURE
295 */ 295 */
296static int __devinit bios32_present(const char __iomem *p) 296static int bios32_present(const char __iomem *p)
297{ 297{
298 struct bios32_service_dir *bios_32_ptr; 298 struct bios32_service_dir *bios_32_ptr;
299 int length; 299 int length;
@@ -323,7 +323,7 @@ static int __devinit bios32_present(const char __iomem *p)
323 return -ENODEV; 323 return -ENODEV;
324} 324}
325 325
326static int __devinit detect_cru_service(void) 326static int detect_cru_service(void)
327{ 327{
328 char __iomem *p, *q; 328 char __iomem *p, *q;
329 int rc = -1; 329 int rc = -1;
@@ -395,7 +395,7 @@ asm(".text \n\t"
395 * This function checks whether or not a SMBIOS/DMI record is 395 * This function checks whether or not a SMBIOS/DMI record is
396 * the 64bit CRU info or not 396 * the 64bit CRU info or not
397 */ 397 */
398static void __devinit dmi_find_cru(const struct dmi_header *dm, void *dummy) 398static void dmi_find_cru(const struct dmi_header *dm, void *dummy)
399{ 399{
400 struct smbios_cru64_info *smbios_cru64_ptr; 400 struct smbios_cru64_info *smbios_cru64_ptr;
401 unsigned long cru_physical_address; 401 unsigned long cru_physical_address;
@@ -414,7 +414,7 @@ static void __devinit dmi_find_cru(const struct dmi_header *dm, void *dummy)
414 } 414 }
415} 415}
416 416
417static int __devinit detect_cru_service(void) 417static int detect_cru_service(void)
418{ 418{
419 cru_rom_addr = NULL; 419 cru_rom_addr = NULL;
420 420
@@ -647,7 +647,7 @@ static struct miscdevice hpwdt_miscdev = {
647 647
648#ifdef CONFIG_HPWDT_NMI_DECODING 648#ifdef CONFIG_HPWDT_NMI_DECODING
649#ifdef CONFIG_X86_LOCAL_APIC 649#ifdef CONFIG_X86_LOCAL_APIC
650static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev) 650static void hpwdt_check_nmi_decoding(struct pci_dev *dev)
651{ 651{
652 /* 652 /*
653 * If nmi_watchdog is turned off then we can turn on 653 * If nmi_watchdog is turned off then we can turn on
@@ -656,7 +656,7 @@ static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)
656 hpwdt_nmi_decoding = 1; 656 hpwdt_nmi_decoding = 1;
657} 657}
658#else 658#else
659static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev) 659static void hpwdt_check_nmi_decoding(struct pci_dev *dev)
660{ 660{
661 dev_warn(&dev->dev, "NMI decoding is disabled. " 661 dev_warn(&dev->dev, "NMI decoding is disabled. "
662 "Your kernel does not support a NMI Watchdog.\n"); 662 "Your kernel does not support a NMI Watchdog.\n");
@@ -671,7 +671,7 @@ static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)
671 * This check is independent of architecture and needs to be made for 671 * This check is independent of architecture and needs to be made for
672 * any ProLiant system. 672 * any ProLiant system.
673 */ 673 */
674static void __devinit dmi_find_icru(const struct dmi_header *dm, void *dummy) 674static void dmi_find_icru(const struct dmi_header *dm, void *dummy)
675{ 675{
676 struct smbios_proliant_info *smbios_proliant_ptr; 676 struct smbios_proliant_info *smbios_proliant_ptr;
677 677
@@ -682,7 +682,7 @@ static void __devinit dmi_find_icru(const struct dmi_header *dm, void *dummy)
682 } 682 }
683} 683}
684 684
685static int __devinit hpwdt_init_nmi_decoding(struct pci_dev *dev) 685static int hpwdt_init_nmi_decoding(struct pci_dev *dev)
686{ 686{
687 int retval; 687 int retval;
688 688
@@ -762,11 +762,11 @@ static void hpwdt_exit_nmi_decoding(void)
762 iounmap(cru_rom_addr); 762 iounmap(cru_rom_addr);
763} 763}
764#else /* !CONFIG_HPWDT_NMI_DECODING */ 764#else /* !CONFIG_HPWDT_NMI_DECODING */
765static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev) 765static void hpwdt_check_nmi_decoding(struct pci_dev *dev)
766{ 766{
767} 767}
768 768
769static int __devinit hpwdt_init_nmi_decoding(struct pci_dev *dev) 769static int hpwdt_init_nmi_decoding(struct pci_dev *dev)
770{ 770{
771 return 0; 771 return 0;
772} 772}
@@ -776,7 +776,7 @@ static void hpwdt_exit_nmi_decoding(void)
776} 776}
777#endif /* CONFIG_HPWDT_NMI_DECODING */ 777#endif /* CONFIG_HPWDT_NMI_DECODING */
778 778
779static int __devinit hpwdt_init_one(struct pci_dev *dev, 779static int hpwdt_init_one(struct pci_dev *dev,
780 const struct pci_device_id *ent) 780 const struct pci_device_id *ent)
781{ 781{
782 int retval; 782 int retval;
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
index 2574066c6343..31b87db90261 100644
--- a/drivers/watchdog/i6300esb.c
+++ b/drivers/watchdog/i6300esb.c
@@ -344,7 +344,7 @@ MODULE_DEVICE_TABLE(pci, esb_pci_tbl);
344 * Init & exit routines 344 * Init & exit routines
345 */ 345 */
346 346
347static unsigned char __devinit esb_getdevice(struct pci_dev *pdev) 347static unsigned char esb_getdevice(struct pci_dev *pdev)
348{ 348{
349 if (pci_enable_device(pdev)) { 349 if (pci_enable_device(pdev)) {
350 pr_err("failed to enable device\n"); 350 pr_err("failed to enable device\n");
@@ -375,7 +375,7 @@ err_devput:
375 return 0; 375 return 0;
376} 376}
377 377
378static void __devinit esb_initdevice(void) 378static void esb_initdevice(void)
379{ 379{
380 u8 val1; 380 u8 val1;
381 u16 val2; 381 u16 val2;
@@ -416,7 +416,7 @@ static void __devinit esb_initdevice(void)
416 esb_timer_set_heartbeat(heartbeat); 416 esb_timer_set_heartbeat(heartbeat);
417} 417}
418 418
419static int __devinit esb_probe(struct pci_dev *pdev, 419static int esb_probe(struct pci_dev *pdev,
420 const struct pci_device_id *ent) 420 const struct pci_device_id *ent)
421{ 421{
422 int ret; 422 int ret;
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index b83f935f6d4d..fb341df65614 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -390,7 +390,7 @@ static void __devexit iTCO_wdt_cleanup(void)
390 iTCO_wdt_private.gcs = NULL; 390 iTCO_wdt_private.gcs = NULL;
391} 391}
392 392
393static int __devinit iTCO_wdt_probe(struct platform_device *dev) 393static int iTCO_wdt_probe(struct platform_device *dev)
394{ 394{
395 int ret = -ENODEV; 395 int ret = -ENODEV;
396 unsigned long val32; 396 unsigned long val32;
diff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c
index 4e992c87741c..5249596db2ab 100644
--- a/drivers/watchdog/ib700wdt.c
+++ b/drivers/watchdog/ib700wdt.c
@@ -277,7 +277,7 @@ static struct miscdevice ibwdt_miscdev = {
277 * Init & exit routines 277 * Init & exit routines
278 */ 278 */
279 279
280static int __devinit ibwdt_probe(struct platform_device *dev) 280static int ibwdt_probe(struct platform_device *dev)
281{ 281{
282 int res; 282 int res;
283 283
diff --git a/drivers/watchdog/ie6xx_wdt.c b/drivers/watchdog/ie6xx_wdt.c
index 93b2cda2f8dd..94eef6fec0f3 100644
--- a/drivers/watchdog/ie6xx_wdt.c
+++ b/drivers/watchdog/ie6xx_wdt.c
@@ -225,7 +225,7 @@ static const struct file_operations ie6xx_wdt_dbg_operations = {
225 .release = single_release, 225 .release = single_release,
226}; 226};
227 227
228static void __devinit ie6xx_wdt_debugfs_init(void) 228static void ie6xx_wdt_debugfs_init(void)
229{ 229{
230 /* /sys/kernel/debug/ie6xx_wdt */ 230 /* /sys/kernel/debug/ie6xx_wdt */
231 ie6xx_wdt_data.debugfs = debugfs_create_file("ie6xx_wdt", 231 ie6xx_wdt_data.debugfs = debugfs_create_file("ie6xx_wdt",
@@ -238,7 +238,7 @@ static void ie6xx_wdt_debugfs_exit(void)
238} 238}
239 239
240#else 240#else
241static void __devinit ie6xx_wdt_debugfs_init(void) 241static void ie6xx_wdt_debugfs_init(void)
242{ 242{
243} 243}
244 244
@@ -247,7 +247,7 @@ static void ie6xx_wdt_debugfs_exit(void)
247} 247}
248#endif 248#endif
249 249
250static int __devinit ie6xx_wdt_probe(struct platform_device *pdev) 250static int ie6xx_wdt_probe(struct platform_device *pdev)
251{ 251{
252 struct resource *res; 252 struct resource *res;
253 u8 wdtlr; 253 u8 wdtlr;
diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c
index 331a61340fe8..eb7008a1d6e6 100644
--- a/drivers/watchdog/jz4740_wdt.c
+++ b/drivers/watchdog/jz4740_wdt.c
@@ -144,7 +144,7 @@ static const struct watchdog_ops jz4740_wdt_ops = {
144 .set_timeout = jz4740_wdt_set_timeout, 144 .set_timeout = jz4740_wdt_set_timeout,
145}; 145};
146 146
147static int __devinit jz4740_wdt_probe(struct platform_device *pdev) 147static int jz4740_wdt_probe(struct platform_device *pdev)
148{ 148{
149 struct jz4740_wdt_drvdata *drvdata; 149 struct jz4740_wdt_drvdata *drvdata;
150 struct watchdog_device *jz4740_wdt; 150 struct watchdog_device *jz4740_wdt;
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c
index 6ac9ff2493f6..c305adb49fbf 100644
--- a/drivers/watchdog/ks8695_wdt.c
+++ b/drivers/watchdog/ks8695_wdt.c
@@ -235,7 +235,7 @@ static struct miscdevice ks8695wdt_miscdev = {
235 .fops = &ks8695wdt_fops, 235 .fops = &ks8695wdt_fops,
236}; 236};
237 237
238static int __devinit ks8695wdt_probe(struct platform_device *pdev) 238static int ks8695wdt_probe(struct platform_device *pdev)
239{ 239{
240 int res; 240 int res;
241 241
diff --git a/drivers/watchdog/lantiq_wdt.c b/drivers/watchdog/lantiq_wdt.c
index ce4df083d7fa..fd9f43c48d47 100644
--- a/drivers/watchdog/lantiq_wdt.c
+++ b/drivers/watchdog/lantiq_wdt.c
@@ -186,7 +186,7 @@ static struct miscdevice ltq_wdt_miscdev = {
186 .fops = &ltq_wdt_fops, 186 .fops = &ltq_wdt_fops,
187}; 187};
188 188
189static int __devinit 189static int
190ltq_wdt_probe(struct platform_device *pdev) 190ltq_wdt_probe(struct platform_device *pdev)
191{ 191{
192 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 192 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c
index 7e952217cf6b..b572c751ebf5 100644
--- a/drivers/watchdog/max63xx_wdt.c
+++ b/drivers/watchdog/max63xx_wdt.c
@@ -174,7 +174,7 @@ static struct watchdog_device max63xx_wdt_dev = {
174 .ops = &max63xx_wdt_ops, 174 .ops = &max63xx_wdt_ops,
175}; 175};
176 176
177static int __devinit max63xx_wdt_probe(struct platform_device *pdev) 177static int max63xx_wdt_probe(struct platform_device *pdev)
178{ 178{
179 struct resource *wdt_mem; 179 struct resource *wdt_mem;
180 struct max63xx_timeout *table; 180 struct max63xx_timeout *table;
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
index e44d6d9c1f35..5c23a6bac944 100644
--- a/drivers/watchdog/mpc8xxx_wdt.c
+++ b/drivers/watchdog/mpc8xxx_wdt.c
@@ -188,7 +188,7 @@ static struct miscdevice mpc8xxx_wdt_miscdev = {
188}; 188};
189 189
190static const struct of_device_id mpc8xxx_wdt_match[]; 190static const struct of_device_id mpc8xxx_wdt_match[];
191static int __devinit mpc8xxx_wdt_probe(struct platform_device *ofdev) 191static int mpc8xxx_wdt_probe(struct platform_device *ofdev)
192{ 192{
193 int ret; 193 int ret;
194 const struct of_device_id *match; 194 const struct of_device_id *match;
diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c
index cf66cee35956..4f90ac5910af 100644
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
@@ -327,7 +327,7 @@ static struct miscdevice mpcore_wdt_miscdev = {
327 .fops = &mpcore_wdt_fops, 327 .fops = &mpcore_wdt_fops,
328}; 328};
329 329
330static int __devinit mpcore_wdt_probe(struct platform_device *pdev) 330static int mpcore_wdt_probe(struct platform_device *pdev)
331{ 331{
332 struct mpcore_wdt *wdt; 332 struct mpcore_wdt *wdt;
333 struct resource *res; 333 struct resource *res;
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index 5474a06ad607..8c642763ca6e 100644
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -204,7 +204,7 @@ static struct miscdevice mtx1_wdt_misc = {
204}; 204};
205 205
206 206
207static int __devinit mtx1_wdt_probe(struct platform_device *pdev) 207static int mtx1_wdt_probe(struct platform_device *pdev)
208{ 208{
209 int ret; 209 int ret;
210 210
diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c
index 7d37da5522bb..2876027a8886 100644
--- a/drivers/watchdog/mv64x60_wdt.c
+++ b/drivers/watchdog/mv64x60_wdt.c
@@ -253,7 +253,7 @@ static struct miscdevice mv64x60_wdt_miscdev = {
253 .fops = &mv64x60_wdt_fops, 253 .fops = &mv64x60_wdt_fops,
254}; 254};
255 255
256static int __devinit mv64x60_wdt_probe(struct platform_device *dev) 256static int mv64x60_wdt_probe(struct platform_device *dev)
257{ 257{
258 struct mv64x60_wdt_pdata *pdata = dev->dev.platform_data; 258 struct mv64x60_wdt_pdata *pdata = dev->dev.platform_data;
259 struct resource *r; 259 struct resource *r;
diff --git a/drivers/watchdog/nuc900_wdt.c b/drivers/watchdog/nuc900_wdt.c
index a77f6900917d..d05daefa8640 100644
--- a/drivers/watchdog/nuc900_wdt.c
+++ b/drivers/watchdog/nuc900_wdt.c
@@ -242,7 +242,7 @@ static struct miscdevice nuc900wdt_miscdev = {
242 .fops = &nuc900wdt_fops, 242 .fops = &nuc900wdt_fops,
243}; 243};
244 244
245static int __devinit nuc900wdt_probe(struct platform_device *pdev) 245static int nuc900wdt_probe(struct platform_device *pdev)
246{ 246{
247 int ret = 0; 247 int ret = 0;
248 248
diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c
index e0d4496c2811..45452845faca 100644
--- a/drivers/watchdog/nv_tco.c
+++ b/drivers/watchdog/nv_tco.c
@@ -302,7 +302,7 @@ MODULE_DEVICE_TABLE(pci, tco_pci_tbl);
302 * Init & exit routines 302 * Init & exit routines
303 */ 303 */
304 304
305static unsigned char __devinit nv_tco_getdevice(void) 305static unsigned char nv_tco_getdevice(void)
306{ 306{
307 struct pci_dev *dev = NULL; 307 struct pci_dev *dev = NULL;
308 u32 val; 308 u32 val;
@@ -376,7 +376,7 @@ out:
376 return 0; 376 return 0;
377} 377}
378 378
379static int __devinit nv_tco_init(struct platform_device *dev) 379static int nv_tco_init(struct platform_device *dev)
380{ 380{
381 int ret; 381 int ret;
382 382
diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c
index df8c5f3f3674..fd3e5f6ee55c 100644
--- a/drivers/watchdog/of_xilinx_wdt.c
+++ b/drivers/watchdog/of_xilinx_wdt.c
@@ -289,7 +289,7 @@ static struct miscdevice xwdt_miscdev = {
289 .fops = &xwdt_fops, 289 .fops = &xwdt_fops,
290}; 290};
291 291
292static int __devinit xwdt_probe(struct platform_device *pdev) 292static int xwdt_probe(struct platform_device *pdev)
293{ 293{
294 int rc; 294 int rc;
295 u32 *tmptr; 295 u32 *tmptr;
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 1596a5da3463..36a724614383 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -264,7 +264,7 @@ static const struct file_operations omap_wdt_fops = {
264 .llseek = no_llseek, 264 .llseek = no_llseek,
265}; 265};
266 266
267static int __devinit omap_wdt_probe(struct platform_device *pdev) 267static int omap_wdt_probe(struct platform_device *pdev)
268{ 268{
269 struct resource *res, *mem; 269 struct resource *res, *mem;
270 struct omap_wdt_dev *wdev; 270 struct omap_wdt_dev *wdev;
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 33a0872ab470..e6b7bd2117c6 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -142,7 +142,7 @@ static struct watchdog_device orion_wdt = {
142 .ops = &orion_wdt_ops, 142 .ops = &orion_wdt_ops,
143}; 143};
144 144
145static int __devinit orion_wdt_probe(struct platform_device *pdev) 145static int orion_wdt_probe(struct platform_device *pdev)
146{ 146{
147 struct resource *res; 147 struct resource *res;
148 int ret; 148 int ret;
diff --git a/drivers/watchdog/pcwd.c b/drivers/watchdog/pcwd.c
index df454c9b5274..cef246abdd66 100644
--- a/drivers/watchdog/pcwd.c
+++ b/drivers/watchdog/pcwd.c
@@ -801,7 +801,7 @@ static inline int get_revision(void)
801 * The initial rate is once per second at board start up, then twice 801 * The initial rate is once per second at board start up, then twice
802 * per second for normal operation. 802 * per second for normal operation.
803 */ 803 */
804static int __devinit pcwd_isa_match(struct device *dev, unsigned int id) 804static int pcwd_isa_match(struct device *dev, unsigned int id)
805{ 805{
806 int base_addr = pcwd_ioports[id]; 806 int base_addr = pcwd_ioports[id];
807 int port0, last_port0; /* Reg 0, in case it's REV A */ 807 int port0, last_port0; /* Reg 0, in case it's REV A */
@@ -846,7 +846,7 @@ static int __devinit pcwd_isa_match(struct device *dev, unsigned int id)
846 return retval; 846 return retval;
847} 847}
848 848
849static int __devinit pcwd_isa_probe(struct device *dev, unsigned int id) 849static int pcwd_isa_probe(struct device *dev, unsigned int id)
850{ 850{
851 int ret; 851 int ret;
852 852
diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c
index 1407a6fd077b..6ec84b5bb508 100644
--- a/drivers/watchdog/pcwd_pci.c
+++ b/drivers/watchdog/pcwd_pci.c
@@ -682,7 +682,7 @@ static struct notifier_block pcipcwd_notifier = {
682 * Init & exit routines 682 * Init & exit routines
683 */ 683 */
684 684
685static int __devinit pcipcwd_card_init(struct pci_dev *pdev, 685static int pcipcwd_card_init(struct pci_dev *pdev,
686 const struct pci_device_id *ent) 686 const struct pci_device_id *ent)
687{ 687{
688 int ret = -EIO; 688 int ret = -EIO;
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 5c07fa47b8ce..4f7afeab6698 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -146,7 +146,7 @@ static struct watchdog_device pnx4008_wdd = {
146 .max_timeout = MAX_HEARTBEAT, 146 .max_timeout = MAX_HEARTBEAT,
147}; 147};
148 148
149static int __devinit pnx4008_wdt_probe(struct platform_device *pdev) 149static int pnx4008_wdt_probe(struct platform_device *pdev)
150{ 150{
151 struct resource *r; 151 struct resource *r;
152 int ret = 0; 152 int ret = 0;
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index cf983d3a32fe..22662808c37d 100644
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -260,7 +260,7 @@ static struct miscdevice rc32434_wdt_miscdev = {
260 .fops = &rc32434_wdt_fops, 260 .fops = &rc32434_wdt_fops,
261}; 261};
262 262
263static int __devinit rc32434_wdt_probe(struct platform_device *pdev) 263static int rc32434_wdt_probe(struct platform_device *pdev)
264{ 264{
265 int ret; 265 int ret;
266 struct resource *r; 266 struct resource *r;
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
index 27682148c99e..94667064c8cf 100644
--- a/drivers/watchdog/rdc321x_wdt.c
+++ b/drivers/watchdog/rdc321x_wdt.c
@@ -225,7 +225,7 @@ static struct miscdevice rdc321x_wdt_misc = {
225 .fops = &rdc321x_wdt_fops, 225 .fops = &rdc321x_wdt_fops,
226}; 226};
227 227
228static int __devinit rdc321x_wdt_probe(struct platform_device *pdev) 228static int rdc321x_wdt_probe(struct platform_device *pdev)
229{ 229{
230 int err; 230 int err;
231 struct resource *r; 231 struct resource *r;
diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index 65851f4553c4..84f523338ff4 100644
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -174,7 +174,7 @@ static struct miscdevice riowd_miscdev = {
174 .fops = &riowd_fops 174 .fops = &riowd_fops
175}; 175};
176 176
177static int __devinit riowd_probe(struct platform_device *op) 177static int riowd_probe(struct platform_device *op)
178{ 178{
179 struct riowd *p; 179 struct riowd *p;
180 int err = -EINVAL; 180 int err = -EINVAL;
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index c31742096932..2e28c145081c 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -303,7 +303,7 @@ static inline void s3c2410wdt_cpufreq_deregister(void)
303} 303}
304#endif 304#endif
305 305
306static int __devinit s3c2410wdt_probe(struct platform_device *pdev) 306static int s3c2410wdt_probe(struct platform_device *pdev)
307{ 307{
308 struct device *dev; 308 struct device *dev;
309 unsigned int wtcon; 309 unsigned int wtcon;
diff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c
index 766b132e8c6e..8ecec2919797 100644
--- a/drivers/watchdog/sch311x_wdt.c
+++ b/drivers/watchdog/sch311x_wdt.c
@@ -356,7 +356,7 @@ static struct miscdevice sch311x_wdt_miscdev = {
356 * Init & exit routines 356 * Init & exit routines
357 */ 357 */
358 358
359static int __devinit sch311x_wdt_probe(struct platform_device *pdev) 359static int sch311x_wdt_probe(struct platform_device *pdev)
360{ 360{
361 struct device *dev = &pdev->dev; 361 struct device *dev = &pdev->dev;
362 int err; 362 int err;
diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c
index ce1be6eca640..9c57af943b87 100644
--- a/drivers/watchdog/shwdt.c
+++ b/drivers/watchdog/shwdt.c
@@ -217,7 +217,7 @@ static struct watchdog_device sh_wdt_dev = {
217 .ops = &sh_wdt_ops, 217 .ops = &sh_wdt_ops,
218}; 218};
219 219
220static int __devinit sh_wdt_probe(struct platform_device *pdev) 220static int sh_wdt_probe(struct platform_device *pdev)
221{ 221{
222 struct sh_wdt *wdt; 222 struct sh_wdt *wdt;
223 struct resource *res; 223 struct resource *res;
diff --git a/drivers/watchdog/sp5100_tco.c b/drivers/watchdog/sp5100_tco.c
index 066901bdc4d5..7ee39a79ff1e 100644
--- a/drivers/watchdog/sp5100_tco.c
+++ b/drivers/watchdog/sp5100_tco.c
@@ -271,7 +271,7 @@ MODULE_DEVICE_TABLE(pci, sp5100_tco_pci_tbl);
271 * Init & exit routines 271 * Init & exit routines
272 */ 272 */
273 273
274static unsigned char __devinit sp5100_tco_setupdevice(void) 274static unsigned char sp5100_tco_setupdevice(void)
275{ 275{
276 struct pci_dev *dev = NULL; 276 struct pci_dev *dev = NULL;
277 u32 val; 277 u32 val;
@@ -361,7 +361,7 @@ exit:
361 return 0; 361 return 0;
362} 362}
363 363
364static int __devinit sp5100_tco_init(struct platform_device *dev) 364static int sp5100_tco_init(struct platform_device *dev)
365{ 365{
366 int ret; 366 int ret;
367 u32 val; 367 u32 val;
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index f1c1e889e419..32a5419657d2 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -210,7 +210,7 @@ static const struct watchdog_ops wdt_ops = {
210 .get_timeleft = wdt_timeleft, 210 .get_timeleft = wdt_timeleft,
211}; 211};
212 212
213static int __devinit 213static int
214sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id) 214sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)
215{ 215{
216 struct sp805_wdt *wdt; 216 struct sp805_wdt *wdt;
diff --git a/drivers/watchdog/stmp3xxx_wdt.c b/drivers/watchdog/stmp3xxx_wdt.c
index 4226250eb6e4..254cce38cc03 100644
--- a/drivers/watchdog/stmp3xxx_wdt.c
+++ b/drivers/watchdog/stmp3xxx_wdt.c
@@ -204,7 +204,7 @@ static struct miscdevice stmp3xxx_wdt_miscdev = {
204 .fops = &stmp3xxx_wdt_fops, 204 .fops = &stmp3xxx_wdt_fops,
205}; 205};
206 206
207static int __devinit stmp3xxx_wdt_probe(struct platform_device *pdev) 207static int stmp3xxx_wdt_probe(struct platform_device *pdev)
208{ 208{
209 int ret = 0; 209 int ret = 0;
210 210
diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c
index 2acc1fe7f54d..d6e94b4c67f6 100644
--- a/drivers/watchdog/ts72xx_wdt.c
+++ b/drivers/watchdog/ts72xx_wdt.c
@@ -390,7 +390,7 @@ static struct miscdevice ts72xx_wdt_miscdev = {
390 .fops = &ts72xx_wdt_fops, 390 .fops = &ts72xx_wdt_fops,
391}; 391};
392 392
393static __devinit int ts72xx_wdt_probe(struct platform_device *pdev) 393static int ts72xx_wdt_probe(struct platform_device *pdev)
394{ 394{
395 struct ts72xx_wdt *wdt; 395 struct ts72xx_wdt *wdt;
396 struct resource *r1, *r2; 396 struct resource *r1, *r2;
diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
index cf59a38478e0..6dab509caf94 100644
--- a/drivers/watchdog/twl4030_wdt.c
+++ b/drivers/watchdog/twl4030_wdt.c
@@ -170,7 +170,7 @@ static const struct file_operations twl4030_wdt_fops = {
170 .write = twl4030_wdt_write_fop, 170 .write = twl4030_wdt_write_fop,
171}; 171};
172 172
173static int __devinit twl4030_wdt_probe(struct platform_device *pdev) 173static int twl4030_wdt_probe(struct platform_device *pdev)
174{ 174{
175 int ret = 0; 175 int ret = 0;
176 struct twl4030_wdt *wdt; 176 struct twl4030_wdt *wdt;
diff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c
index a9af1ddae1ba..098dfab82b6c 100644
--- a/drivers/watchdog/via_wdt.c
+++ b/drivers/watchdog/via_wdt.c
@@ -155,7 +155,7 @@ static struct watchdog_device wdt_dev = {
155 .max_timeout = WDT_TIMEOUT_MAX, 155 .max_timeout = WDT_TIMEOUT_MAX,
156}; 156};
157 157
158static int __devinit wdt_probe(struct pci_dev *pdev, 158static int wdt_probe(struct pci_dev *pdev,
159 const struct pci_device_id *ent) 159 const struct pci_device_id *ent)
160{ 160{
161 unsigned char conf; 161 unsigned char conf;
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index 05c14e4740c1..13d27c878db4 100644
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -605,7 +605,7 @@ static struct notifier_block wdtpci_notifier = {
605}; 605};
606 606
607 607
608static int __devinit wdtpci_init_one(struct pci_dev *dev, 608static int wdtpci_init_one(struct pci_dev *dev,
609 const struct pci_device_id *ent) 609 const struct pci_device_id *ent)
610{ 610{
611 int ret = -EIO; 611 int ret = -EIO;
diff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c
index f9c54feb8f1a..170c82e97454 100644
--- a/drivers/watchdog/wm831x_wdt.c
+++ b/drivers/watchdog/wm831x_wdt.c
@@ -181,7 +181,7 @@ static const struct watchdog_ops wm831x_wdt_ops = {
181 .set_timeout = wm831x_wdt_set_timeout, 181 .set_timeout = wm831x_wdt_set_timeout,
182}; 182};
183 183
184static int __devinit wm831x_wdt_probe(struct platform_device *pdev) 184static int wm831x_wdt_probe(struct platform_device *pdev)
185{ 185{
186 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); 186 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
187 struct wm831x_pdata *chip_pdata; 187 struct wm831x_pdata *chip_pdata;
diff --git a/drivers/watchdog/wm8350_wdt.c b/drivers/watchdog/wm8350_wdt.c
index 770b6da1ff41..4530fa00b78d 100644
--- a/drivers/watchdog/wm8350_wdt.c
+++ b/drivers/watchdog/wm8350_wdt.c
@@ -140,7 +140,7 @@ static struct watchdog_device wm8350_wdt = {
140 .max_timeout = 4, 140 .max_timeout = 4,
141}; 141};
142 142
143static int __devinit wm8350_wdt_probe(struct platform_device *pdev) 143static int wm8350_wdt_probe(struct platform_device *pdev)
144{ 144{
145 struct wm8350 *wm8350 = platform_get_drvdata(pdev); 145 struct wm8350 *wm8350 = platform_get_drvdata(pdev);
146 146
diff --git a/drivers/watchdog/xen_wdt.c b/drivers/watchdog/xen_wdt.c
index 99b956fa4ebd..1eb6bdc020ac 100644
--- a/drivers/watchdog/xen_wdt.c
+++ b/drivers/watchdog/xen_wdt.c
@@ -244,7 +244,7 @@ static struct miscdevice xen_wdt_miscdev = {
244 .fops = &xen_wdt_fops, 244 .fops = &xen_wdt_fops,
245}; 245};
246 246
247static int __devinit xen_wdt_probe(struct platform_device *dev) 247static int xen_wdt_probe(struct platform_device *dev)
248{ 248{
249 struct sched_watchdog wd = { .id = ~0 }; 249 struct sched_watchdog wd = { .id = ~0 };
250 int ret = HYPERVISOR_sched_op(SCHEDOP_watchdog, &wd); 250 int ret = HYPERVISOR_sched_op(SCHEDOP_watchdog, &wd);