From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752248AbcFFIMM (ORCPT ); Mon, 6 Jun 2016 04:12:12 -0400 Received: from prv-mh.provo.novell.com ([137.65.248.74]:40646 "EHLO prv-mh.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750884AbcFFIMK convert rfc822-to-8bit (ORCPT ); Mon, 6 Jun 2016 04:12:10 -0400 Message-Id: <57554C7502000078000F1DF5@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.0 Date: Mon, 06 Jun 2016 02:12:05 -0600 From: "Jan Beulich" To: "David Vrabel" , "Boris Ostrovsky" , "Konrad Rzeszutek Wilk" , "Jan Beulich" , "Juergen Gross" Cc: "xen-devel" , Subject: [PATCH 2/2] xen-pciback: clean up read_dev_bar() References: <57554B8D02000078000F1DE4@prv-mh.provo.novell.com> In-Reply-To: <57554B8D02000078000F1DE4@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 - drop unused function parameter - simplify determination of 64-bit memory resource - use const and unsigned Signed-off-by: Jan Beulich --- drivers/xen/xen-pciback/conf_space_header.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) --- 4.7-rc2-xen-pciback-BAR.orig/drivers/xen/xen-pciback/conf_space_header.c +++ 4.7-rc2-xen-pciback-BAR/drivers/xen/xen-pciback/conf_space_header.c @@ -209,21 +209,18 @@ static int bar_read(struct pci_dev *dev, return 0; } -static inline void read_dev_bar(struct pci_dev *dev, - struct pci_bar_info *bar_info, int offset, - u32 len_mask) +static inline void read_dev_bar(const struct pci_dev *dev, + struct pci_bar_info *bar_info, + unsigned int offset) { - int pos; - struct resource *res = dev->resource; + unsigned int pos; + const struct resource *res = dev->resource; if (offset == PCI_ROM_ADDRESS || offset == PCI_ROM_ADDRESS1) pos = PCI_ROM_RESOURCE; else { pos = (offset - PCI_BASE_ADDRESS_0) / 4; - if (pos && ((res[pos - 1].flags & (PCI_BASE_ADDRESS_SPACE | - PCI_BASE_ADDRESS_MEM_TYPE_MASK)) == - (PCI_BASE_ADDRESS_SPACE_MEMORY | - PCI_BASE_ADDRESS_MEM_TYPE_64))) { + if (pos && (res[pos - 1].flags & IORESOURCE_MEM_64)) { bar_info->val = res[pos - 1].start >> 32; bar_info->len_val = -resource_size(&res[pos - 1]) >> 32; return; @@ -248,7 +245,7 @@ static void *bar_init(struct pci_dev *de if (!bar) return ERR_PTR(-ENOMEM); - read_dev_bar(dev, bar, offset, ~0); + read_dev_bar(dev, bar, offset); return bar; } @@ -260,7 +257,7 @@ static void *rom_init(struct pci_dev *de if (!bar) return ERR_PTR(-ENOMEM); - read_dev_bar(dev, bar, offset, ~PCI_ROM_ADDRESS_ENABLE); + read_dev_bar(dev, bar, offset); return bar; }