From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Xu Subject: [PATCH v3 01/25] pci: Fix coding style in generic PCI files Date: Mon, 14 Nov 2016 17:18:57 -0500 Message-ID: <1479161961-20304-2-git-send-email-peterx@redhat.com> References: <1479161961-20304-1-git-send-email-peterx@redhat.com> Cc: drjones@redhat.com, agordeev@redhat.com, jan.kiszka@web.de, rkrcmar@redhat.com, pbonzini@redhat.com, peterx@redhat.com To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:59526 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941027AbcKNWT1 (ORCPT ); Mon, 14 Nov 2016 17:19:27 -0500 In-Reply-To: <1479161961-20304-1-git-send-email-peterx@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: From: Alexander Gordeev Cc: Thomas Huth Cc: Andrew Jones Cc: Peter Xu Reviewed-by: Andrew Jones Reviewed-by: Thomas Huth Signed-off-by: Alexander Gordeev --- lib/pci.c | 38 ++++++++++++++++++++------------------ lib/pci.h | 3 ++- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/lib/pci.c b/lib/pci.c index 0058d70..43cd0ea 100644 --- a/lib/pci.c +++ b/lib/pci.c @@ -10,34 +10,36 @@ /* Scan bus look for a specific device. Only bus 0 scanned for now. */ pcidevaddr_t pci_find_dev(uint16_t vendor_id, uint16_t device_id) { - unsigned dev; - for (dev = 0; dev < 256; ++dev) { - uint32_t id = pci_config_read(dev, 0); - if ((id & 0xFFFF) == vendor_id && (id >> 16) == device_id) { - return dev; - } - } - return PCIDEVADDR_INVALID; + pcidevaddr_t dev; + + for (dev = 0; dev < 256; ++dev) { + uint32_t id = pci_config_read(dev, 0); + + if ((id & 0xFFFF) == vendor_id && (id >> 16) == device_id) + return dev; + } + + return PCIDEVADDR_INVALID; } unsigned long pci_bar_addr(pcidevaddr_t dev, int bar_num) { - uint32_t bar = pci_config_read(dev, PCI_BASE_ADDRESS_0 + bar_num * 4); - if (bar & PCI_BASE_ADDRESS_SPACE_IO) { - return bar & PCI_BASE_ADDRESS_IO_MASK; - } else { - return bar & PCI_BASE_ADDRESS_MEM_MASK; - } + uint32_t bar = pci_config_read(dev, PCI_BASE_ADDRESS_0 + bar_num * 4); + + if (bar & PCI_BASE_ADDRESS_SPACE_IO) + return bar & PCI_BASE_ADDRESS_IO_MASK; + else + return bar & PCI_BASE_ADDRESS_MEM_MASK; } bool pci_bar_is_memory(pcidevaddr_t dev, int bar_num) { - uint32_t bar = pci_config_read(dev, PCI_BASE_ADDRESS_0 + bar_num * 4); - return !(bar & PCI_BASE_ADDRESS_SPACE_IO); + uint32_t bar = pci_config_read(dev, PCI_BASE_ADDRESS_0 + bar_num * 4); + + return !(bar & PCI_BASE_ADDRESS_SPACE_IO); } bool pci_bar_is_valid(pcidevaddr_t dev, int bar_num) { - uint32_t bar = pci_config_read(dev, PCI_BASE_ADDRESS_0 + bar_num * 4); - return bar; + return pci_config_read(dev, PCI_BASE_ADDRESS_0 + bar_num * 4); } diff --git a/lib/pci.h b/lib/pci.h index 9160cfb..54fbf22 100644 --- a/lib/pci.h +++ b/lib/pci.h @@ -12,8 +12,9 @@ typedef uint16_t pcidevaddr_t; enum { - PCIDEVADDR_INVALID = 0xffff, + PCIDEVADDR_INVALID = 0xffff, }; + pcidevaddr_t pci_find_dev(uint16_t vendor_id, uint16_t device_id); unsigned long pci_bar_addr(pcidevaddr_t dev, int bar_num); bool pci_bar_is_memory(pcidevaddr_t dev, int bar_num); -- 2.7.4