From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andi Kleen Subject: [PATCH 1/4] ACPI: ec: Do request_region outside WARN() Date: Mon, 26 Dec 2011 22:34:44 -0800 Message-ID: <1324967687-10559-2-git-send-email-andi@firstfloor.org> References: <1324967687-10559-1-git-send-email-andi@firstfloor.org> Return-path: Received: from one.firstfloor.org ([213.235.205.2]:41338 "EHLO one.firstfloor.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751274Ab1L0GfD (ORCPT ); Tue, 27 Dec 2011 01:35:03 -0500 In-Reply-To: <1324967687-10559-1-git-send-email-andi@firstfloor.org> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Kleen , Andi Kleen WARN() is not supposed to have side effects, so move the request_regions outside. Signed-off-by: Andi Kleen --- drivers/acpi/ec.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index b19a18d..3268dcf 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -812,10 +812,10 @@ static int acpi_ec_add(struct acpi_device *device) first_ec = ec; device->driver_data = ec; - WARN(!request_region(ec->data_addr, 1, "EC data"), - "Could not request EC data io port 0x%lx", ec->data_addr); - WARN(!request_region(ec->command_addr, 1, "EC cmd"), - "Could not request EC cmd io port 0x%lx", ec->command_addr); + ret = !!request_region(ec->data_addr, 1, "EC data"); + WARN(!ret, "Could not request EC data io port 0x%lx", ec->data_addr); + ret = !!request_region(ec->command_addr, 1, "EC cmd"); + WARN(!ret, "Could not request EC cmd io port 0x%lx", ec->command_addr); pr_info(PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n", ec->gpe, ec->command_addr, ec->data_addr); -- 1.7.7