From patchwork Fri Apr 20 20:56:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 154147 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9E264B6FC3 for ; Sat, 21 Apr 2012 06:59:10 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754020Ab2DTU6y (ORCPT ); Fri, 20 Apr 2012 16:58:54 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:34059 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753167Ab2DTU40 (ORCPT ); Fri, 20 Apr 2012 16:56:26 -0400 Received: by mail-pb0-f46.google.com with SMTP id un15so1475811pbc.19 for ; Fri, 20 Apr 2012 13:56:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=gWzVTIla6JDnslQtvSHml+Bo3kYetQDIAmfRiDhvu94=; b=RiY2KyVnARqHIHeZf8XphQ4MbWn7up1JFkC/D6cikcIrCKveEmKKucsf//BwG8VlAN OJZgZIcg5QHI+sJ8Yr/Lfz62NLGvoZDrH/DSSwJFbtjGhF4NbICjxvo55YWNYn31bkOO uydeECNg+2sYE1Yi7Q5Z9ZpMV4gA83OOoikV4NIN1rPp6Y8tM4ppApC07goi8hYsejLI a2iKCJAhyaSeoc+Gm/11zcUOh8xAPkpQQDi70pHr3n/kACj6ELmEMG/28GfDaNlkCTje tRRN+r0xcOUW91v9aCYQy/ffHcvYIVfra3ajqSMShE6IK1PxdNApfA26bD610DqvtDk5 ZHhg== Received: by 10.68.221.162 with SMTP id qf2mr8646097pbc.57.1334955386044; Fri, 20 Apr 2012 13:56:26 -0700 (PDT) Received: from localhost.localdomain (S0106002369de4dac.cg.shawcable.net. [70.73.24.112]) by mx.google.com with ESMTPS id pg1sm6317632pbc.21.2012.04.20.13.56.25 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 20 Apr 2012 13:56:25 -0700 (PDT) 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 Message-Id: <1334955376-17793-3-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1334955376-17793-1-git-send-email-mathieu.poirier@linaro.org> References: <1334955376-17793-1-git-send-email-mathieu.poirier@linaro.org> X-Gm-Message-State: ALoCoQkHgmEpBMwjJOo3q9r3HPQ5pzDKqXoQDtbP+Ib2qMYJgL36lnoI/JuS42tLkkwgiRn3R2ed Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arnd Bergmann 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 Signed-off-by: Mathieu Poirier --- 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