diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2023-10-31 10:59:44 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2023-10-31 10:59:44 -0700 |
| commit | de5512b2a293863261c6b04c0c73ec0ec09ed550 (patch) | |
| tree | e5cfd738515e0d64adf7a4e9548c7f6f5ec738b2 /drivers/cxl/pci.c | |
| parent | 624eda92abd47f35386028e4a54d423037a75d12 (diff) | |
| parent | fae6389f912eb0b6aea1366814b5501077b5dbac (diff) | |
| download | linux-de5512b2a293863261c6b04c0c73ec0ec09ed550.tar.gz linux-de5512b2a293863261c6b04c0c73ec0ec09ed550.tar.bz2 linux-de5512b2a293863261c6b04c0c73ec0ec09ed550.zip | |
Merge branch 'for-6.7/cxl' into cxl/next
Pickup some misc. CXL updates for v6.7.
Diffstat (limited to 'drivers/cxl/pci.c')
| -rw-r--r-- | drivers/cxl/pci.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c index 4067afca6389..0155fb66b580 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -85,6 +85,10 @@ static int cxl_pci_mbox_wait_for_doorbell(struct cxl_dev_state *cxlds) status & CXLMDEV_DEV_FATAL ? " fatal" : "", \ status & CXLMDEV_FW_HALT ? " firmware-halt" : "") +/* + * Threaded irq dev_id's must be globally unique. cxl_dev_id provides a unique + * wrapper object for each irq within the same cxlds. + */ struct cxl_dev_id { struct cxl_dev_state *cxlds; }; @@ -95,7 +99,6 @@ static int cxl_request_irq(struct cxl_dev_state *cxlds, int irq, struct device *dev = cxlds->dev; struct cxl_dev_id *dev_id; - /* dev_id must be globally unique and must contain the cxlds */ dev_id = devm_kzalloc(dev, sizeof(*dev_id), GFP_KERNEL); if (!dev_id) return -ENOMEM; |