From patchwork Wed Nov 26 14:01:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 5385661 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 10F33C11AC for ; Wed, 26 Nov 2014 14:01:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3C048200D5 for ; Wed, 26 Nov 2014 14:01:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 34356201F4 for ; Wed, 26 Nov 2014 14:01:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752070AbaKZOBo (ORCPT ); Wed, 26 Nov 2014 09:01:44 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:38408 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752722AbaKZOBm (ORCPT ); Wed, 26 Nov 2014 09:01:42 -0500 Received: by mail-pa0-f44.google.com with SMTP id et14so2926583pad.17 for ; Wed, 26 Nov 2014 06:01:42 -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:in-reply-to :references; bh=hQSG38n8qmymcvnFDn5Dtu5GtN33uEQ7iCdZexMNjzs=; b=j5w+OjYXN9k8FE6cSwBJozjMB54Ww5RNpAIik14Gjv6MRF9Wel9mRFUatpYeueYwFo DROcnPAqd7PgbpY30tMDSXrbcEgKlLXX2afrlb+FhzWEYFKvhitDRWqCAgn3DVcgT6T4 L3a8/QnPh3v2g7RiitSVMDGEl9srcJfEj2RWUeTB2RHXmjFR5QGdOAYa6CQCE0UItZIf 4D6puD22Rs/I7xJ7oamvUd//in1wDsSFN0f272lfxZjv50ugV08cPDSO2wNm+0sq+j0V 6pyxjlqg3V6QVPmoY6gia4PVVJvCMxviM8Ca/qNjzJ3+th0Wze99ru75TT+Kc2vJcVOh aLLQ== X-Gm-Message-State: ALoCoQlCe7JEkUEtj9UDuS1d5WtqlC967UyRzAPUHiraS7JVPbClbDF4iPsRsAZ87NySLCBgHynf X-Received: by 10.70.94.36 with SMTP id cz4mr53326086pdb.169.1417010501723; Wed, 26 Nov 2014 06:01:41 -0800 (PST) Received: from localhost ([39.181.45.161]) by mx.google.com with ESMTPSA id j10sm4395392pdr.92.2014.11.26.06.01.39 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 26 Nov 2014 06:01:40 -0800 (PST) From: Hanjun Guo X-Google-Original-From: Hanjun Guo To: "Rafael J. Wysocki" Cc: linux-acpi@vger.kernel.org, linaro-acpi@lists.linaro.org, Tomasz Nowicki , Hanjun Guo Subject: [PATCH 2/2] ACPI / table: Count matched and successfully parsed entries without specifying max entries Date: Wed, 26 Nov 2014 22:01:14 +0800 Message-Id: <1417010474-2399-2-git-send-email-hanjun.guo@linaro.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1417010474-2399-1-git-send-email-hanjun.guo@linaro.com> References: <1417010474-2399-1-git-send-email-hanjun.guo@linaro.com> 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 From: Tomasz Nowicki acpi_parse_entries() allows to traverse all available table entries (aka subtables) by passing max_entries parameter equal to 0, but since its count variable is only incremented if max_entries is not 0, the function always returns 0 for max_entries equal to 0. It would be more useful if it returned the number of entries matched instead, so make it increment count in that case too. Acked-by: Grant Likely Signed-off-by: Tomasz Nowicki Signed-off-by: Hanjun Guo --- drivers/acpi/tables.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index f1debe9..93b8152 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -224,10 +224,13 @@ acpi_parse_entries(char *id, unsigned long table_size, while (((unsigned long)entry) + sizeof(struct acpi_subtable_header) < table_end) { if (entry->type == entry_id - && (!max_entries || count++ < max_entries)) + && (!max_entries || count < max_entries)) { if (handler(entry, table_end)) return -EINVAL; + count++; + } + /* * If entry->length is 0, break from this loop to avoid * infinite loop.