diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2023-11-15 10:15:40 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2023-11-15 10:15:40 +0100 |
| commit | 5d2d4a9f603a47403395408f64b1261ca61f6d50 (patch) | |
| tree | 52d145a53bfe4f32a20bb621ac848623ae459510 /drivers/pci/controller/dwc/pci-keystone.c | |
| parent | perf/x86/intel: Support branch counters logging (diff) | |
| parent | perf/core: Fix cpuctx refcounting (diff) | |
| download | wireguard-linux-5d2d4a9f603a47403395408f64b1261ca61f6d50.tar.xz wireguard-linux-5d2d4a9f603a47403395408f64b1261ca61f6d50.zip | |
Merge branch 'tip/perf/urgent'
Avoid conflicts, base on fixes.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'drivers/pci/controller/dwc/pci-keystone.c')
| -rw-r--r-- | drivers/pci/controller/dwc/pci-keystone.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c index 49aea6ce3e87..0def919f89fa 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -1100,7 +1100,7 @@ static const struct of_device_id ks_pcie_of_match[] = { { }, }; -static int __init ks_pcie_probe(struct platform_device *pdev) +static int ks_pcie_probe(struct platform_device *pdev) { const struct dw_pcie_host_ops *host_ops; const struct dw_pcie_ep_ops *ep_ops; @@ -1302,7 +1302,7 @@ err_link: return ret; } -static int __exit ks_pcie_remove(struct platform_device *pdev) +static int ks_pcie_remove(struct platform_device *pdev) { struct keystone_pcie *ks_pcie = platform_get_drvdata(pdev); struct device_link **link = ks_pcie->link; @@ -1318,9 +1318,9 @@ static int __exit ks_pcie_remove(struct platform_device *pdev) return 0; } -static struct platform_driver ks_pcie_driver __refdata = { +static struct platform_driver ks_pcie_driver = { .probe = ks_pcie_probe, - .remove = __exit_p(ks_pcie_remove), + .remove = ks_pcie_remove, .driver = { .name = "keystone-pcie", .of_match_table = ks_pcie_of_match, |