Commit f623d50c authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/dwc' 

- Simplify debugfs 'return' statements (Hans Zhang)

- Make dw_pcie_ptm_ops static (Manivannan Sadhasivam)

* pci/controller/dwc:
  PCI: dwc: Make dw_pcie_ptm_ops static
  PCI: dwc: Simplify the return value of PTM debugfs functions returning bool
parents 4441df6a c1dc61ae

drivers/pci/controller/dwc/pcie-designware-debugfs.c

+8 −8
Original line number Diff line number Diff line
@@ -814,14 +814,14 @@ static bool dw_pcie_ptm_context_update_visible(void *drvdata) 
{

	struct dw_pcie *pci = drvdata;



	return (pci->mode == DW_PCIE_EP_TYPE) ? true : false;

	return pci->mode == DW_PCIE_EP_TYPE;

}



static bool dw_pcie_ptm_context_valid_visible(void *drvdata)

{

	struct dw_pcie *pci = drvdata;



	return (pci->mode == DW_PCIE_RC_TYPE) ? true : false;

	return pci->mode == DW_PCIE_RC_TYPE;

}



static bool dw_pcie_ptm_local_clock_visible(void *drvdata)
@@ -834,38 +834,38 @@ static bool dw_pcie_ptm_master_clock_visible(void *drvdata) 
{

	struct dw_pcie *pci = drvdata;



	return (pci->mode == DW_PCIE_EP_TYPE) ? true : false;

	return pci->mode == DW_PCIE_EP_TYPE;

}



static bool dw_pcie_ptm_t1_visible(void *drvdata)

{

	struct dw_pcie *pci = drvdata;



	return (pci->mode == DW_PCIE_EP_TYPE) ? true : false;

	return pci->mode == DW_PCIE_EP_TYPE;

}



static bool dw_pcie_ptm_t2_visible(void *drvdata)

{

	struct dw_pcie *pci = drvdata;



	return (pci->mode == DW_PCIE_RC_TYPE) ? true : false;

	return pci->mode == DW_PCIE_RC_TYPE;

}



static bool dw_pcie_ptm_t3_visible(void *drvdata)

{

	struct dw_pcie *pci = drvdata;



	return (pci->mode == DW_PCIE_RC_TYPE) ? true : false;

	return pci->mode == DW_PCIE_RC_TYPE;

}



static bool dw_pcie_ptm_t4_visible(void *drvdata)

{

	struct dw_pcie *pci = drvdata;



	return (pci->mode == DW_PCIE_EP_TYPE) ? true : false;

	return pci->mode == DW_PCIE_EP_TYPE;

}



const struct pcie_ptm_ops dw_pcie_ptm_ops = {

static const struct pcie_ptm_ops dw_pcie_ptm_ops = {

	.check_capability = dw_pcie_ptm_check_capability,

	.context_update_write = dw_pcie_ptm_context_update_write,

	.context_update_read = dw_pcie_ptm_context_update_read,