Skip to content

Commit

Permalink
drivers/net: add missing __devexit_p() annotations
Browse files Browse the repository at this point in the history
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Arnd Bergmann authored and David S. Miller committed Apr 21, 2012
1 parent 32a6d90 commit 65f6092
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/micrel/ks8842.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/b43/sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/p54/p54usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,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
Expand Down

0 comments on commit 65f6092

Please sign in to comment.