linux-kernel - [PATCH] staging: Add missing __devexit

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Thu, 4 Jun 2009 13:35:15 +0200
From:	Jean Delvare <khali@...ux-fr.org>
To:	Greg Kroah-Hartman <gregkh@...e.de>
Cc:	LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH] staging: Add missing __devexit_p()

The remove function uses __devexit, so the .remove assignment needs
__devexit_p() to fix a build error with hotplug disabled.

Signed-off-by: Jean Delvare <khali@...ux-fr.org>
Cc: Greg Kroah-Hartman <gregkh@...e.de>
---
Inspired from recent similar fixes from Mike Frysinger.

 drivers/staging/altpciechdma/altpciechdma.c |    2 +-
 drivers/staging/slicoss/slicoss.c           |    2 +-
 drivers/staging/sxg/sxg.c                   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- linux-2.6.30-rc8.orig/drivers/staging/altpciechdma/altpciechdma.c	2009-06-04 12:49:27.000000000 +0200
+++ linux-2.6.30-rc8/drivers/staging/altpciechdma/altpciechdma.c	2009-06-04 12:52:47.000000000 +0200
@@ -1151,7 +1151,7 @@ static struct pci_driver pci_driver = {
 	.name = DRV_NAME,
 	.id_table = ids,
 	.probe = probe,
-	.remove = remove,
+	.remove = __devexit_p(remove),
 	/* resume, suspend are optional */
 };
 
--- linux-2.6.30-rc8.orig/drivers/staging/slicoss/slicoss.c	2009-04-22 09:51:03.000000000 +0200
+++ linux-2.6.30-rc8/drivers/staging/slicoss/slicoss.c	2009-06-04 12:52:26.000000000 +0200
@@ -4049,7 +4049,7 @@ static struct pci_driver slic_driver = {
 	.name = DRV_NAME,
 	.id_table = slic_pci_tbl,
 	.probe = slic_entry_probe,
-	.remove = slic_entry_remove,
+	.remove = __devexit_p(slic_entry_remove),
 };
 
 static int __init slic_module_init(void)
--- linux-2.6.30-rc8.orig/drivers/staging/sxg/sxg.c	2009-04-22 09:51:03.000000000 +0200
+++ linux-2.6.30-rc8/drivers/staging/sxg/sxg.c	2009-06-04 12:52:12.000000000 +0200
@@ -4516,7 +4516,7 @@ static struct pci_driver sxg_driver = {
 	.name = sxg_driver_name,
 	.id_table = sxg_pci_tbl,
 	.probe = sxg_entry_probe,
-	.remove = sxg_entry_remove,
+	.remove = __devexit_p(sxg_entry_remove),
 #if SXG_POWER_MANAGEMENT_ENABLED
 	.suspend = sxgpm_suspend,
 	.resume = sxgpm_resume,


-- 
Jean Delvare
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/