From: mathieu.poirier@linaro.org
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: arnd@arndb.de, mathieu.poirier@linaro.org
Subject: [PATCH 2/8] drivers/net: add missing __devexit_p() annotations
Date: Fri, 20 Apr 2012 14:56:10 -0600 [thread overview]
Message-ID: <1334955376-17793-3-git-send-email-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <1334955376-17793-1-git-send-email-mathieu.poirier@linaro.org>
From: Arnd Bergmann <arnd@arndb.de>
Drivers that refer to a __devexit function in an operations
structure need to annotate that pointer with __devexit_p so
replace it 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>
---
drivers/net/ethernet/micrel/ks8842.c | 2 +-
drivers/net/wireless/b43/sdio.c | 2 +-
drivers/net/wireless/p54/p54usb.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c
index f84dd2d..24fb049 100644
--- a/drivers/net/ethernet/micrel/ks8842.c
+++ b/drivers/net/ethernet/micrel/ks8842.c
@@ -1262,7 +1262,7 @@ static struct platform_driver ks8842_platform_driver = {
.owner = THIS_MODULE,
},
.probe = ks8842_probe,
- .remove = ks8842_remove,
+ .remove = __devexit_p(ks8842_remove),
};
module_platform_driver(ks8842_platform_driver);
diff --git a/drivers/net/wireless/b43/sdio.c b/drivers/net/wireless/b43/sdio.c
index 80b0755..a54fb2d 100644
--- a/drivers/net/wireless/b43/sdio.c
+++ b/drivers/net/wireless/b43/sdio.c
@@ -193,7 +193,7 @@ static struct sdio_driver b43_sdio_driver = {
.name = "b43-sdio",
.id_table = b43_sdio_ids,
.probe = b43_sdio_probe,
- .remove = b43_sdio_remove,
+ .remove = __devexit_p(b43_sdio_remove),
};
int b43_sdio_init(void)
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index f4d28c3..43b37b2 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -1072,7 +1072,7 @@ static struct usb_driver p54u_driver = {
.name = "p54usb",
.id_table = p54u_table,
.probe = p54u_probe,
- .disconnect = p54u_disconnect,
+ .disconnect = __devexit_p(p54u_disconnect),
.pre_reset = p54u_pre_reset,
.post_reset = p54u_post_reset,
#ifdef CONFIG_PM
--
1.7.5.4
next prev parent reply other threads:[~2012-04-20 20:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-20 20:56 [PATCH 0/8] drivers/net: randconfig patches for kernel 3.3 mathieu.poirier
2012-04-20 20:56 ` [PATCH 1/8] davinci_cpdma: export symbols used by other drivers mathieu.poirier
2012-04-20 20:56 ` mathieu.poirier [this message]
2012-04-20 20:56 ` [PATCH 3/8] caif: include linux/io.h mathieu.poirier
2012-04-20 20:56 ` [PATCH 4/8] drivers/net: iwmc3200 depends on EXPERIMENTAL mathieu.poirier
2012-04-20 20:56 ` [PATCH 5/8] 8390: select CRC32 support mathieu.poirier
2012-04-20 20:56 ` [PATCH 6/8] donauboe: replace excessive udelay with msleep mathieu.poirier
2012-04-20 20:56 ` [PATCH 7/8] sungem: use mdelay instead of udelay where necessary mathieu.poirier
2012-04-20 20:56 ` [PATCH 8/8] drivers/net: decouple ISA and ISA_DMA_API mathieu.poirier
2012-04-21 19:29 ` [PATCH 0/8] drivers/net: randconfig patches for kernel 3.3 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1334955376-17793-3-git-send-email-mathieu.poirier@linaro.org \
--to=mathieu.poirier@linaro.org \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).