From patchwork Wed Feb 11 09:46:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 44570 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 06F8D2151F for ; Wed, 11 Feb 2015 09:47:09 +0000 (UTC) Received: by lamq1 with SMTP id q1sf1458572lam.0 for ; Wed, 11 Feb 2015 01:47:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=ajasKpehS1YQgXRvHxy1EQHa/hD/XZIjdMwPkuQq2KI=; b=i+yuXe+WdRd9CFhDZl2Emai17OLg1N9UyD7a61YgQxGZCY5hZ1HgAOfZRaOQS0YaS3 P+u6fvVF+0B4s+02n7cbHspsQ1lojvurRuqyOzn4q8hgiZhDxE9G7BR4FHfzMi/w27Xi IAI/U8X0aQ2ZLZ5KEETweiBhot5Fc9zoQcJh+O6pgxV9Kg6JDbABNzUbPrwbaDJhd+j8 S79Gx+6Co8oVJE2mSywXoZllQrbzX//yYb9I3c1LWebuHuzcrH+xYhTHlM4sNWt3UgJG 0hZNzQml2V8uLKd21ldUIglct8gYJmsDk31lCAjlia6p3+ysO+SBS2Yh9Yf2mmab1+8l HI4Q== X-Gm-Message-State: ALoCoQk9rMvmRWajHmdjhLw43Moj6IeHlVj0GuNZiL0Nh7SptqCrjjValBO6HxjKyZDJ9Wavkw3K X-Received: by 10.152.10.65 with SMTP id g1mr3347882lab.5.1423648027624; Wed, 11 Feb 2015 01:47:07 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.97 with SMTP id p1ls40415laj.4.gmail; Wed, 11 Feb 2015 01:47:07 -0800 (PST) X-Received: by 10.152.161.204 with SMTP id xu12mr27522074lab.12.1423648027390; Wed, 11 Feb 2015 01:47:07 -0800 (PST) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id dw2si199600lbc.62.2015.02.11.01.47.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Feb 2015 01:47:07 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by lamq1 with SMTP id q1so2190381lam.5 for ; Wed, 11 Feb 2015 01:47:07 -0800 (PST) X-Received: by 10.112.181.41 with SMTP id dt9mr27699304lbc.56.1423648027269; Wed, 11 Feb 2015 01:47:07 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp1141304lbj; Wed, 11 Feb 2015 01:47:06 -0800 (PST) X-Received: by 10.70.52.161 with SMTP id u1mr45409976pdo.44.1423648025294; Wed, 11 Feb 2015 01:47:05 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bn9si266687pdb.117.2015.02.11.01.47.04; Wed, 11 Feb 2015 01:47:05 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752692AbbBKJqu (ORCPT + 28 others); Wed, 11 Feb 2015 04:46:50 -0500 Received: from mail-pa0-f53.google.com ([209.85.220.53]:55495 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751475AbbBKJqr (ORCPT ); Wed, 11 Feb 2015 04:46:47 -0500 Received: by mail-pa0-f53.google.com with SMTP id lf10so2869652pab.12 for ; Wed, 11 Feb 2015 01:46:47 -0800 (PST) X-Received: by 10.68.87.196 with SMTP id ba4mr44481264pbb.15.1423648007228; Wed, 11 Feb 2015 01:46:47 -0800 (PST) Received: from khorivan.itg.ti.com ([210.177.145.249]) by mx.google.com with ESMTPSA id c9sm360560pdm.51.2015.02.11.01.46.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Feb 2015 01:46:46 -0800 (PST) From: Ivan Khoronzhuk To: matt.fleming@intel.com, ard.biesheuvel@linaro.org Cc: leif.lindholm@linaro.org, linux-kernel@vger.kernel.org, Ivan Khoronzhuk Subject: [Patch 1/3] firmware: dmi_scan: use direct access to static vars Date: Wed, 11 Feb 2015 11:46:30 +0200 Message-Id: <1423647992-3787-2-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1423647992-3787-1-git-send-email-ivan.khoronzhuk@linaro.org> References: <1423647992-3787-1-git-send-email-ivan.khoronzhuk@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ivan.khoronzhuk@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , There is no reason to pass static vars to function that can use only them. The dmi_table() can use only dmi_len and dmi_num static vars, so use them directly. In this case we can freely change their type in one place and slightly decrease redundancy. Signed-off-by: Ivan Khoronzhuk --- drivers/firmware/dmi_scan.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index d55c712..fb16203 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -18,6 +18,8 @@ static const char dmi_empty_string[] = " "; static u16 __initdata dmi_ver; +static u16 dmi_len; +static u16 dmi_num; /* * Catch too early calls to dmi_check_system(): */ @@ -78,7 +80,7 @@ static const char * __init dmi_string(const struct dmi_header *dm, u8 s) * We have to be cautious here. We have seen BIOSes with DMI pointers * pointing to completely the wrong place for example */ -static void dmi_table(u8 *buf, int len, int num, +static void dmi_table(u8 *buf, void (*decode)(const struct dmi_header *, void *), void *private_data) { @@ -89,7 +91,8 @@ static void dmi_table(u8 *buf, int len, int num, * Stop when we see all the items the table claimed to have * OR we run off the end of the table (also happens) */ - while ((i < num) && (data - buf + sizeof(struct dmi_header)) <= len) { + while ((i < dmi_num) && (data - buf + sizeof(struct dmi_header)) + <= dmi_len) { const struct dmi_header *dm = (const struct dmi_header *)data; /* @@ -104,9 +107,9 @@ static void dmi_table(u8 *buf, int len, int num, * table in dmi_decode or dmi_string */ data += dm->length; - while ((data - buf < len - 1) && (data[0] || data[1])) + while ((data - buf < dmi_len - 1) && (data[0] || data[1])) data++; - if (data - buf < len - 1) + if (data - buf < dmi_len - 1) decode(dm, private_data); data += 2; i++; @@ -116,8 +119,6 @@ static void dmi_table(u8 *buf, int len, int num, static u8 smbios_header[32]; static int smbios_header_size; static phys_addr_t dmi_base; -static u16 dmi_len; -static u16 dmi_num; static int __init dmi_walk_early(void (*decode)(const struct dmi_header *, void *)) @@ -128,7 +129,7 @@ static int __init dmi_walk_early(void (*decode)(const struct dmi_header *, if (buf == NULL) return -1; - dmi_table(buf, dmi_len, dmi_num, decode, NULL); + dmi_table(buf, decode, NULL); add_device_randomness(buf, dmi_len); @@ -908,7 +909,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *), if (buf == NULL) return -1; - dmi_table(buf, dmi_len, dmi_num, decode, private_data); + dmi_table(buf, decode, private_data); dmi_unmap(buf); return 0;