From patchwork Fri Jul 12 10:35:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 258736 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 593042C034C for ; Fri, 12 Jul 2013 20:35:48 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UxahW-0007rP-TG; Fri, 12 Jul 2013 10:35:46 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UxahN-0007qy-Lv for fwts-devel@lists.ubuntu.com; Fri, 12 Jul 2013 10:35:37 +0000 Received: from cpc3-craw6-2-0-cust180.croy.cable.virginmedia.com ([77.100.248.181] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1UxahN-0004Tl-Ig for fwts-devel@lists.ubuntu.com; Fri, 12 Jul 2013 10:35:37 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] acpi: syntaxcheck: use ASL_MESSAGE_TYPES instead of #defining them (LP: #1200568) Date: Fri, 12 Jul 2013 11:35:37 +0100 Message-Id: <1373625337-23532-1-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.8.1.2 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King The IASL error codes are hard coded in fwts syntaxcheck and now differ from the ones in ACPICA, so we are no longer picking up errors. Instead we should use the ACPCIA error codes as defined in aslmessages.h which we are already #including by are subsequently redefining. So just remove the dodgy #defines and it all works correctly. Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Ivan Hu --- src/acpi/syntaxcheck/syntaxcheck.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/acpi/syntaxcheck/syntaxcheck.c b/src/acpi/syntaxcheck/syntaxcheck.c index 5d0ae6c..61d46f8 100644 --- a/src/acpi/syntaxcheck/syntaxcheck.c +++ b/src/acpi/syntaxcheck/syntaxcheck.c @@ -45,13 +45,6 @@ static void syntaxcheck_free_advice(void); */ #define SYNTAXCHECK_JSON_FILE "syntaxcheck.json" -#define ASL_WARNING 0 -#define ASL_WARNING2 1 -#define ASL_WARNING3 2 -#define ASL_ERROR 3 -#define ASL_REMARK 4 -#define ASL_OPTIMIZATION 5 - #define ASL_ID(error) { error, #error, NULL } /*