mirror of
https://github.com/torvalds/linux.git
synced 2026-05-28 09:04:39 +02:00
Merge branch 'pci/controller/cadence'
- Drop unused struct cdns_plat_pcie.is_rc member (Li Chen) * pci/controller/cadence: PCI: cadence: Drop unused member from struct cdns_plat_pcie
This commit is contained in:
commit
c97e5905ab
|
|
@ -17,12 +17,9 @@
|
||||||
/**
|
/**
|
||||||
* struct cdns_plat_pcie - private data for this PCIe platform driver
|
* struct cdns_plat_pcie - private data for this PCIe platform driver
|
||||||
* @pcie: Cadence PCIe controller
|
* @pcie: Cadence PCIe controller
|
||||||
* @is_rc: Set to 1 indicates the PCIe controller mode is Root Complex,
|
|
||||||
* if 0 it is in Endpoint mode.
|
|
||||||
*/
|
*/
|
||||||
struct cdns_plat_pcie {
|
struct cdns_plat_pcie {
|
||||||
struct cdns_pcie *pcie;
|
struct cdns_pcie *pcie;
|
||||||
bool is_rc;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct cdns_plat_pcie_of_data {
|
struct cdns_plat_pcie_of_data {
|
||||||
|
|
@ -76,7 +73,6 @@ static int cdns_plat_pcie_probe(struct platform_device *pdev)
|
||||||
rc->pcie.dev = dev;
|
rc->pcie.dev = dev;
|
||||||
rc->pcie.ops = &cdns_plat_ops;
|
rc->pcie.ops = &cdns_plat_ops;
|
||||||
cdns_plat_pcie->pcie = &rc->pcie;
|
cdns_plat_pcie->pcie = &rc->pcie;
|
||||||
cdns_plat_pcie->is_rc = is_rc;
|
|
||||||
|
|
||||||
ret = cdns_pcie_init_phy(dev, cdns_plat_pcie->pcie);
|
ret = cdns_pcie_init_phy(dev, cdns_plat_pcie->pcie);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
|
|
@ -104,7 +100,6 @@ static int cdns_plat_pcie_probe(struct platform_device *pdev)
|
||||||
ep->pcie.dev = dev;
|
ep->pcie.dev = dev;
|
||||||
ep->pcie.ops = &cdns_plat_ops;
|
ep->pcie.ops = &cdns_plat_ops;
|
||||||
cdns_plat_pcie->pcie = &ep->pcie;
|
cdns_plat_pcie->pcie = &ep->pcie;
|
||||||
cdns_plat_pcie->is_rc = is_rc;
|
|
||||||
|
|
||||||
ret = cdns_pcie_init_phy(dev, cdns_plat_pcie->pcie);
|
ret = cdns_pcie_init_phy(dev, cdns_plat_pcie->pcie);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user