Skip to content

Commit 5b8dafa

Browse files
committed
Merge branch 'remotes/lorenzo/pci/tegra'
- Make several tegra symbols const (Rikard Falkeborn) - Fix tegra Kconfig host/endpoint typo (Wesley Sheng) - Fix runtime PM imbalance (Dinghao Liu) * remotes/lorenzo/pci/tegra: PCI: tegra: Fix runtime PM imbalance in pex_ep_event_pex_rst_deassert() PCI: tegra: Fix typo for PCIe endpoint mode in Tegra194 PCI: tegra: Constify static structs
2 parents 98d771e + 5859c92 commit 5b8dafa

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/pci/controller/dwc/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ config PCIE_TEGRA194_EP
280280
select PCIE_TEGRA194
281281
help
282282
Enables support for the PCIe controller in the NVIDIA Tegra194 SoC to
283-
work in host mode. There are two instances of PCIe controllers in
283+
work in endpoint mode. There are two instances of PCIe controllers in
284284
Tegra194. This controller can work either as EP or RC. In order to
285285
enable host-specific features PCIE_TEGRA194_HOST must be selected and
286286
in order to enable device-specific features PCIE_TEGRA194_EP must be

drivers/pci/controller/dwc/pcie-tegra194.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ static const struct dw_pcie_ops tegra_dw_pcie_ops = {
10191019
.stop_link = tegra_pcie_dw_stop_link,
10201020
};
10211021

1022-
static struct dw_pcie_host_ops tegra_pcie_dw_host_ops = {
1022+
static const struct dw_pcie_host_ops tegra_pcie_dw_host_ops = {
10231023
.host_init = tegra_pcie_dw_host_init,
10241024
};
10251025

@@ -1645,7 +1645,7 @@ static void pex_ep_event_pex_rst_deassert(struct tegra_pcie_dw *pcie)
16451645
if (pcie->ep_state == EP_STATE_ENABLED)
16461646
return;
16471647

1648-
ret = pm_runtime_get_sync(dev);
1648+
ret = pm_runtime_resume_and_get(dev);
16491649
if (ret < 0) {
16501650
dev_err(dev, "Failed to get runtime sync for PCIe dev: %d\n",
16511651
ret);
@@ -1881,7 +1881,7 @@ tegra_pcie_ep_get_features(struct dw_pcie_ep *ep)
18811881
return &tegra_pcie_epc_features;
18821882
}
18831883

1884-
static struct dw_pcie_ep_ops pcie_ep_ops = {
1884+
static const struct dw_pcie_ep_ops pcie_ep_ops = {
18851885
.raise_irq = tegra_pcie_ep_raise_irq,
18861886
.get_features = tegra_pcie_ep_get_features,
18871887
};

0 commit comments

Comments
 (0)