From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 21 Oct 2020 14:58:43 +0000 (-0500)
Subject: Merge branch 'remotes/lorenzo/pci/tegra'
X-Git-Tag: microblaze-v5.11~61^2~3
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=214b2e042fbae7945cea46d8daaa54eac7b1a055;p=linux-2.6-microblaze.git

Merge branch 'remotes/lorenzo/pci/tegra'

- Drop return value checking for debugfs_create() calls (Greg
  Kroah-Hartman)

- Convert debugfs "ports" file to use DEFINE_SEQ_ATTRIBUTE() (Liu Shixin)

* remotes/lorenzo/pci/tegra:
  PCI: tegra: Convert to use DEFINE_SEQ_ATTRIBUTE macro
  PCI: tegra: No need to check return value of debugfs_create() functions
---

214b2e042fbae7945cea46d8daaa54eac7b1a055
diff --cc drivers/pci/controller/dwc/pcie-tegra194.c
index aa511ec0d800,87f8dd63df0a..f920e7efe118
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@@ -681,24 -692,17 +681,17 @@@ static void init_host_aspm(struct tegra
  	dw_pcie_writel_dbi(pci, pcie->cfg_link_cap_l1sub, val);
  
  	/* Program L0s and L1 entrance latencies */
 -	val = dw_pcie_readl_dbi(pci, PORT_LOGIC_ACK_F_ASPM_CTRL);
 -	val &= ~L0S_ENTRANCE_LAT_MASK;
 -	val |= (pcie->aspm_l0s_enter_lat << L0S_ENTRANCE_LAT_SHIFT);
 -	val |= ENTER_ASPM;
 -	dw_pcie_writel_dbi(pci, PORT_LOGIC_ACK_F_ASPM_CTRL, val);
 +	val = dw_pcie_readl_dbi(pci, PCIE_PORT_AFR);
 +	val &= ~PORT_AFR_L0S_ENTRANCE_LAT_MASK;
 +	val |= (pcie->aspm_l0s_enter_lat << PORT_AFR_L0S_ENTRANCE_LAT_SHIFT);
 +	val |= PORT_AFR_ENTER_ASPM;
 +	dw_pcie_writel_dbi(pci, PCIE_PORT_AFR, val);
  }
  
- static int init_debugfs(struct tegra_pcie_dw *pcie)
+ static void init_debugfs(struct tegra_pcie_dw *pcie)
  {
- 	struct dentry *d;
- 
- 	d = debugfs_create_devm_seqfile(pcie->dev, "aspm_state_cnt",
- 					pcie->debugfs, aspm_state_cnt);
- 	if (IS_ERR_OR_NULL(d))
- 		dev_err(pcie->dev,
- 			"Failed to create debugfs file \"aspm_state_cnt\"\n");
- 
- 	return 0;
+ 	debugfs_create_devm_seqfile(pcie->dev, "aspm_state_cnt", pcie->debugfs,
+ 				    aspm_state_cnt);
  }
  #else
  static inline void disable_aspm_l12(struct tegra_pcie_dw *pcie) { return; }