From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753325AbcGFG7h (ORCPT ); Wed, 6 Jul 2016 02:59:37 -0400 Received: from prv-mh.provo.novell.com ([137.65.248.74]:59782 "EHLO prv-mh.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750864AbcGFG7g convert rfc822-to-8bit (ORCPT ); Wed, 6 Jul 2016 02:59:36 -0400 Message-Id: <577CC87702000078000FB800@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.0 Date: Wed, 06 Jul 2016 00:59:35 -0600 From: "Jan Beulich" To: "David Vrabel" , "Boris Ostrovsky" , "Juergen Gross" Cc: "xen-devel" , Subject: [PATCH v4 6/7] xen-pciback: short-circuit read path used for merging write values References: <577CC59602000078000FB7A0@prv-mh.provo.novell.com> In-Reply-To: <577CC59602000078000FB7A0@prv-mh.provo.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8BIT Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There's no point calling xen_pcibk_config_read() here - all it'll do is return whatever conf_space_read() returns for the field which was found here (and which would be found there again). Also there's no point clearing tmp_val before the call. Signed-off-by: Jan Beulich --- drivers/xen/xen-pciback/conf_space.c | 6 ++---- 1 file changed, 2 insertions(+), 4 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 @@ -230,10 +230,8 @@ int xen_pcibk_config_write(struct pci_de field_end = OFFSET(cfg_entry) + field->size; if (req_end > field_start && field_end > req_start) { - tmp_val = 0; - - err = xen_pcibk_config_read(dev, field_start, - field->size, &tmp_val); + err = conf_space_read(dev, cfg_entry, field_start, + &tmp_val); if (err) break;