lkml.org 
[lkml]   [2012]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/8] drivers/net: add missing __devexit_p() annotations
    Date
    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


    \
     
     \ /
      Last update: 2012-04-20 23:01    [W:0.024 / U:95.060 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site