From 82268714bdf06bc06135efb707a9de590ab2d294 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:21:12 -0500 Subject: watchdog: remove use of __devexit_p CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer needed. Signed-off-by: Bill Pemberton Cc: Wim Van Sebroeck Cc: Wan ZongShun Cc: Ben Dooks Cc: Kukjin Kim Acked-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/watchdog/i6300esb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/watchdog/i6300esb.c') diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c index 276877d5b6a3..2574066c6343 100644 --- a/drivers/watchdog/i6300esb.c +++ b/drivers/watchdog/i6300esb.c @@ -488,7 +488,7 @@ static struct pci_driver esb_driver = { .name = ESB_MODULE_NAME, .id_table = esb_pci_tbl, .probe = esb_probe, - .remove = __devexit_p(esb_remove), + .remove = esb_remove, .shutdown = esb_shutdown, }; -- cgit v1.2.3 From 2d991a164a61858012651e13c59521975504e260 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:21:41 -0500 Subject: watchdog: remove use of __devinit CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton Cc: Wim Van Sebroeck Cc: Wan ZongShun Cc: Ben Dooks Cc: Kukjin Kim Acked-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/watchdog/i6300esb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/watchdog/i6300esb.c') 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); * Init & exit routines */ -static unsigned char __devinit esb_getdevice(struct pci_dev *pdev) +static unsigned char esb_getdevice(struct pci_dev *pdev) { if (pci_enable_device(pdev)) { pr_err("failed to enable device\n"); @@ -375,7 +375,7 @@ err_devput: return 0; } -static void __devinit esb_initdevice(void) +static void esb_initdevice(void) { u8 val1; u16 val2; @@ -416,7 +416,7 @@ static void __devinit esb_initdevice(void) esb_timer_set_heartbeat(heartbeat); } -static int __devinit esb_probe(struct pci_dev *pdev, +static int esb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { int ret; -- cgit v1.2.3 From 4b12b896c27c3b54592816606679f5b02f638930 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:26:24 -0500 Subject: watchdog: remove use of __devexit CONFIG_HOTPLUG is going away as an option so __devexit is no longer needed. Signed-off-by: Bill Pemberton Cc: Wim Van Sebroeck Cc: Wan ZongShun Cc: Ben Dooks Cc: Kukjin Kim Acked-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/watchdog/i6300esb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/watchdog/i6300esb.c') diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c index 31b87db90261..2b2ea13d03ea 100644 --- a/drivers/watchdog/i6300esb.c +++ b/drivers/watchdog/i6300esb.c @@ -465,7 +465,7 @@ err_unmap: return ret; } -static void __devexit esb_remove(struct pci_dev *pdev) +static void esb_remove(struct pci_dev *pdev) { /* Stop the timer before we leave */ if (!nowayout) -- cgit v1.2.3