From 16bd44e54dfba2a403833d11acea63e186de23c6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Tue, 12 Oct 2021 16:03:39 -0500 Subject: [PATCH] cxl: Use to_pci_driver() instead of pci_dev->driver MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Struct pci_driver contains a struct device_driver, so for PCI devices, it's easy to convert a device_driver * to a pci_driver * with to_pci_driver(). The device_driver * is in struct device, so we don't need to also keep track of the pci_driver * in struct pci_dev. Replace pdev->driver with to_pci_driver(). This is a step toward removing pci_dev->driver. [bhelgaas: split to separate patch] Link: https://lore.kernel.org/r/20211004125935.2300113-11-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König Signed-off-by: Bjorn Helgaas --- drivers/misc/cxl/guest.c | 2 +- drivers/misc/cxl/pci.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/misc/cxl/guest.c b/drivers/misc/cxl/guest.c index 94e29bab6b44..9d485c9e3fff 100644 --- a/drivers/misc/cxl/guest.c +++ b/drivers/misc/cxl/guest.c @@ -27,7 +27,7 @@ static void pci_error_handlers(struct cxl_afu *afu, return; list_for_each_entry(afu_dev, &afu->phb->bus->devices, bus_list) { - afu_drv = afu_dev->driver; + afu_drv = to_pci_driver(afu_dev->dev.driver); if (!afu_drv) continue; diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c index 27393b72ea6f..3de0aea62ade 100644 --- a/drivers/misc/cxl/pci.c +++ b/drivers/misc/cxl/pci.c @@ -1807,7 +1807,7 @@ static pci_ers_result_t cxl_vphb_error_detected(struct cxl_afu *afu, return result; list_for_each_entry(afu_dev, &afu->phb->bus->devices, bus_list) { - afu_drv = afu_dev->driver; + afu_drv = to_pci_driver(afu_dev->dev.driver); if (!afu_drv) continue; @@ -2034,7 +2034,7 @@ static pci_ers_result_t cxl_pci_slot_reset(struct pci_dev *pdev) * shouldn't start new work until we call * their resume function. */ - afu_drv = afu_dev->driver; + afu_drv = to_pci_driver(afu_dev->dev.driver); if (!afu_drv) continue; @@ -2083,7 +2083,7 @@ static void cxl_pci_resume(struct pci_dev *pdev) continue; list_for_each_entry(afu_dev, &afu->phb->bus->devices, bus_list) { - afu_drv = afu_dev->driver; + afu_drv = to_pci_driver(afu_dev->dev.driver); if (!afu_drv) continue; -- 2.11.0