diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:21:41 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 15:00:24 -0500 |
commit | 2d991a164a61858012651e13c59521975504e260 (patch) | |
tree | c5f8dffa81d1f4fea34c108ca41f7290187cd64f /drivers/watchdog/i6300esb.c | |
parent | 82268714bdf06bc06135efb707a9de590ab2d294 (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/i6300esb.c')
-rw-r--r-- | drivers/watchdog/i6300esb.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 | ||
347 | static unsigned char __devinit esb_getdevice(struct pci_dev *pdev) | 347 | static 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 | ||
378 | static void __devinit esb_initdevice(void) | 378 | static 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 | ||
419 | static int __devinit esb_probe(struct pci_dev *pdev, | 419 | static 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; |