From patchwork Mon Nov 19 18:19:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Pemberton X-Patchwork-Id: 200120 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 122292C0081 for ; Tue, 20 Nov 2012 05:40:06 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754582Ab2KSSjt (ORCPT ); Mon, 19 Nov 2012 13:39:49 -0500 Received: from viridian.itc.Virginia.EDU ([128.143.12.139]:41664 "EHLO viridian.itc.virginia.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754479Ab2KSSiB (ORCPT ); Mon, 19 Nov 2012 13:38:01 -0500 Received: by viridian.itc.virginia.edu (Postfix, from userid 1249) id E054C801FC; Mon, 19 Nov 2012 13:27:24 -0500 (EST) From: Bill Pemberton To: gregkh@linuxfoundation.org Cc: "David S. Miller" , sparclinux@vger.kernel.org Subject: [PATCH 036/493] sparc: remove use of __devexit_p Date: Mon, 19 Nov 2012 13:19:45 -0500 Message-Id: <1353349642-3677-36-git-send-email-wfp5p@virginia.edu> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1353349642-3677-1-git-send-email-wfp5p@virginia.edu> References: <1353349642-3677-1-git-send-email-wfp5p@virginia.edu> Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer needed. Signed-off-by: Bill Pemberton Cc: "David S. Miller" Cc: sparclinux@vger.kernel.org --- arch/sparc/include/asm/parport.h | 2 +- arch/sparc/kernel/chmc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/sparc/include/asm/parport.h b/arch/sparc/include/asm/parport.h index cb33608..8c0bce4 100644 --- a/arch/sparc/include/asm/parport.h +++ b/arch/sparc/include/asm/parport.h @@ -242,7 +242,7 @@ static struct platform_driver ecpp_driver = { .of_match_table = ecpp_match, }, .probe = ecpp_probe, - .remove = __devexit_p(ecpp_remove), + .remove = ecpp_remove, }; static int parport_pc_find_nonpci_ports(int autoirq, int autodma) diff --git a/arch/sparc/kernel/chmc.c b/arch/sparc/kernel/chmc.c index 5f45026..af189fe 100644 --- a/arch/sparc/kernel/chmc.c +++ b/arch/sparc/kernel/chmc.c @@ -814,7 +814,7 @@ static struct platform_driver us3mc_driver = { .of_match_table = us3mc_match, }, .probe = us3mc_probe, - .remove = __devexit_p(us3mc_remove), + .remove = us3mc_remove, }; static inline bool us3mc_platform(void)