backports: fix class/bus attribute group spatch conversion

The spatch conversion (commit 05d44557c6a83b4ecb935cb6306f62,
"backports: transform group attribute backport to SmPL form")
added an #ifdef that shouldn't be there - remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/patches/collateral-evolutions/generic/0001-group-attr/0001-group_attr_class.cocci b/patches/collateral-evolutions/generic/0001-group-attr/0001-group_attr_class.cocci
index fa700f82db7794d2d2b6dba95bb6037275edec99..ea2e7039f50c29ab1f208620bbcfe6294365a404 100644 (file)
--- a/patches/collateral-evolutions/generic/0001-group-attr/0001-group_attr_class.cocci
+++ b/patches/collateral-evolutions/generic/0001-group-attr/0001-group_attr_class.cocci
@@ -66,13 +66,9 @@ fresh identifier group_class_init = "init_" ## attribute_group_mod.group ## "_at
 @@
 
 (
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
 +      group_class_init();
-+#endif
        return class_register(&group_class);
 |
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
 +      group_class_init();
-+#endif
        ret = class_register(&group_class);
 )

diff --git a/patches/collateral-evolutions/generic/0001-group-attr/0002-group_attr_bus.cocci b/patches/collateral-evolutions/generic/0001-group-attr/0002-group_attr_bus.cocci
index d4ae44c7dfa31209c0abdd27aa5ecbdc0eba5d67..b01da875083b09d3f59685f86e6c27bc240af1db 100644 (file)
--- a/patches/collateral-evolutions/generic/0001-group-attr/0002-group_attr_bus.cocci
+++ b/patches/collateral-evolutions/generic/0001-group-attr/0002-group_attr_bus.cocci
@@ -64,14 +64,10 @@ fresh identifier group_bus_init = "init_" ## attribute_group_mod.group ## "_attr
 @@
 
 (
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)
 +       group_bus_init();
-+#endif
         return bus_register(&group_bus);
 |
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)
 +       group_bus_init();
-+#endif
         ret = bus_register(&group_bus);
 )