From rdunlap@xenotime.net Sat Jul 8 22:55:44 2006 Date: Sat, 8 Jul 2006 22:58:25 -0700 From: Randy Dunlap To: Andrew Morton Cc: greg@kroah.com, davej@codemonkey.org.uk Subject: PCIE: check and return bus_register errors Message-Id: <20060708225825.0c1fac16.rdunlap@xenotime.net> From: Randy Dunlap Have pcie_port_bus_register() notice and return errors. Mark it __must_check so that its caller(s) must check its return value. Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman --- drivers/pci/pcie/portdrv.h | 2 +- drivers/pci/pcie/portdrv_core.c | 5 +++-- drivers/pci/pcie/portdrv_pci.c | 9 +++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) --- gregkh-2.6.orig/drivers/pci/pcie/portdrv.h +++ gregkh-2.6/drivers/pci/pcie/portdrv.h @@ -39,7 +39,7 @@ extern int pcie_port_device_suspend(stru extern int pcie_port_device_resume(struct pci_dev *dev); #endif extern void pcie_port_device_remove(struct pci_dev *dev); -extern void pcie_port_bus_register(void); +extern int pcie_port_bus_register(void); extern void pcie_port_bus_unregister(void); #endif /* _PORTDRV_H_ */ --- gregkh-2.6.orig/drivers/pci/pcie/portdrv_core.c +++ gregkh-2.6/drivers/pci/pcie/portdrv_core.c @@ -6,6 +6,7 @@ * Copyright (C) Tom Long Nguyen (tom.l.nguyen@intel.com) */ +#include #include #include #include @@ -402,9 +403,9 @@ void pcie_port_device_remove(struct pci_ pci_disable_msi(dev); } -void pcie_port_bus_register(void) +int __must_check pcie_port_bus_register(void) { - bus_register(&pcie_port_bus_type); + return bus_register(&pcie_port_bus_type); } void pcie_port_bus_unregister(void) --- gregkh-2.6.orig/drivers/pci/pcie/portdrv_pci.c +++ gregkh-2.6/drivers/pci/pcie/portdrv_pci.c @@ -129,12 +129,17 @@ static struct pci_driver pcie_portdrv = static int __init pcie_portdrv_init(void) { - int retval = 0; + int retval; - pcie_port_bus_register(); + retval = pcie_port_bus_register(); + if (retval) { + printk(KERN_WARNING "PCIE: bus_register error: %d\n", retval); + goto out; + } retval = pci_register_driver(&pcie_portdrv); if (retval) pcie_port_bus_unregister(); + out: return retval; }