From: Bjorn Helgaas Date: Tue, 12 Oct 2021 20:42:59 +0000 (-0500) Subject: PCI: Return NULL for to_pci_driver(NULL) X-Git-Tag: block-5.16-2021-11-13~42^2~23^2~23 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8e9028b3790ddb02c407e1a4da0ab7cf82790e7e;p=linux-block.git PCI: Return NULL for to_pci_driver(NULL) to_pci_driver() takes a pointer to a struct device_driver and uses container_of() to find the struct pci_driver that contains it. If given a NULL pointer to a struct device_driver, return a NULL pci_driver pointer instead of applying container_of() to NULL. This simplifies callers that would otherwise have to check for a NULL pointer first. Signed-off-by: Bjorn Helgaas --- diff --git a/include/linux/pci.h b/include/linux/pci.h index cd8aa6fce204..a2d62165a7f7 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -900,7 +900,10 @@ struct pci_driver { struct pci_dynids dynids; }; -#define to_pci_driver(drv) container_of(drv, struct pci_driver, driver) +static inline struct pci_driver *to_pci_driver(struct device_driver *drv) +{ + return drv ? container_of(drv, struct pci_driver, driver) : NULL; +} /** * PCI_DEVICE - macro used to describe a specific PCI device