diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2023-06-25 18:56:13 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2023-06-25 18:56:13 -0700 |
| commit | 0c0df63177e37ae826d803280eb2c5b6b6a7a9a4 (patch) | |
| tree | 5b158934251cb6537491371d3dd09fcf349a3102 /drivers/cxl/core/pci.c | |
| parent | d2f9fe695313b1e50028c1ec4cd09bea67152a60 (diff) | |
| parent | 5d2ffbe4b81a3b6353bf888a523e7e5d4fec47ad (diff) | |
Merge branch 'for-6.5/cxl-rch-eh' into for-6.5/cxl
Pick up the first half of the RCH error handling series. The back half
needs some fixups for test regressions. Small conflicts with the PMU
work around register enumeration and setup helpers.
Diffstat (limited to 'drivers/cxl/core/pci.c')
| -rw-r--r-- | drivers/cxl/core/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c index 74962b18e3b2..c7a7887ebdcf 100644 --- a/drivers/cxl/core/pci.c +++ b/drivers/cxl/core/pci.c @@ -67,7 +67,7 @@ static int match_add_dports(struct pci_dev *pdev, void *data) /** * devm_cxl_port_enumerate_dports - enumerate downstream ports of the upstream port - * @port: cxl_port whose ->uport is the upstream of dports to be enumerated + * @port: cxl_port whose ->uport_dev is the upstream of dports to be enumerated * * Returns a positive number of dports enumerated or a negative error * code. @@ -603,7 +603,7 @@ static int cxl_cdat_read_table(struct device *dev, */ void read_cdat_data(struct cxl_port *port) { - struct cxl_memdev *cxlmd = to_cxl_memdev(port->uport); + struct cxl_memdev *cxlmd = to_cxl_memdev(port->uport_dev); struct device *host = cxlmd->dev.parent; struct device *dev = &port->dev; struct pci_doe_mb *cdat_doe; |