Commit 88303fb6 authored by Niklas Schnelle's avatar Niklas Schnelle Committed by Heiko Carstens
Browse files

s390/pci: Use PCIBIOS return values in pci_read()/pci_write() 



While pci_read() and pci_write() have returned errno values since their
inception with commit cd248341 ("s390/pci: base support") other
config accessors in particular pci_generic_config_read() as well as
pci_generic_config_write() return specific error values which are then
converted to errno by pcibios_err_to_errno(). Since latter does handle
the case where the error value already looks like an errno the previous
behavior is unlikely to cause actual issues.

Still, for consistency and in case any caller explicitly checks error
values align pci_read() and pci_write() with the generic accessors.

Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
Signed-off-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Reviewed-by: default avatarFarhan Ali <alifm@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 84d875e6

arch/s390/pci/pci.c

+6 −2
Original line number Diff line number Diff line
@@ -406,7 +406,9 @@ static int pci_read(struct pci_bus *bus, unsigned int devfn, int where, 
{

	struct zpci_dev *zdev = zdev_from_bus(bus, devfn);



	return (zdev) ? zpci_cfg_load(zdev, where, val, size) : -ENODEV;

	if (!zdev || zpci_cfg_load(zdev, where, val, size))

		return PCIBIOS_DEVICE_NOT_FOUND;

	return PCIBIOS_SUCCESSFUL;

}



static int pci_write(struct pci_bus *bus, unsigned int devfn, int where,
@@ -414,7 +416,9 @@ static int pci_write(struct pci_bus *bus, unsigned int devfn, int where, 
{

	struct zpci_dev *zdev = zdev_from_bus(bus, devfn);



	return (zdev) ? zpci_cfg_store(zdev, where, val, size) : -ENODEV;

	if (!zdev || zpci_cfg_store(zdev, where, val, size))

		return PCIBIOS_DEVICE_NOT_FOUND;

	return PCIBIOS_SUCCESSFUL;

}



static struct pci_ops pci_root_ops = {