diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2021-10-04 14:59:29 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-10-12 17:50:12 -0500 |
| commit | 5a72431ec318ed38b02a413b1e4ab934e5d3451e (patch) | |
| tree | b2a4b44d07869cbf6acd73c0cc59f5e223b424b2 | |
| parent | 7c3b2c933a916e32e9c8b56074a47c1b3f3e7cbe (diff) | |
| download | linux-stable-5a72431ec318ed38b02a413b1e4ab934e5d3451e.tar.gz linux-stable-5a72431ec318ed38b02a413b1e4ab934e5d3451e.tar.bz2 linux-stable-5a72431ec318ed38b02a413b1e4ab934e5d3451e.zip | |
powerpc/eeh: Use dev_driver_string() instead of struct pci_dev->driver->name
Replace pdev->driver->name by dev_driver_string() for the corresponding
struct device. This is a step toward removing pci_dev->driver.
Move the function nearer its only user and instead of the ?: operator use a
normal "if" which is more readable.
Link: https://lore.kernel.org/r/20211004125935.2300113-6-u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
| -rw-r--r-- | arch/powerpc/include/asm/ppc-pci.h | 5 | ||||
| -rw-r--r-- | arch/powerpc/kernel/eeh.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/ppc-pci.h b/arch/powerpc/include/asm/ppc-pci.h index 2b9edbf6e929..f6cf0159024e 100644 --- a/arch/powerpc/include/asm/ppc-pci.h +++ b/arch/powerpc/include/asm/ppc-pci.h @@ -55,11 +55,6 @@ void eeh_pe_dev_mode_mark(struct eeh_pe *pe, int mode); void eeh_sysfs_add_device(struct pci_dev *pdev); void eeh_sysfs_remove_device(struct pci_dev *pdev); -static inline const char *eeh_driver_name(struct pci_dev *pdev) -{ - return (pdev && pdev->driver) ? pdev->driver->name : "<null>"; -} - #endif /* CONFIG_EEH */ #define PCI_BUSNO(bdfn) ((bdfn >> 8) & 0xff) diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index e9b597ed423c..4b08881c4a1e 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -399,6 +399,14 @@ out: return ret; } +static inline const char *eeh_driver_name(struct pci_dev *pdev) +{ + if (pdev) + return dev_driver_string(&pdev->dev); + + return "<null>"; +} + /** * eeh_dev_check_failure - Check if all 1's data is due to EEH slot freeze * @edev: eeh device |