summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/pci.h
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2019-08-31 21:23:18 -0600
committerBin Meng <bmeng.cn@gmail.com>2019-10-08 13:57:46 +0800
commita827ba910cdbcae6d0a1c2ce7b91b41d00218a4c (patch)
treeb7ea60e85d7e17596c0b5a4b4f23111a72f38066 /arch/x86/include/asm/pci.h
parent49a0f8cc964c612164ef101267f90266279409a7 (diff)
x86: pci: Drop the first parameter in pci_x86_r/w_config()
This parameter is needed by the PCI driver-mode interface but is always NULL on x86. There are a number of calls to this function so it makes sense to minimise the parameters. Adjust the x86 function to omit the first parameter, and introduce stub functions to handle the conversion. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> [bmeng: rebase the patch against u-boot-x86/next to get it applied cleanly] Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'arch/x86/include/asm/pci.h')
-rw-r--r--arch/x86/include/asm/pci.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index fb1edf3df7..2a72073572 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -22,30 +22,28 @@
*
* This function can be called before PCI is set up in driver model.
*
- * @bus: Bus to read from (ignored, can be NULL)
* @bdf: PCI device address: bus, device and function -see PCI_BDF()
* @offset: Register offset to read
* @valuep: Place to put the returned value
* @size: Access size
* @return 0 if OK, -ve on error
*/
-int pci_x86_read_config(struct udevice *bus, pci_dev_t bdf, uint offset,
- ulong *valuep, enum pci_size_t size);
+int pci_x86_read_config(pci_dev_t bdf, uint offset, ulong *valuep,
+ enum pci_size_t size);
/**
* pci_bus_write_config() - Write a configuration value to a device
*
* This function can be called before PCI is set up in driver model.
*
- * @bus: Bus to read from (ignored, can be NULL)
* @bdf: PCI device address: bus, device and function -see PCI_BDF()
* @offset: Register offset to write
* @value: Value to write
* @size: Access size
* @return 0 if OK, -ve on error
*/
-int pci_x86_write_config(struct udevice *bus, pci_dev_t bdf, uint offset,
- ulong value, enum pci_size_t size);
+int pci_x86_write_config(pci_dev_t bdf, uint offset, ulong value,
+ enum pci_size_t size);
/**
* pci_bus_clrset_config32() - Update a configuration value for a device
@@ -53,15 +51,14 @@ int pci_x86_write_config(struct udevice *bus, pci_dev_t bdf, uint offset,
* The register at @offset is updated to (oldvalue & ~clr) | set. This function
* can be called before PCI is set up in driver model.
*
- * @bus: Bus to read from (ignored, can be NULL)
* @bdf: PCI device address: bus, device and function -see PCI_BDF()
* @offset: Register offset to update
* @clr: Bits to clear
* @set: Bits to set
* @return 0 if OK, -ve on error
*/
-int pci_x86_clrset_config(struct udevice *bus, pci_dev_t bdf, uint offset,
- ulong clr, ulong set, enum pci_size_t size);
+int pci_x86_clrset_config(pci_dev_t bdf, uint offset, ulong clr, ulong set,
+ enum pci_size_t size);
/**
* Assign IRQ number to a PCI device