From patchwork Fri Jan 17 04:37:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 3501911 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7F0829F32F for ; Fri, 17 Jan 2014 04:38:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A59D420172 for ; Fri, 17 Jan 2014 04:38:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CACD320170 for ; Fri, 17 Jan 2014 04:38:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751920AbaAQEiQ (ORCPT ); Thu, 16 Jan 2014 23:38:16 -0500 Received: from mail-pa0-f49.google.com ([209.85.220.49]:41798 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751905AbaAQEiP (ORCPT ); Thu, 16 Jan 2014 23:38:15 -0500 Received: by mail-pa0-f49.google.com with SMTP id hz1so3596477pad.22 for ; Thu, 16 Jan 2014 20:38:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qP47htJmB/b/zjaWfOE+jzlOKnYs2L1Sl1E94jRjK1M=; b=LY1w30BVLT+r4R140tCiMerJQRgrVXptwQPXDNXjWoT52lnYId6IR3fVznR9LeGtSX 6q7bGvaNk+wYy6Fy0CoyZl7ZF5BamUTyBlUI4/nm7jheIrX+TAxZIkn6b8QpcFmrSM0C P3frOXXkAiPRgIOS+4rmg6uPk9C5X4oCUDJ2bKqjpm91NNxqbqGZAoGw0okqwChkbDMv 4cNiKGBGpAQ6tK1PuJcmPwlr0Cj5+9r7D5A4MIejjmub/VwhF3gbD29XEasFXBmWtFyv S0x3E/yg7uuuDv2DBuqrpJw82Wji/FpIYJO6lDyxl1HSxNr1B/+EuQ46hIvsBYpfFH7Q zogg== X-Gm-Message-State: ALoCoQkqGpMOKqkTXbw+cIp4d7NrNj0HHYfJB3SjptbocC3T10KXz9awGfZ/h9KRacPV18kqULff X-Received: by 10.66.187.11 with SMTP id fo11mr14485233pac.47.1389933495510; Thu, 16 Jan 2014 20:38:15 -0800 (PST) Received: from localhost ([218.17.215.175]) by mx.google.com with ESMTPSA id q7sm19100173pbc.20.2014.01.16.20.38.04 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 16 Jan 2014 20:38:14 -0800 (PST) From: Hanjun Guo To: "Rafael J. Wysocki" Cc: linux-acpi@vger.kernel.org, patches@linaro.org, linux-kernel@vger.kernel.org, linaro-kernel@lists.linaro.org, linaro-acpi@lists.linaro.org, Hanjun Guo Subject: [PATCH] ACPI / processor: Return specific error value when mapping lapic id Date: Fri, 17 Jan 2014 12:37:02 +0800 Message-Id: <1389933422-10016-1-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_WEB, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP we usually return 0 for success in int returned function, and negative value when failed, but in processor_core.c, some function return 1 for success and 0 for failure which leads confusion sometimes, replace with specific error values to fix that. Signed-off-by: Hanjun Guo --- drivers/acpi/processor_core.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index b3171f3..24c87ef 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -45,13 +45,13 @@ static int map_lapic_id(struct acpi_subtable_header *entry, (struct acpi_madt_local_apic *)entry; if (!(lapic->lapic_flags & ACPI_MADT_ENABLED)) - return 0; + return -ENODEV; if (lapic->processor_id != acpi_id) - return 0; + return -EINVAL; *apic_id = lapic->id; - return 1; + return 0; } static int map_x2apic_id(struct acpi_subtable_header *entry, @@ -61,14 +61,14 @@ static int map_x2apic_id(struct acpi_subtable_header *entry, (struct acpi_madt_local_x2apic *)entry; if (!(apic->lapic_flags & ACPI_MADT_ENABLED)) - return 0; + return -ENODEV; if (device_declaration && (apic->uid == acpi_id)) { *apic_id = apic->local_apic_id; - return 1; + return 0; } - return 0; + return -EINVAL; } static int map_lsapic_id(struct acpi_subtable_header *entry, @@ -78,16 +78,16 @@ static int map_lsapic_id(struct acpi_subtable_header *entry, (struct acpi_madt_local_sapic *)entry; if (!(lsapic->lapic_flags & ACPI_MADT_ENABLED)) - return 0; + return -ENODEV; if (device_declaration) { if ((entry->length < 16) || (lsapic->uid != acpi_id)) - return 0; + return -EINVAL; } else if (lsapic->processor_id != acpi_id) - return 0; + return -EINVAL; *apic_id = (lsapic->id << 8) | lsapic->eid; - return 1; + return 0; } static int map_madt_entry(int type, u32 acpi_id) @@ -117,13 +117,13 @@ static int map_madt_entry(int type, u32 acpi_id) struct acpi_subtable_header *header = (struct acpi_subtable_header *)entry; if (header->type == ACPI_MADT_TYPE_LOCAL_APIC) { - if (map_lapic_id(header, acpi_id, &apic_id)) + if (!map_lapic_id(header, acpi_id, &apic_id)) break; } else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC) { - if (map_x2apic_id(header, type, acpi_id, &apic_id)) + if (!map_x2apic_id(header, type, acpi_id, &apic_id)) break; } else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) { - if (map_lsapic_id(header, type, acpi_id, &apic_id)) + if (!map_lsapic_id(header, type, acpi_id, &apic_id)) break; } entry += header->length;