From patchwork Wed Jul 6 07:00:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9215601 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 05CE560752 for ; Wed, 6 Jul 2016 07:02:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9DEB28722 for ; Wed, 6 Jul 2016 07:02:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC04628724; Wed, 6 Jul 2016 07:02:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7BA2928722 for ; Wed, 6 Jul 2016 07:02:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bKgol-00063s-V9; Wed, 06 Jul 2016 07:00:19 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bKgok-00063g-GO for xen-devel@lists.xenproject.org; Wed, 06 Jul 2016 07:00:18 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id 1C/0A-22092-18CAC775; Wed, 06 Jul 2016 07:00:17 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrEIsWRWlGSWpSXmKPExsXS6fjDS7dxTU2 4wd5DrBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa0b3lg7WgsWiFWfOnGdvYFwr2MXIwSEkkCcx /6ZAFyMnB6+AncSRhR3sILaEgKHEvvmr2EBsFgFViU3XjzGB2GwC6hJtz7azgtgiAo2MEi034 kBsZoFAibmzd7KA2MIC9hLXZmxnhxhvJ/HlcAFImBMoPPPCJhaQMK+AoMTfHcIQnVoSD3/dYo GwtSWWLXzNDFLCLCAtsfwfxwRGvlkIDbOQNMxC0jALoWEBI8sqRvXi1KKy1CJdI72kosz0jJL cxMwcXUMDM73c1OLixPTUnMSkYr3k/NxNjMCwYwCCHYzL/jodYpTkYFIS5WX5Vh0uxJeUn1KZ kVicEV9UmpNafIhRhoNDSYL32aqacCHBotT01Iq0zBxgBMCkJTh4lER43VYDpXmLCxJzizPTI VKnGBWlxHlXgvQJgCQySvPg2mBRd4lRVkqYlxHoECGegtSi3MwSVPlXjOIcjErCvEog43ky80 rgpr8CWswEtPinSzXI4pJEhJRUA6NnpHJCy4vWbalTv1Sc55lrntXOcWtR7N8Nkebq8cf+2O9 viCjaNeuGD5OM1ck6TdXV/b/uBSis/3Cwbmnc/aQLNy+znnTW4Fx88+fc0nW7epP4/bVuO/cz uzrVzFER6Puq2hzK/YBT/dqHd+ZfbTKEMh+xv1ujrC4etkbhU4ifi2HWWcM38UosxRmJhlrMR cWJABE8R1a1AgAA X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1467788415!18073183!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 59319 invoked from network); 6 Jul 2016 07:00:16 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-16.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 6 Jul 2016 07:00:16 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Wed, 06 Jul 2016 01:00:14 -0600 Message-Id: <577CC89E02000078000FB803@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.0 Date: Wed, 06 Jul 2016 01:00:14 -0600 From: "Jan Beulich" To: "David Vrabel" , "Boris Ostrovsky" , "Juergen Gross" References: <577CC59602000078000FB7A0@prv-mh.provo.novell.com> In-Reply-To: <577CC59602000078000FB7A0@prv-mh.provo.novell.com> Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel , linux-kernel@vger.kernel.org Subject: [Xen-devel] [PATCH v4 7/7] xen-pciback: drop superfluous variables X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP req_start is simply an alias of the "offset" function parameter, and req_end is being used just once in each function. (And both variables were loop invariant anyway, so should at least have got initialized outside the loop.) Signed-off-by: Jan Beulich --- drivers/xen/xen-pciback/conf_space.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) --- 4.7-rc6-xen-pciback.orig/drivers/xen/xen-pciback/conf_space.c +++ 4.7-rc6-xen-pciback/drivers/xen/xen-pciback/conf_space.c @@ -148,7 +148,7 @@ int xen_pcibk_config_read(struct pci_dev struct xen_pcibk_dev_data *dev_data = pci_get_drvdata(dev); const struct config_field_entry *cfg_entry; const struct config_field *field; - int req_start, req_end, field_start, field_end; + int field_start, field_end; /* if read fails for any reason, return 0 * (as if device didn't respond) */ u32 value = 0, tmp_val; @@ -178,12 +178,10 @@ int xen_pcibk_config_read(struct pci_dev list_for_each_entry(cfg_entry, &dev_data->config_fields, list) { field = cfg_entry->field; - req_start = offset; - req_end = offset + size; field_start = OFFSET(cfg_entry); field_end = OFFSET(cfg_entry) + field->size; - if (req_end > field_start && field_end > req_start) { + if (offset + size > field_start && field_end > offset) { err = conf_space_read(dev, cfg_entry, field_start, &tmp_val); if (err) @@ -191,7 +189,7 @@ int xen_pcibk_config_read(struct pci_dev value = merge_value(value, tmp_val, get_mask(field->size), - field_start - req_start); + field_start - offset); } } @@ -211,7 +209,7 @@ int xen_pcibk_config_write(struct pci_de const struct config_field_entry *cfg_entry; const struct config_field *field; u32 tmp_val; - int req_start, req_end, field_start, field_end; + int field_start, field_end; if (unlikely(verbose_request)) printk(KERN_DEBUG @@ -224,19 +222,17 @@ int xen_pcibk_config_write(struct pci_de list_for_each_entry(cfg_entry, &dev_data->config_fields, list) { field = cfg_entry->field; - req_start = offset; - req_end = offset + size; field_start = OFFSET(cfg_entry); field_end = OFFSET(cfg_entry) + field->size; - if (req_end > field_start && field_end > req_start) { + if (offset + size > field_start && field_end > offset) { err = conf_space_read(dev, cfg_entry, field_start, &tmp_val); if (err) break; tmp_val = merge_value(tmp_val, value, get_mask(size), - req_start - field_start); + offset - field_start); err = conf_space_write(dev, cfg_entry, field_start, tmp_val);