In reference to the PCI spec (Chapter 2), PCIBIOS* is an x86 concept. Their scope should be limited within arch/x86. Change all PCIBIOS_SUCCESSFUL to 0 Signed-off-by: "Saheed O. Bolarinwa" <refactormyself@xxxxxxxxx> --- arch/alpha/kernel/core_apecs.c | 4 ++-- arch/alpha/kernel/core_cia.c | 4 ++-- arch/alpha/kernel/core_irongate.c | 4 ++-- arch/alpha/kernel/core_lca.c | 4 ++-- arch/alpha/kernel/core_marvel.c | 4 ++-- arch/alpha/kernel/core_mcpcia.c | 4 ++-- arch/alpha/kernel/core_polaris.c | 4 ++-- arch/alpha/kernel/core_t2.c | 4 ++-- arch/alpha/kernel/core_titan.c | 4 ++-- arch/alpha/kernel/core_tsunami.c | 4 ++-- arch/alpha/kernel/core_wildfire.c | 4 ++-- arch/alpha/kernel/sys_miata.c | 2 +- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/arch/alpha/kernel/core_apecs.c b/arch/alpha/kernel/core_apecs.c index 6df765ff2b10..d74d78d92434 100644 --- a/arch/alpha/kernel/core_apecs.c +++ b/arch/alpha/kernel/core_apecs.c @@ -287,7 +287,7 @@ apecs_read_config(struct pci_bus *bus, unsigned int devfn, int where, shift = (where & 3) * 8; addr = (pci_addr << 5) + mask + APECS_CONF; *value = conf_read(addr, type1) >> (shift); - return PCIBIOS_SUCCESSFUL; + return 0; } static int @@ -304,7 +304,7 @@ apecs_write_config(struct pci_bus *bus, unsigned int devfn, int where, mask = (size - 1) * 8; addr = (pci_addr << 5) + mask + APECS_CONF; conf_write(addr, value << ((where & 3) * 8), type1); - return PCIBIOS_SUCCESSFUL; + return 0; } struct pci_ops apecs_pci_ops = diff --git a/arch/alpha/kernel/core_cia.c b/arch/alpha/kernel/core_cia.c index f489170201c3..25300bc19c48 100644 --- a/arch/alpha/kernel/core_cia.c +++ b/arch/alpha/kernel/core_cia.c @@ -221,7 +221,7 @@ cia_read_config(struct pci_bus *bus, unsigned int devfn, int where, int size, shift = (where & 3) * 8; addr = (pci_addr << 5) + mask + CIA_CONF; *value = conf_read(addr, type1) >> (shift); - return PCIBIOS_SUCCESSFUL; + return 0; } static int @@ -238,7 +238,7 @@ cia_write_config(struct pci_bus *bus, unsigned int devfn, int where, int size, mask = (size - 1) * 8; addr = (pci_addr << 5) + mask + CIA_CONF; conf_write(addr, value << ((where & 3) * 8), type1); - return PCIBIOS_SUCCESSFUL; + return 0; } struct pci_ops cia_pci_ops = diff --git a/arch/alpha/kernel/core_irongate.c b/arch/alpha/kernel/core_irongate.c index a9fd133a7fb2..858a2293c786 100644 --- a/arch/alpha/kernel/core_irongate.c +++ b/arch/alpha/kernel/core_irongate.c @@ -121,7 +121,7 @@ irongate_read_config(struct pci_bus *bus, unsigned int devfn, int where, break; } - return PCIBIOS_SUCCESSFUL; + return 0; } static int @@ -152,7 +152,7 @@ irongate_write_config(struct pci_bus *bus, unsigned int devfn, int where, break; } - return PCIBIOS_SUCCESSFUL; + return 0; } struct pci_ops irongate_pci_ops = diff --git a/arch/alpha/kernel/core_lca.c b/arch/alpha/kernel/core_lca.c index 57e0750419f2..a7a00d73e2c5 100644 --- a/arch/alpha/kernel/core_lca.c +++ b/arch/alpha/kernel/core_lca.c @@ -213,7 +213,7 @@ lca_read_config(struct pci_bus *bus, unsigned int devfn, int where, mask = (size - 1) * 8; addr = (pci_addr << 5) + mask + LCA_CONF; *value = conf_read(addr) >> (shift); - return PCIBIOS_SUCCESSFUL; + return 0; } static int @@ -229,7 +229,7 @@ lca_write_config(struct pci_bus *bus, unsigned int devfn, int where, int size, mask = (size - 1) * 8; addr = (pci_addr << 5) + mask + LCA_CONF; conf_write(addr, value << ((where & 3) * 8)); - return PCIBIOS_SUCCESSFUL; + return 0; } struct pci_ops lca_pci_ops = diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c index 1db9d0eb2922..c076b97a9961 100644 --- a/arch/alpha/kernel/core_marvel.c +++ b/arch/alpha/kernel/core_marvel.c @@ -561,7 +561,7 @@ marvel_read_config(struct pci_bus *bus, unsigned int devfn, int where, return PCIBIOS_FUNC_NOT_SUPPORTED; } - return PCIBIOS_SUCCESSFUL; + return 0; } static int @@ -593,7 +593,7 @@ marvel_write_config(struct pci_bus *bus, unsigned int devfn, int where, return PCIBIOS_FUNC_NOT_SUPPORTED; } - return PCIBIOS_SUCCESSFUL; + return 0; } struct pci_ops marvel_pci_ops = diff --git a/arch/alpha/kernel/core_mcpcia.c b/arch/alpha/kernel/core_mcpcia.c index 74b1d018124c..fdb6d055bcc0 100644 --- a/arch/alpha/kernel/core_mcpcia.c +++ b/arch/alpha/kernel/core_mcpcia.c @@ -216,7 +216,7 @@ mcpcia_read_config(struct pci_bus *bus, unsigned int devfn, int where, *value = w; break; } - return PCIBIOS_SUCCESSFUL; + return 0; } static int @@ -233,7 +233,7 @@ mcpcia_write_config(struct pci_bus *bus, unsigned int devfn, int where, addr |= (size - 1) * 8; value = __kernel_insql(value, where & 3); conf_write(addr, value, type1, hose); - return PCIBIOS_SUCCESSFUL; + return 0; } struct pci_ops mcpcia_pci_ops = diff --git a/arch/alpha/kernel/core_polaris.c b/arch/alpha/kernel/core_polaris.c index 75d622d96ff2..345b9d5a116f 100644 --- a/arch/alpha/kernel/core_polaris.c +++ b/arch/alpha/kernel/core_polaris.c @@ -102,7 +102,7 @@ polaris_read_config(struct pci_bus *bus, unsigned int devfn, int where, break; } - return PCIBIOS_SUCCESSFUL; + return 0; } @@ -134,7 +134,7 @@ polaris_write_config(struct pci_bus *bus, unsigned int devfn, int where, break; } - return PCIBIOS_SUCCESSFUL; + return 0; } struct pci_ops polaris_pci_ops = diff --git a/arch/alpha/kernel/core_t2.c b/arch/alpha/kernel/core_t2.c index 98d5b6ff8a76..0bbf9b028c11 100644 --- a/arch/alpha/kernel/core_t2.c +++ b/arch/alpha/kernel/core_t2.c @@ -296,7 +296,7 @@ t2_read_config(struct pci_bus *bus, unsigned int devfn, int where, shift = (where & 3) * 8; addr = (pci_addr << 5) + mask + T2_CONF; *value = conf_read(addr, type1) >> (shift); - return PCIBIOS_SUCCESSFUL; + return 0; } static int @@ -313,7 +313,7 @@ t2_write_config(struct pci_bus *bus, unsigned int devfn, int where, int size, mask = (size - 1) * 8; addr = (pci_addr << 5) + mask + T2_CONF; conf_write(addr, value << ((where & 3) * 8), type1); - return PCIBIOS_SUCCESSFUL; + return 0; } struct pci_ops t2_pci_ops = diff --git a/arch/alpha/kernel/core_titan.c b/arch/alpha/kernel/core_titan.c index 2a2820fb1be6..aac94708a226 100644 --- a/arch/alpha/kernel/core_titan.c +++ b/arch/alpha/kernel/core_titan.c @@ -158,7 +158,7 @@ titan_read_config(struct pci_bus *bus, unsigned int devfn, int where, break; } - return PCIBIOS_SUCCESSFUL; + return 0; } static int @@ -189,7 +189,7 @@ titan_write_config(struct pci_bus *bus, unsigned int devfn, int where, break; } - return PCIBIOS_SUCCESSFUL; + return 0; } struct pci_ops titan_pci_ops = diff --git a/arch/alpha/kernel/core_tsunami.c b/arch/alpha/kernel/core_tsunami.c index fc1ab73f23de..88fe80a8b41a 100644 --- a/arch/alpha/kernel/core_tsunami.c +++ b/arch/alpha/kernel/core_tsunami.c @@ -134,7 +134,7 @@ tsunami_read_config(struct pci_bus *bus, unsigned int devfn, int where, break; } - return PCIBIOS_SUCCESSFUL; + return 0; } static int @@ -165,7 +165,7 @@ tsunami_write_config(struct pci_bus *bus, unsigned int devfn, int where, break; } - return PCIBIOS_SUCCESSFUL; + return 0; } struct pci_ops tsunami_pci_ops = diff --git a/arch/alpha/kernel/core_wildfire.c b/arch/alpha/kernel/core_wildfire.c index e8d3b033018d..012ec2f5b675 100644 --- a/arch/alpha/kernel/core_wildfire.c +++ b/arch/alpha/kernel/core_wildfire.c @@ -400,7 +400,7 @@ wildfire_read_config(struct pci_bus *bus, unsigned int devfn, int where, break; } - return PCIBIOS_SUCCESSFUL; + return 0; } static int @@ -431,7 +431,7 @@ wildfire_write_config(struct pci_bus *bus, unsigned int devfn, int where, break; } - return PCIBIOS_SUCCESSFUL; + return 0; } struct pci_ops wildfire_pci_ops = diff --git a/arch/alpha/kernel/sys_miata.c b/arch/alpha/kernel/sys_miata.c index e1bee8f84c58..1b4c03ac34d8 100644 --- a/arch/alpha/kernel/sys_miata.c +++ b/arch/alpha/kernel/sys_miata.c @@ -185,7 +185,7 @@ miata_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) if((slot == 7) && (PCI_FUNC(dev->devfn) == 3)) { u8 irq=0; struct pci_dev *pdev = pci_get_slot(dev->bus, dev->devfn & ~7); - if(pdev == NULL || pci_read_config_byte(pdev, 0x40,&irq) != PCIBIOS_SUCCESSFUL) { + if (pdev == NULL || pci_read_config_byte(pdev, 0x40, &irq) != 0) { pci_dev_put(pdev); return -1; } -- 2.18.2