From patchwork Mon Feb 6 12:39:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 9557711 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1D69660236 for ; Mon, 6 Feb 2017 12:40:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D9A62654B for ; Mon, 6 Feb 2017 12:40:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 02CF627E5A; Mon, 6 Feb 2017 12:40:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FC8D2654B for ; Mon, 6 Feb 2017 12:40:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751567AbdBFMkB (ORCPT ); Mon, 6 Feb 2017 07:40:01 -0500 Received: from s3.sipsolutions.net ([5.9.151.49]:39810 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750956AbdBFMkA (ORCPT ); Mon, 6 Feb 2017 07:40:00 -0500 Received: by sipsolutions.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.88) (envelope-from ) id 1caiaN-0003IL-6m; Mon, 06 Feb 2017 13:39:59 +0100 From: Johannes Berg To: backports@vger.kernel.org Cc: Johannes Berg Subject: [PATCH 2/3] backports: restrict group_attr spatch properly Date: Mon, 6 Feb 2017 13:39:55 +0100 Message-Id: <20170206123956.20082-2-johannes@sipsolutions.net> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170206123956.20082-1-johannes@sipsolutions.net> References: <20170206123956.20082-1-johannes@sipsolutions.net> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Berg Change-Id: I8881dab783fe69a85f833c96f0a4abd3ab062e84 Signed-off-by: Johannes Berg --- .../0001-group-attr/0001-group_attr_class.cocci | 18 ++++++++++++------ .../generic/0001-group-attr/0002-group_attr_bus.cocci | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 13 deletions(-) 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 ea2e7039f50c..a9c84651eedc 100644 --- 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 @@ -33,9 +33,15 @@ declarer name ATTRIBUTE_GROUPS; ATTRIBUTE_GROUPS(group); -@ class_group depends on attribute_group @ +@script:python attribute_groups_name@ +group << attribute_group.group; +groups; +@@ +coccinelle.groups = group + "_groups" + +@ class_group @ identifier group_class; -expression groups; +identifier attribute_groups_name.groups; fresh identifier group_dev_attr = attribute_group.group ## "_dev_attrs"; @@ @@ -47,9 +53,9 @@ struct class group_class = { +#endif }; -@ attribute_group_mod depends on attribute_group && class_group @ +@ attribute_group_mod depends on class_group @ declarer name ATTRIBUTE_GROUPS_BACKPORT; -identifier group; +identifier attribute_group.group; @@ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0) @@ -59,10 +65,10 @@ ATTRIBUTE_GROUPS(group); +ATTRIBUTE_GROUPS_BACKPORT(group); +#endif -@ class_registering depends on class_group && attribute_group_mod @ +@ class_registering @ identifier class_register, ret; identifier class_group.group_class; -fresh identifier group_class_init = "init_" ## attribute_group_mod.group ## "_attrs"; +fresh identifier group_class_init = "init_" ## attribute_group.group ## "_attrs"; @@ ( 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 b01da875083b..c19e9d7f3eda 100644 --- 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 @@ -31,9 +31,15 @@ declarer name ATTRIBUTE_GROUPS; ATTRIBUTE_GROUPS(group); -@ bus_group depends on attribute_group @ +@script:python attribute_groups_name@ +group << attribute_group.group; +groups; +@@ +coccinelle.groups = group + "_groups" + +@ bus_group @ identifier group_bus; -expression groups; +identifier attribute_groups_name.groups; fresh identifier group_dev_attr = attribute_group.group ## "_dev_attrs"; @@ @@ -45,9 +51,9 @@ struct bus_type group_bus = { +#endif }; -@ attribute_group_mod depends on attribute_group && bus_group @ +@ attribute_group_mod depends on bus_group @ declarer name ATTRIBUTE_GROUPS_BACKPORT; -identifier group; +identifier attribute_group.group; @@ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0) @@ -57,10 +63,10 @@ ATTRIBUTE_GROUPS(group); +ATTRIBUTE_GROUPS_BACKPORT(group); +#endif -@ bus_registering depends on bus_group && attribute_group_mod @ +@ bus_registering @ identifier bus_register, ret; identifier bus_group.group_bus; -fresh identifier group_bus_init = "init_" ## attribute_group_mod.group ## "_attrs"; +fresh identifier group_bus_init = "init_" ## attribute_group.group ## "_attrs"; @@ ( @@ -70,4 +76,3 @@ fresh identifier group_bus_init = "init_" ## attribute_group_mod.group ## "_attr + group_bus_init(); ret = bus_register(&group_bus); ) -