From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MTPzy-000478-83 for mharc-grub-devel@gnu.org; Tue, 21 Jul 2009 20:47:58 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MTPzw-00046c-RQ for grub-devel@gnu.org; Tue, 21 Jul 2009 20:47:56 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MTPzs-00044i-7r for grub-devel@gnu.org; Tue, 21 Jul 2009 20:47:56 -0400 Received: from [199.232.76.173] (port=36305 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MTPzs-00044c-2N for grub-devel@gnu.org; Tue, 21 Jul 2009 20:47:52 -0400 Received: from c60.cesmail.net ([216.154.195.49]:60303) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.60) (envelope-from ) id 1MTPzr-0008MX-Gj for grub-devel@gnu.org; Tue, 21 Jul 2009 20:47:51 -0400 Received: from unknown (HELO smtprelay2.cesmail.net) ([192.168.1.112]) by c60.cesmail.net with ESMTP; 21 Jul 2009 20:47:51 -0400 Received: from mj.roinet.com (static-72-92-88-10.phlapa.fios.verizon.net [72.92.88.10]) by smtprelay2.cesmail.net (Postfix) with ESMTPSA id 48B1734C6A for ; Tue, 21 Jul 2009 20:58:18 -0400 (EDT) To: grub-devel@gnu.org From: Pavel Roskin Date: Tue, 21 Jul 2009 20:47:50 -0400 Message-ID: <20090722004750.22269.52630.stgit@mj.roinet.com> In-Reply-To: <20090722004743.22269.56117.stgit@mj.roinet.com> References: <20090722004743.22269.56117.stgit@mj.roinet.com> User-Agent: StGit/0.15-rc1-9-gd8846 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [PATCH 2/3] Eliminate grub_dl_call_init() X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jul 2009 00:47:57 -0000 It's just two lines long and there is only one caller. Besides, there is no equivalent for mod->fini. ChangeLog: * kern/dl.c (grub_dl_call_init): Remove. (grub_dl_load_core): Call mod->init directly. --- kern/dl.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/kern/dl.c b/kern/dl.c index ebde547..e2382d6 100644 --- a/kern/dl.c +++ b/kern/dl.c @@ -393,13 +393,6 @@ grub_dl_resolve_symbols (grub_dl_t mod, Elf_Ehdr *e) return GRUB_ERR_NONE; } -static void -grub_dl_call_init (grub_dl_t mod) -{ - if (mod->init) - (mod->init) (mod); -} - static grub_err_t grub_dl_resolve_name (grub_dl_t mod, Elf_Ehdr *e) { @@ -559,7 +552,8 @@ grub_dl_load_core (void *addr, grub_size_t size) mod->ref_count = 1; - grub_dl_call_init (mod); + if (mod->init) + (mod->init) (mod); return mod; }