Commit 214b2e04 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents f95f023d cd198909

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

+5 −15
Original line number Diff line number Diff line
@@ -688,23 +688,16 @@ static void init_host_aspm(struct tegra_pcie_dw *pcie) 
	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; }

static inline void disable_aspm_l11(struct tegra_pcie_dw *pcie) { return; }

static inline void init_host_aspm(struct tegra_pcie_dw *pcie) { return; }

static inline int init_debugfs(struct tegra_pcie_dw *pcie) { return 0; }

static inline void init_debugfs(struct tegra_pcie_dw *pcie) { return; }

#endif



static void tegra_pcie_enable_system_interrupts(struct pcie_port *pp)
@@ -1605,9 +1598,6 @@ static int tegra_pcie_config_rp(struct tegra_pcie_dw *pcie) 
	}



	pcie->debugfs = debugfs_create_dir(name, NULL);

	if (!pcie->debugfs)

		dev_err(dev, "Failed to create debugfs\n");

	else

	init_debugfs(pcie);



	return ret;

drivers/pci/controller/pci-tegra.c

+7 −44
Original line number Diff line number Diff line
@@ -2564,36 +2564,14 @@ static int tegra_pcie_ports_seq_show(struct seq_file *s, void *v) 
	return 0;

}



static const struct seq_operations tegra_pcie_ports_seq_ops = {

static const struct seq_operations tegra_pcie_ports_sops = {

	.start = tegra_pcie_ports_seq_start,

	.next = tegra_pcie_ports_seq_next,

	.stop = tegra_pcie_ports_seq_stop,

	.show = tegra_pcie_ports_seq_show,

};



static int tegra_pcie_ports_open(struct inode *inode, struct file *file)

{

	struct tegra_pcie *pcie = inode->i_private;

	struct seq_file *s;

	int err;



	err = seq_open(file, &tegra_pcie_ports_seq_ops);

	if (err)

		return err;



	s = file->private_data;

	s->private = pcie;



	return 0;

}



static const struct file_operations tegra_pcie_ports_ops = {

	.owner = THIS_MODULE,

	.open = tegra_pcie_ports_open,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = seq_release,

};

DEFINE_SEQ_ATTRIBUTE(tegra_pcie_ports);



static void tegra_pcie_debugfs_exit(struct tegra_pcie *pcie)

{
@@ -2601,24 +2579,12 @@ static void tegra_pcie_debugfs_exit(struct tegra_pcie *pcie) 
	pcie->debugfs = NULL;

}



static int tegra_pcie_debugfs_init(struct tegra_pcie *pcie)

static void tegra_pcie_debugfs_init(struct tegra_pcie *pcie)

{

	struct dentry *file;



	pcie->debugfs = debugfs_create_dir("pcie", NULL);

	if (!pcie->debugfs)

		return -ENOMEM;



	file = debugfs_create_file("ports", S_IFREG | S_IRUGO, pcie->debugfs,

				   pcie, &tegra_pcie_ports_ops);

	if (!file)

		goto remove;



	return 0;



remove:

	tegra_pcie_debugfs_exit(pcie);

	return -ENOMEM;

	debugfs_create_file("ports", S_IFREG | S_IRUGO, pcie->debugfs, pcie,

			    &tegra_pcie_ports_fops);

}



static int tegra_pcie_probe(struct platform_device *pdev)
@@ -2672,11 +2638,8 @@ static int tegra_pcie_probe(struct platform_device *pdev) 
		goto pm_runtime_put;

	}



	if (IS_ENABLED(CONFIG_DEBUG_FS)) {

		err = tegra_pcie_debugfs_init(pcie);

		if (err < 0)

			dev_err(dev, "failed to setup debugfs: %d\n", err);

	}

	if (IS_ENABLED(CONFIG_DEBUG_FS))

		tegra_pcie_debugfs_init(pcie);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE