From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759049AbYFXIZZ (ORCPT ); Tue, 24 Jun 2008 04:25:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755819AbYFXIZB (ORCPT ); Tue, 24 Jun 2008 04:25:01 -0400 Received: from mgw1.diku.dk ([130.225.96.91]:45671 "EHLO mgw1.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753182AbYFXIY7 (ORCPT ); Tue, 24 Jun 2008 04:24:59 -0400 Date: Tue, 24 Jun 2008 10:24:57 +0200 (CEST) From: Julia Lawall To: akinobu.mita@gmail.com, davem@davemloft.net, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 9/14] arch/sparc64: Eliminate NULL test and memset after alloc_bootmem Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Julia Lawall As noted by Akinobu Mita in patch b1fceac2b9e04d278316b2faddf276015fc06e3b, alloc_bootmem and related functions never return NULL and always return a zeroed region of memory. Thus a NULL test or memset after calls to these functions is unnecessary. arch/sparc64/kernel/irq.c | 8 -------- 1 file changed, 8 deletions(-) This was fixed using the following semantic patch. (http://www.emn.fr/x-info/coccinelle/) // @@ expression E; statement S; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) ... when != E ( - BUG_ON (E == NULL); | - if (E == NULL) S ) @@ expression E,E1; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) ... when != E - memset(E,0,E1); // Signed-off-by: Julia Lawall --- diff -u -p a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c --- a/arch/sparc64/kernel/irq.c +++ b/arch/sparc64/kernel/irq.c @@ -882,10 +882,6 @@ static void __init init_cpu_send_mondo_i BUILD_BUG_ON((NR_CPUS * sizeof(u16)) > (PAGE_SIZE - 64)); page = alloc_bootmem_pages(PAGE_SIZE); - if (!page) { - prom_printf("SUN4V: Error, cannot allocate cpu mondo page.\n"); - prom_halt(); - } tb->cpu_mondo_block_pa = __pa(page); tb->cpu_list_pa = __pa(page + 64); @@ -929,10 +925,6 @@ void __init init_IRQ(void) size = sizeof(struct ino_bucket) * NUM_IVECS; ivector_table = alloc_bootmem(size); - if (!ivector_table) { - prom_printf("Fatal error, cannot allocate ivector_table\n"); - prom_halt(); - } __flush_dcache_range((unsigned long) ivector_table, ((unsigned long) ivector_table) + size);