2007-08-23 17:39:34

by Randy Dunlap

Subject: [PATCH] PCI AER: fix warnings when PCIEAER=n

From: Randy Dunlap <[email protected]>

Fix warnings when CONFIG_PCIEAER=n:

drivers/pci/pcie/portdrv_pci.c:105: warning: statement with no effect
drivers/pci/pcie/portdrv_pci.c:226: warning: statement with no effect
drivers/scsi/arcmsr/arcmsr_hba.c:352: warning: statement with no effect

Signed-off-by: Randy Dunlap <[email protected]>
---
include/linux/aer.h | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)

--- linux-2623-rc3-kex.orig/include/linux/aer.h
+++ linux-2623-rc3-kex/include/linux/aer.h
@@ -15,11 +15,26 @@ extern int pci_disable_pcie_error_report
extern int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);
extern int pci_cleanup_aer_correct_error_status(struct pci_dev *dev);
#else
-#define pci_enable_pcie_error_reporting(dev) (-EINVAL)
-#define pci_find_aer_capability(dev) (0)
-#define pci_disable_pcie_error_reporting(dev) (-EINVAL)
-#define pci_cleanup_aer_uncorrect_error_status(dev) (-EINVAL)
-#define pci_cleanup_aer_correct_error_status(dev) (-EINVAL)
+static inline int pci_enable_pcie_error_reporting(struct pci_dev *dev)
+{
+ return -EINVAL;
+}
+static inline int pci_find_aer_capability(struct pci_dev *dev)
+{
+ return 0;
+}
+static inline int pci_disable_pcie_error_reporting(struct pci_dev *dev)
+{
+ return -EINVAL;
+}
+static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)
+{
+ return -EINVAL;
+}
+static inline int pci_cleanup_aer_correct_error_status(struct pci_dev *dev)
+{
+ return -EINVAL;
+}
#endif

#endif //_AER_H_

2007-08-23 18:44:59

by linas

Subject: Re: [PATCH] PCI AER: fix warnings when PCIEAER=n

On Thu, Aug 23, 2007 at 10:37:53AM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <[email protected]>
>
> Fix warnings when CONFIG_PCIEAER=n:
>
> drivers/pci/pcie/portdrv_pci.c:105: warning: statement with no effect
> drivers/pci/pcie/portdrv_pci.c:226: warning: statement with no effect
> drivers/scsi/arcmsr/arcmsr_hba.c:352: warning: statement with no effect
>
> Signed-off-by: Randy Dunlap <[email protected]>

Acked-by: Linas Vepstas <[email protected]>

--linas