summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-04-14 18:25:03 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-18 23:54:31 +0200
commit2dc60c589ba810b0c746c91f390a6796b4176572 (patch)
treec80ac5082369920d35a1009bcdef56a284c3009e /drivers/misc
parentpch_phub: delete duplicate definitions (diff)
downloadlinux-2dc60c589ba810b0c746c91f390a6796b4176572.tar.xz
linux-2dc60c589ba810b0c746c91f390a6796b4176572.zip
misc: add missing __devexit_p() annotations
Drivers that refer to a __devexit function in an operations structure need to annotate that pointer with __devexit_p so it is replaced with a NULL pointer when the section gets discarded. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/bh1780gli.c2
-rw-r--r--drivers/misc/pti.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/bh1780gli.c b/drivers/misc/bh1780gli.c
index 54f6f39f990a..f1f9877f3fdf 100644
--- a/drivers/misc/bh1780gli.c
+++ b/drivers/misc/bh1780gli.c
@@ -248,7 +248,7 @@ static const struct i2c_device_id bh1780_id[] = {
static struct i2c_driver bh1780_driver = {
.probe = bh1780_probe,
- .remove = bh1780_remove,
+ .remove = __devexit_p(bh1780_remove),
.id_table = bh1780_id,
.driver = {
.name = "bh1780",
diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c
index 383133b201a1..b7eb545394b1 100644
--- a/drivers/misc/pti.c
+++ b/drivers/misc/pti.c
@@ -888,7 +888,7 @@ static struct pci_driver pti_pci_driver = {
.name = PCINAME,
.id_table = pci_ids,
.probe = pti_pci_probe,
- .remove = pti_pci_remove,
+ .remove = __devexit_p(pti_pci_remove),
};
/**