From: Johannes Berg <[email protected]>

To avoid warnings on old kernels, improve the macro
and give it some content rather than nothing.

Signed-off-by: Johannes Berg <[email protected]>
---
 backport/backport-include/linux/pm.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backport/backport-include/linux/pm.h 
b/backport/backport-include/linux/pm.h
index a78477c..70f3a21 100644
--- a/backport/backport-include/linux/pm.h
+++ b/backport/backport-include/linux/pm.h
@@ -51,7 +51,10 @@ struct dev_pm_ops name = { \
        .restore = resume_fn, \
 }
 #else
-#define SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn)
+#define ___BACKPORT_PASTE(a, b) a##b
+#define __BACKPORT_PASTE(a, b) ___BACKPORT_PASTE(a,b)
+#define SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \
+       struct {} __maybe_unused __BACKPORT_PASTE(__backport_avoid_warning_, 
__LINE__)
 #endif /* >= 2.6.29 */
 #endif /* < 2.6.32 */
 
-- 
1.8.0

--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to