From patchwork Tue Oct 14 09:12:52 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Brueckner X-Patchwork-Id: 4446 X-Patchwork-Delegate: benh@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 35326DE6D6 for ; Tue, 14 Oct 2008 21:31:15 +1100 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org Received: from mtagate1.uk.ibm.com (mtagate1.uk.ibm.com [194.196.100.161]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mtagate1.uk.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 90A6ADDF43 for ; Tue, 14 Oct 2008 20:14:24 +1100 (EST) Received: from d06nrmr1407.portsmouth.uk.ibm.com (d06nrmr1407.portsmouth.uk.ibm.com [9.149.38.185]) by mtagate1.uk.ibm.com (8.13.1/8.13.1) with ESMTP id m9E9EIIa015424 for ; Tue, 14 Oct 2008 09:14:19 GMT Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by d06nrmr1407.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id m9E9EEXx3014666 for ; Tue, 14 Oct 2008 10:14:14 +0100 Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id m9E9EDb7025000 for ; Tue, 14 Oct 2008 10:14:14 +0100 Received: from localhost (dyn-9-152-198-122.boeblingen.de.ibm.com [9.152.198.122]) by d06av02.portsmouth.uk.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id m9E9EDja024991; Tue, 14 Oct 2008 10:14:13 +0100 Message-Id: <20081014091413.437197300@linux.vnet.ibm.com> References: <20081014091247.433079967@linux.vnet.ibm.com> User-Agent: quilt/0.46-1 Date: Tue, 14 Oct 2008 11:12:52 +0200 From: Hendrik Brueckner To: Benjamin Herrenschmidt , Linux PPC devel , Jeremy Fitzhardinge , Rusty Russell , "Ryan S. Arnold" Subject: [RFC PATCH 5/5] hvc_console: Remove __devexit annotation of hvc_remove() Content-Disposition: inline; filename=hvc/common/05_hvc_annotation.patch X-Mailman-Approved-At: Tue, 14 Oct 2008 21:28:51 +1100 Cc: Martin Schwidefsky , Christian Borntraeger , Hendrik Brueckner , Heiko Carstens , LKML X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org From: Hendrik Brueckner Removed __devexit annotation of hvc_remove() to avoid a section mismatch if the backend initialization fails and hvc_remove() must be used to clean up allocated hvc structs (called in section __init or __devinit). Acked-by: Christian Borntraeger Signed-off-by: Hendrik Brueckner --- drivers/char/hvc_console.c | 2 +- drivers/char/hvc_console.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c @@ -806,7 +806,7 @@ struct hvc_struct __devinit *hvc_alloc(u } EXPORT_SYMBOL_GPL(hvc_alloc); -int __devexit hvc_remove(struct hvc_struct *hp) +int hvc_remove(struct hvc_struct *hp) { unsigned long flags; struct tty_struct *tty; --- a/drivers/char/hvc_console.h +++ b/drivers/char/hvc_console.h @@ -81,7 +81,7 @@ extern int hvc_instantiate(uint32_t vter extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int data, struct hv_ops *ops, int outbuf_size); /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ -extern int __devexit hvc_remove(struct hvc_struct *hp); +extern int hvc_remove(struct hvc_struct *hp); /* data available */ int hvc_poll(struct hvc_struct *hp);