diff options
| author | Bjorn Helgaas | 2016-01-20 18:48:25 +0100 |
|---|---|---|
| committer | Bjorn Helgaas | 2016-01-20 18:48:25 +0100 |
| commit | 9662e32c810ad3e6ce49832d5f585a54f8fbdbdb (patch) | |
| tree | fd9fd3f8cd44e231b8dc71c2e360eb19963972d5 /drivers/pci/host | |
| parent | Merge branches 'pci/iommu' and 'pci/misc' into next (diff) | |
| parent | PCI: shpchp: Constify hpc_ops structure (diff) | |
| download | kernel-qcow2-linux-9662e32c810ad3e6ce49832d5f585a54f8fbdbdb.tar.gz kernel-qcow2-linux-9662e32c810ad3e6ce49832d5f585a54f8fbdbdb.tar.xz kernel-qcow2-linux-9662e32c810ad3e6ce49832d5f585a54f8fbdbdb.zip | |
Merge branch 'pci/trivial' into next
* pci/trivial:
PCI: shpchp: Constify hpc_ops structure
PCI: Use kobj_to_dev() instead of open-coding it
PCI: Use to_pci_dev() instead of open-coding it
PCI: Fix all whitespace issues
PCI/MSI: Fix typos in <linux/msi.h>
Diffstat (limited to 'drivers/pci/host')
| -rw-r--r-- | drivers/pci/host/pci-imx6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c index b039f0c6c8ff..fe600964fa50 100644 --- a/drivers/pci/host/pci-imx6.c +++ b/drivers/pci/host/pci-imx6.c @@ -122,7 +122,7 @@ static int pcie_phy_wait_ack(void __iomem *dbi_base, int addr) } /* Read from the 16-bit PCIe PHY control registers (not memory-mapped) */ -static int pcie_phy_read(void __iomem *dbi_base, int addr , int *data) +static int pcie_phy_read(void __iomem *dbi_base, int addr, int *data) { u32 val, phy_ctl; int ret; |