From patchwork Wed Mar 8 07:26:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9610479 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 6DF626046A for ; Wed, 8 Mar 2017 07:26:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B6892853A for ; Wed, 8 Mar 2017 07:26:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E5C8285D3; Wed, 8 Mar 2017 07:26:51 +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=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 291ED285DA for ; Wed, 8 Mar 2017 07:26:48 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 575B02668C0; Wed, 8 Mar 2017 08:26:47 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 99959266AFC; Wed, 8 Mar 2017 08:26:45 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 3D741266834 for ; Wed, 8 Mar 2017 08:26:38 +0100 (CET) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie3.idc.renesas.com with ESMTP; 08 Mar 2017 16:26:36 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 241D9686C8; Wed, 8 Mar 2017 16:26:36 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 1472028076; Wed, 8 Mar 2017 16:26:36 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 0D6A328070; Wed, 8 Mar 2017 16:26:36 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id SAA30939; Wed, 8 Mar 2017 16:26:35 +0900 X-IronPort-AV: E=Sophos;i="5.36,262,1486393200"; d="scan'208";a="236061484" Received: from mail-hk2apc01lp0216.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.216]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 08 Mar 2017 16:26:34 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=W3W7M9x16GpodBJ0E2KXQKJB2KYx5ntK/1CgPRXWNR8=; b=fCE2sOWef+Ms8mk9AeiVNE651/mhLKG6dC2XUTm4+VQUEmjR6ru8AfqxR21hR5uXi6x1v5z4GVKqO5eWx2p3WctKAfbmBo630d1DIPrwazXYDCE0inbeM9XBME584ns0LB0/POquyLKXMRElwWKSM5wjPtOI4IMpvk/uff3qnu0= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; kernel.org; dmarc=none action=none header.from=renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by SG2PR0601MB1933.apcprd06.prod.outlook.com (10.170.133.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12; Wed, 8 Mar 2017 07:26:33 +0000 Message-ID: <87o9xcp6zi.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown , Sylwester Nawrocki MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Wed, 8 Mar 2017 07:26:33 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TYXPR0101CA0037.jpnprd01.prod.outlook.com (10.168.40.175) To SG2PR0601MB1933.apcprd06.prod.outlook.com (10.170.133.147) X-MS-Office365-Filtering-Correlation-Id: 0e8b5391-9fe9-42ff-8788-08d465f472bb X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:SG2PR0601MB1933; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1933; 3:zsdvJ3j/OWxtKpK1ZS1vhTc6TQ8HUyrK/+yp1H/syacV/5NJOmxRDqcRP2n3ALL6Zfj1LAmIwMAkPSUJYfH2At17aD1OWw2W1d0xXOkAbKhVCBSghKxaSGcNy7iuz0ZmYR6qg8acJZUz/AH6z7+XTTTHJCe5Mcc0nn6fhXjr1lOoWw0GUd2CIi2NFM10tMzfv8UbcrnESGlLPsaDv2Kg7d95xxWEjX/B1H0kPh+8D3Abr3nSu5vlykbpbpiU39opA93Tn0DJQ0CLmDO2hP/8fn7AI4XO0ROuHLBqe19J5Xo=; 25:80XTj8TM2830HLbo6FXKkBDPeaBOwZWgAfpZFqRRc8GntwdH9XqJHrdt7O2MadIChUBCVETpME4NCJlxL8ZFJav2Qa/fDNPkuuA9kkwElI4Yu+nkMNsFPaYZnTieAPL+nejyRrPNE6x9ZHZEfuVnQm88em4ZkkafSoMmJiFdYE+F5qjqA/T18ReTIVNeagFOf8BBVXspMo5tnL695OcMoUZDnfCQnOpcPEmRwwVsWecowTjmUmBDb/zAJjEJeSRVhjtl1K5dbi5o+vsMBRes/ExB+fbspYRJqipeglzO0JT7I0mv+ZW4kUgAPyGLodppfZCjX4Nt4SnvJB3OGwFOYZGRe8IDHFb3XIwuTFQdbN8xhn95pXifMxLv6Hl/H2PSID89SlCTZJHKC8NR0AUfwgCkNyQKsQi2naqtcYRJF9yOq54gJ09VJR4Soz4nUYu5KCf465UlJtYYi3yXmqMc3w== X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1933; 31:3cSmxV0Tgh4nqn6v6+ReGwSsSqgI9n+GRvGTprv7aOOzHhYOmrLpLEDesHJt8hPYUYtMDKvrfjqjCvPzCBPR/I/qgY6DfklzXxcsiZjIPz7n/0vO72bv8bCsO22ZlUjTjSq4Y+eV7/A/GBDygXGbW76mnSNO9QBa2EoSEHHZ3TrHHsRILJswULj0dzve5IVdeC23XCv19k4BKzfbykn5A2W21kC8bl9HbIf5GXpat8WJImxDdoVBORme2XY9Jvf5L8wnJLVVUJbjawFvsYuAmw==; 20:KRuwDGU0d314JV58syzDgoTwb0Tf4FBgMtlSi8ghPMqi4xaR62Y7zWZ+ZU6on01cTmNuirHLDPde7Gyn3IS8iDW0JFuecoWcd5gOue4zs6BmI3h8owwW0TKzgSdBpsXz0YyJM9XI+BINhlVJb954G+DzwvGJjfjLANi/qr0XzxYg1WxwpyLQQuYBxfn0IOvC8lx209YzS0eV417aiB72uH0qnLwquLe8ac8Yun7icAHr5aZEH42GtDqlo7YawDw1Krb6mKs+pEQAjJj7gVC5p1u1hjXkn5rlPZSC/r7cBaE74OePzLepGCVpn5aQQe/HpdqNHhqGQ2VLE/v3tqcipG8sv9i1flxwDQOrdutrqO7lv9N/YWbdypjSce6wQfTHwJNiOzh4IWHPOCDDz+ymQ8AvqRbQTTdpgbC24xFPWjbIkpGmBiXD6f1APwTj8d65QxObz5ukm9gwm1uvSCJCTLcchOPkt6hloCWNJvhELj3SyjdKXQIEQ+UU3JFeTKq3 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(7411616537696); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6055026)(6041248)(20161123564025)(20161123555025)(20161123560025)(20161123558025)(20161123562025)(6072148); SRVR:SG2PR0601MB1933; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1933; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1933; 4:6FiopZxKAPPbinUduPZR5/PNAdPG6K5jvDvdl4w7uLHL4fYSwr0P414kDtu+EYkCY8HtwsmCf/dOv4QzzfmP1Mdi+SXjGPe4WyLbsfMAICPmSPwO0W3DZyEJkF1FVlBDcwiJgG2+l2vK92e2CFM6JMQk92vcPlvhsNhPGm4tVRSd3doNscNoce477RaanJMQFWLbVGme3AQaiiTc2EhGWiUMyVAXu9jD8T9WEH/JcZwrkUHCj61dVkYGXmGH76mUSZuGh3TtOiPCf/5DGRsW5OL0N6oiECOA5rgWVFVbB0ABk5gDDmptkIzKWdf5JM44E/VZYjnwWqIz+YW2j6rkby1jfahQ+oZG5T+0MyYgSdOL8srlXGCaU5xCVppgHR9JD+DOQyEqB1q1SbmM4UamtDI53df4A8HtrsdKqjWEMHWNTXCvXSmTnwZXT4Zw6/cbpBD8WERsfd0cR7eYt58OFXYpnPl7UKbH8Y3Iqp5jHhUo0BErWKYDNDVe7S6yrRVgF1syNuqqibaO3mcrCizgPGVvLuVyI/5V4cpzYPEEU/JepiDFLueZJTJcatDbaT88BCOhP/0RXV/vtwlLhL1X9qw1U+X3aX1j/MtgrOK1WkRLzXFQczsya1QvBcvTUDunb8O6NbNhqXuTmQXH59sIT3I3xw5GD+jrCYyA6VTtPbSBzQDhIbDuH7UYxWTxD14Y X-Forefront-PRVS: 02408926C4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(39850400002)(39410400002)(39840400002)(39860400002)(39450400003)(53936002)(4326008)(33646002)(7736002)(189998001)(54356999)(50466002)(81166006)(54906002)(305945005)(8676002)(86362001)(4001350100001)(6486002)(36756003)(25786008)(38730400002)(23726003)(3846002)(6116002)(50986999)(2906002)(83506001)(5660300001)(46406003)(47776003)(66066001)(42186005)(53416004)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1933; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1933; 23:yjRpn8EFmFalA2hInPEtRS9gch1cUprPI7S/bto?= =?us-ascii?Q?3YS45wvx5XBwtBiFbDUupQ5pwrwvUPunwsT6EDn3pjy2lB0bKbtmCEtprft4?= =?us-ascii?Q?54S7rPK0PQ0845O6/ohxVr0ZPQ3rjhTGRdWuXbHQKOj/RDbI/8UZR6f2Ir3M?= =?us-ascii?Q?DpZUxy5yYHhngX2/U2LVDuDYtuNf2i9WayHRIqrSqIiXqCOfmtMra6HBgyyq?= =?us-ascii?Q?j7Uiq+ZnucPDrYzr6CM4ZW5cqO2F7l39i81h0AJeDjpkoBKru/MmX8dig2/3?= =?us-ascii?Q?8B4Y3ujyBzFMtisQYNzvHL2MmO70ckbXf9jAjPyeN0kpOzPWW9ooTrXfe9Ni?= =?us-ascii?Q?e7WmpJrvaHeQacdJvnITq2TpeR3HL8V14VqA1LMFFGrx9I0MM0x7z3WGh3gm?= =?us-ascii?Q?UQu8WEsnC6MsADTpAZPNZ8Q8QKjH4WwWzsOm86r5X+ZGgYIsbTNbQYZq5vTa?= =?us-ascii?Q?QhRGjosk7i9EjqiujPF0gqrieWQreG8lV0pOy/hmmSjse9ChiCeCC+1yhE7o?= =?us-ascii?Q?OOmNj6HgPbSY0PZsJ84KBMUhd18NhULER+4BWdbQ5aJNXQp5G+6AiD9HuFof?= =?us-ascii?Q?O4UpQAmxoelhhze886ALOaYMY6lZJOmOKwZv29D/7KV6QXYuM3SXfrhrhfIE?= =?us-ascii?Q?PxDB0kCqj/aJKZSzyow528qeJwp4EUujEFX4ZoHwFyvk/AGsvX6+nGaX/WUv?= =?us-ascii?Q?fG9xYOgjle4Mmpud3g6VZFwObU8zaFIERxvsySHEcamAovbHeIsu05c7x/J+?= =?us-ascii?Q?laUE6jrm7SIVkGcd1Aj55E8mGcBRV2fkVI6ztdlXMioBPS2mOy8kX5MoJKkf?= =?us-ascii?Q?qbCwRgTioudIJ0acpuiSh8WfmaBwFGhz78wvgQj/87vl5zxYB+v35JnzNtw+?= =?us-ascii?Q?mc3pppJ/Iuu+sdrlN8sEBvCzrwSrcfT+shWgpu3jPk+kdRzbQYsbN9A2r8Cu?= =?us-ascii?Q?zBTKUGdgvbiDgiuK/+s2yWg+I01/xAIymhGQCGjlJsw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1933; 6:ZrcA8Q/7sZwoYDIJlpOSbg98eEADYLGeNUeCDTJnnv3d/2v7X2beaYyA7OznIsOg3L1CeNSSrWswloq0yYkLlJEHo/LYGdJQ0q8c4OkVnos8AE/3yJmlWuo05uQe6ot/dxjRyAXDiAopXSctrwDLep7E4IZPwE+XcUzHE0flTh4B3hkRF9ypjDL/EaUvEc4I85eA4VN+65DlxB3muRYxYkOKWWFk0EwsH4zPix+vrCCKb404XXzFGFH/d6VQfNQi35qZPPcN24n7e45zyDLVfIa4E7nNiCFwk4AstVqiET80yJr9JrG+eH1FEE0zvUX+l4gftXMCYTdOGhejCeyw9Wgwzg1j7umcveTAHWtNVvUzetGU6buz+20oBQLIY/ZNfUYaeT4Cb+16tirJ9263vHuWlM5oQp4Jk0FmrKyi2gs=; 5:4N+8YMBTXazM08PjYCQNkCstwg9IY0u8VKyDDvBMHGlvEtc12q9HjvuIjNPGBGIsTJfwFwvbWDBHiEFpqJcZnjl5akNCKGa00eQGucDLYzvzcDf5epfZvhL8gK6Y+2RUqPR2yJx6XwAT6W1Lj+e4bg==; 24:/b06urlEDIJH9GI9Qwb7bCizXyb5EweL35cvULsYlC1eKE8xAB2HHOzn/TLCRdUgdfSbD2eNQtu5ADBui8Sik9og0Xg6nZrfVRSIJpbVRDI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1933; 7:NLRN9j+TtYLbmds/9P1Yp3yp83sl4Al4ghVSHQjRMi3czwwOqix5RxgRL09kDEo0I49iRGa6oNrtAHxTPLKNX82TuuyLJD6ZWx1LyulMRfQ8TfHm2yw+rU649I6X3yK4zeAj85+Oa8CUkYTxb9+PEXWzDWhOgIoczoUOhghr2gPewDZoLz2utiapjxnt8sPAJUNGtEjYKS4ksf5WVDsKdMHTedDkxfouvPYHX5Qtzb9jkykBqFNR4y6rSqj4SFRZ9rDAfZ0Ai+NaVIrUIfDhae8y5JcZ1fx88Z9y7A9O3X645HicZS3HInrl6oP+pOCb75FjDe9zKMY/REz746QAxw==; 20:FsL0In27XZV7BTwBQUvxK6KiIzxoMp1RRkxyLjBWJke3oX0I4juE2mx3oA7mdQWGHuwrIhas5p/92vsN6g5IwV53F9MqEdUBbXixpRjSwfyeCmtwkJnzS4llH+RtjVmleh4mkgfIuTv1r+4+LStLnoGIEBaWD5N70pLvgls2Aps= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2017 07:26:33.1931 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1933 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon Subject: [alsa-devel] [PATCH][RFC] ASoC: core: remove pointless auxiliary from snd_soc_component X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto commit 1a653aa44725 ("ASoC: core: replace aux_comp_list to ...") tried to replace aux_comp_list to component_dev_list, but it failed because of binding timing. Thus, Sylwester fixuped it by commit d2e3a1358c37 ("ASoC: Fix binding and probing of auxiliary..."). One of main purpose of commit 1a653aa44725 ("ASoC: core: replace...") was remove replaceable list (= list_aux) from snd_soc_component by using new "auxiliary" flags (but it failed). Because of this background, current code has reborned card_aux_list (= same as original list_aux), and almost pointless "auxiliary" flags. Let's remove pointless "auxiliary" flags by this patch This means, it is same as revert both commit 1a653aa44725 ("ASoC: core: replace aux_comp_list to ...") and commit d2e3a1358c37 ("ASoC: Fix binding and probing of auxiliary..."). Not-yet-Signed-off-by: Kuninori Morimoto request-Tested-by-from: Sylwester Nawrocki Tested-by: Sylwester Nawrocki --- >> Sylwester I created this patch, but I can't check. Sylwester, can you please check this patch ? include/sound/soc.h | 1 - sound/soc/soc-core.c | 15 +++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index dd78507..316fdce 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -815,7 +815,6 @@ struct snd_soc_component { unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */ unsigned int registered_as_component:1; - unsigned int auxiliary:1; /* for auxiliary component of the card */ unsigned int suspended:1; /* is in suspend PM state */ struct list_head list; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e7d876a..5933851 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1777,7 +1777,6 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num) } component->init = aux_dev->init; - component->auxiliary = 1; list_add(&component->card_aux_list, &card->aux_comp_list); return 0; @@ -1789,14 +1788,13 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num) static int soc_probe_aux_devices(struct snd_soc_card *card) { - struct snd_soc_component *comp, *tmp; + struct snd_soc_component *comp; int order; int ret; for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; order++) { - list_for_each_entry_safe(comp, tmp, &card->aux_comp_list, - card_aux_list) { + list_for_each_entry(comp, &card->aux_comp_list, card_aux_list) { if (comp->driver->probe_order == order) { ret = soc_probe_component(card, comp); if (ret < 0) { @@ -1805,7 +1803,6 @@ static int soc_probe_aux_devices(struct snd_soc_card *card) comp->name, ret); return ret; } - list_del(&comp->card_aux_list); } } } @@ -1821,14 +1818,12 @@ static void soc_remove_aux_devices(struct snd_soc_card *card) for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; order++) { list_for_each_entry_safe(comp, _comp, - &card->component_dev_list, card_list) { - - if (!comp->auxiliary) - continue; + &card->aux_comp_list, card_aux_list) { if (comp->driver->remove_order == order) { soc_remove_component(comp); - comp->auxiliary = 0; + /* remove it from the card's aux_comp_list */ + list_del(&comp->card_aux_list); } } }