Refactor computation of cxlds to a common function get_cxl_dev() and reuse the function in both cxl_handle_cper_event() and cxl_handle_prot_err(). Signed-off-by: Smita Koralahalli <Smita.KoralahalliChannabasappa@xxxxxxx> --- drivers/cxl/pci.c | 52 +++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c index 3e3c36983686..26e65e5b68cb 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -974,32 +974,43 @@ static struct pci_driver cxl_pci_driver = { }, }; +static struct cxl_dev_state *get_cxl_dev(u16 segment, u8 bus, u8 device, + u8 function) +{ + struct pci_dev *pdev __free(pci_dev_put) = NULL; + struct cxl_dev_state *cxlds; + unsigned int devfn; + + devfn = PCI_DEVFN(device, function); + pdev = pci_get_domain_bus_and_slot(segment, bus, devfn); + + if (!pdev) + return NULL; + + guard(device)(&pdev->dev); + if (pdev->driver != &cxl_pci_driver) + return NULL; + + cxlds = pci_get_drvdata(pdev); + + return cxlds; +} + #define CXL_EVENT_HDR_FLAGS_REC_SEVERITY GENMASK(1, 0) static void cxl_handle_cper_event(enum cxl_event_type ev_type, struct cxl_cper_event_rec *rec) { struct cper_cxl_event_devid *device_id = &rec->hdr.device_id; - struct pci_dev *pdev __free(pci_dev_put) = NULL; enum cxl_event_log_type log_type; struct cxl_dev_state *cxlds; - unsigned int devfn; u32 hdr_flags; pr_debug("CPER event %d for device %u:%u:%u.%u\n", ev_type, device_id->segment_num, device_id->bus_num, device_id->device_num, device_id->func_num); - devfn = PCI_DEVFN(device_id->device_num, device_id->func_num); - pdev = pci_get_domain_bus_and_slot(device_id->segment_num, - device_id->bus_num, devfn); - if (!pdev) - return; - - guard(device)(&pdev->dev); - if (pdev->driver != &cxl_pci_driver) - return; - - cxlds = pci_get_drvdata(pdev); + cxlds = get_cxl_dev(device_id->segment_num, device_id->bus_num, + device_id->device_num, device_id->func_num); if (!cxlds) return; @@ -1013,21 +1024,10 @@ static void cxl_handle_cper_event(enum cxl_event_type ev_type, static void cxl_handle_prot_err(struct cxl_cper_prot_err *p_err) { - struct pci_dev *pdev __free(pci_dev_put) = NULL; struct cxl_dev_state *cxlds; - unsigned int devfn; - devfn = PCI_DEVFN(p_err->device, p_err->function); - pdev = pci_get_domain_bus_and_slot(p_err->segment, - p_err->bus, devfn); - if (!pdev) - return; - - guard(device)(&pdev->dev); - if (pdev->driver != &cxl_pci_driver) - return; - - cxlds = pci_get_drvdata(pdev); + cxlds = get_cxl_dev(p_err->segment, p_err->bus, + p_err->device, p_err->function); if (!cxlds) return; -- 2.17.1