]> git.itanic.dy.fi Git - linux-stable/commitdiff
xtensa: Use PCI_HEADER_TYPE_MFD instead of literal
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Fri, 24 Nov 2023 09:09:15 +0000 (11:09 +0200)
committerMax Filippov <jcmvbkbc@gmail.com>
Wed, 29 Nov 2023 10:07:52 +0000 (02:07 -0800)
Replace literal 0x80 with PCI_HEADER_TYPE_MFD. While at it, convert
found_multi into boolean.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Message-Id: <20231124090919.23687-3-ilpo.jarvinen@linux.intel.com>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
arch/xtensa/lib/pci-auto.c

index aa6752237985afb13a6ee15ccac5f4b32ef3eda1..05fc02f9e1c78b553ae7fab2cf2164ea60f9ef41 100644 (file)
@@ -11,6 +11,7 @@
  * Based on work from Matt Porter <mporter@mvista.com>
  */
 
+#include <linux/bitfield.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/pci.h>
@@ -222,10 +223,11 @@ pciauto_postscan_setup_bridge(struct pci_dev *dev, int current_bus, int sub_bus,
 
 int __init pciauto_bus_scan(struct pci_controller *pci_ctrl, int current_bus)
 {
-       int sub_bus, pci_devfn, pci_class, cmdstat, found_multi=0;
+       int sub_bus, pci_devfn, pci_class, cmdstat;
        unsigned short vid;
        unsigned char header_type;
        struct pci_dev *dev = &pciauto_dev;
+       bool found_multi = false;
 
        pciauto_dev.bus = &pciauto_bus;
        pciauto_dev.sysdata = pci_ctrl;
@@ -261,11 +263,11 @@ int __init pciauto_bus_scan(struct pci_controller *pci_ctrl, int current_bus)
                        continue;
 
                if (!PCI_FUNC(pci_devfn))
-                       found_multi = header_type & 0x80;
+                       found_multi = FIELD_GET(PCI_HEADER_TYPE_MFD, header_type);
                pci_read_config_word(dev, PCI_VENDOR_ID, &vid);
 
                if (vid == 0xffff || vid == 0x0000) {
-                       found_multi = 0;
+                       found_multi = false;
                        continue;
                }