From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261343AbVG1Hxa (ORCPT ); Thu, 28 Jul 2005 03:53:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261353AbVG1Hx0 (ORCPT ); Thu, 28 Jul 2005 03:53:26 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:21686 "EHLO fgwmail6.fujitsu.co.jp") by vger.kernel.org with ESMTP id S261343AbVG1Hvd (ORCPT ); Thu, 28 Jul 2005 03:51:33 -0400 Message-ID: <42E88E6F.50805@jp.fujitsu.com> Date: Thu, 28 Jul 2005 16:51:11 +0900 From: Kenji Kaneshige User-Agent: Mozilla Thunderbird 1.0.2 (Windows/20050317) X-Accept-Language: ja, en-us, en MIME-Version: 1.0 To: Andrew Morton , Linux Kernel Mailing List , linux-ia64@vger.kernel.org CC: Kenji Kaneshige Subject: [PATCH 2.6.13-rc3 1/6] failure of acpi_register_gsi() should be handled properly - change acpi_register_gsi() interface References: <42E88DC8.7050507@jp.fujitsu.com> In-Reply-To: <42E88DC8.7050507@jp.fujitsu.com> Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org This patch changes the type of return value of acpi_register_gsi() from "unsigned int" to "int" to indicate an error. If acpi_register_gsi() fails to register gsi, it returns negative value. Signed-off-by: Kenji Kaneshige --- linux-2.6.13-rc3-kanesige/arch/i386/kernel/acpi/boot.c | 6 +++++- linux-2.6.13-rc3-kanesige/arch/ia64/kernel/acpi.c | 6 +++++- linux-2.6.13-rc3-kanesige/include/linux/acpi.h | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff -puN arch/i386/kernel/acpi/boot.c~handle-error-acpi_register_gsi arch/i386/kernel/acpi/boot.c --- linux-2.6.13-rc3/arch/i386/kernel/acpi/boot.c~handle-error-acpi_register_gsi 2005-07-28 01:01:14.000000000 +0900 +++ linux-2.6.13-rc3-kanesige/arch/i386/kernel/acpi/boot.c 2005-07-28 01:01:14.000000000 +0900 @@ -484,7 +484,11 @@ int acpi_gsi_to_irq(u32 gsi, unsigned in return 0; } -unsigned int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low) +/* + * success: return IRQ number (>=0) + * failure: return < 0 + */ +int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low) { unsigned int irq; unsigned int plat_gsi = gsi; diff -puN arch/ia64/kernel/acpi.c~handle-error-acpi_register_gsi arch/ia64/kernel/acpi.c --- linux-2.6.13-rc3/arch/ia64/kernel/acpi.c~handle-error-acpi_register_gsi 2005-07-28 01:01:14.000000000 +0900 +++ linux-2.6.13-rc3-kanesige/arch/ia64/kernel/acpi.c 2005-07-28 01:01:14.000000000 +0900 @@ -563,7 +563,11 @@ acpi_numa_arch_fixup (void) } #endif /* CONFIG_ACPI_NUMA */ -unsigned int +/* + * success: return IRQ number (>=0) + * failure: return < 0 + */ +int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low) { if (has_8259 && gsi < 16) diff -puN include/linux/acpi.h~handle-error-acpi_register_gsi include/linux/acpi.h --- linux-2.6.13-rc3/include/linux/acpi.h~handle-error-acpi_register_gsi 2005-07-28 01:01:14.000000000 +0900 +++ linux-2.6.13-rc3-kanesige/include/linux/acpi.h 2005-07-28 01:01:14.000000000 +0900 @@ -445,7 +445,7 @@ static inline int acpi_boot_table_init(v #endif /*!CONFIG_ACPI_BOOT*/ -unsigned int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low); +int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low); int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); /* _