From akpm@osdl.org Mon Sep 25 16:52:27 2006 Message-Id: <200609252352.k8PNqKq5003232@shell0.pdx.osdl.net> Subject: PCI: pcie-check-and-return-bus_register-errors fix To: greg@kroah.com Cc: akpm@osdl.org, rdunlap@xenotime.net From: akpm@osdl.org Date: Mon, 25 Sep 2006 16:52:20 -0700 From: Andrew Morton __must_check goes on the declaration, not the definition. Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- drivers/pci/pcie/portdrv.h | 4 +++- drivers/pci/pcie/portdrv_core.c | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) --- gregkh-2.6.orig/drivers/pci/pcie/portdrv.h +++ gregkh-2.6/drivers/pci/pcie/portdrv.h @@ -9,6 +9,8 @@ #ifndef _PORTDRV_H_ #define _PORTDRV_H_ +#include + #if !defined(PCI_CAP_ID_PME) #define PCI_CAP_ID_PME 1 #endif @@ -39,7 +41,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 int pcie_port_bus_register(void); +extern int __must_check 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,7 +6,6 @@ * Copyright (C) Tom Long Nguyen (tom.l.nguyen@intel.com) */ -#include #include #include #include @@ -401,7 +400,7 @@ void pcie_port_device_remove(struct pci_ pci_disable_msi(dev); } -int __must_check pcie_port_bus_register(void) +int pcie_port_bus_register(void) { return bus_register(&pcie_port_bus_type); }