Commit 7e093c30 authored by Paul Mackerras's avatar Paul Mackerras Committed by Linus Torvalds

[PATCH] ppc64: fix eeh.h compile warnings

This patch is from Nathan Lynch <ntl@pobox.com>.

Use static inlines instead of #defines for stub functions when
CONFIG_EEH=n, to eliminate "statement with no effect" warnings with
some toolchains.
Signed-off-by: default avatarNathan Lynch <ntl@pobox.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2cf0110a
...@@ -104,17 +104,30 @@ int eeh_unregister_notifier(struct notifier_block *nb); ...@@ -104,17 +104,30 @@ int eeh_unregister_notifier(struct notifier_block *nb);
*/ */
#define EEH_IO_ERROR_VALUE(size) (~0U >> ((4 - (size)) * 8)) #define EEH_IO_ERROR_VALUE(size) (~0U >> ((4 - (size)) * 8))
#else #else /* !CONFIG_EEH */
#define eeh_init() static inline void eeh_init(void) { }
#define eeh_check_failure(token, val) (val)
#define eeh_dn_check_failure(dn, dev) (0) static inline unsigned long eeh_check_failure(const volatile void __iomem *token, unsigned long val)
#define pci_addr_cache_build() {
#define eeh_add_device_early(dn) return val;
#define eeh_add_device_late(dev) }
#define eeh_remove_device(dev)
static inline int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
{
return 0;
}
static inline void pci_addr_cache_build(void) { }
static inline void eeh_add_device_early(struct device_node *dn) { }
static inline void eeh_add_device_late(struct pci_dev *dev) { }
static inline void eeh_remove_device(struct pci_dev *dev) { }
#define EEH_POSSIBLE_ERROR(val, type) (0) #define EEH_POSSIBLE_ERROR(val, type) (0)
#define EEH_IO_ERROR_VALUE(size) (-1UL) #define EEH_IO_ERROR_VALUE(size) (-1UL)
#endif #endif /* CONFIG_EEH */
/* /*
* MMIO read/write operations with EEH support. * MMIO read/write operations with EEH support.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment