diff options
| author |   Tony Lindgren <tony@atomide.com> | 2021-05-07 14:24:29 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2021-05-07 14:24:29 +0300 |
| commit | e9aa9c75c58e2e16be16ec2b5db5e14804d07213 (patch) | |
| tree | c7fbd0d4c2a98f2aec6a5f3dcef3fade7fcb8f92 /drivers/pci/controller | |
| parent | ARM: OMAP2+: Fix uninitialized sr_inst (diff) | |
| parent | bus: ti-sysc: Fix missing quirk flags for sata (diff) | |
| download | wireguard-linux-e9aa9c75c58e2e16be16ec2b5db5e14804d07213.tar.xz wireguard-linux-e9aa9c75c58e2e16be16ec2b5db5e14804d07213.zip | |
Merge branch 'omap-for-v5.13/ti-sysc' into fixes
Diffstat (limited to 'drivers/pci/controller')
| -rw-r--r-- | drivers/pci/controller/dwc/pci-dra7xx.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c index b105af63854a..047cfbdc1330 100644 --- a/drivers/pci/controller/dwc/pci-dra7xx.c +++ b/drivers/pci/controller/dwc/pci-dra7xx.c @@ -443,8 +443,8 @@ static const struct dw_pcie_ep_ops pcie_ep_ops = { .get_features = dra7xx_pcie_get_features, }; -static int __init dra7xx_add_pcie_ep(struct dra7xx_pcie *dra7xx, - struct platform_device *pdev) +static int dra7xx_add_pcie_ep(struct dra7xx_pcie *dra7xx, + struct platform_device *pdev) { int ret; struct dw_pcie_ep *ep; @@ -472,8 +472,8 @@ static int __init dra7xx_add_pcie_ep(struct dra7xx_pcie *dra7xx, return 0; } -static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, - struct platform_device *pdev) +static int dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, + struct platform_device *pdev) { int ret; struct dw_pcie *pci = dra7xx->pci; @@ -682,7 +682,7 @@ static int dra7xx_pcie_configure_two_lane(struct device *dev, return 0; } -static int __init dra7xx_pcie_probe(struct platform_device *pdev) +static int dra7xx_pcie_probe(struct platform_device *pdev) { u32 reg; int ret; @@ -938,6 +938,7 @@ static const struct dev_pm_ops dra7xx_pcie_pm_ops = { }; static struct platform_driver dra7xx_pcie_driver = { + .probe = dra7xx_pcie_probe, .driver = { .name = "dra7-pcie", .of_match_table = of_dra7xx_pcie_match, @@ -946,4 +947,4 @@ static struct platform_driver dra7xx_pcie_driver = { }, .shutdown = dra7xx_pcie_shutdown, }; -builtin_platform_driver_probe(dra7xx_pcie_driver, dra7xx_pcie_probe); +builtin_platform_driver(dra7xx_pcie_driver); |