From patchwork Mon Oct 17 23:36:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13009697 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E0B11C433FE for ; Mon, 17 Oct 2022 23:37:31 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CE6378E44; Tue, 18 Oct 2022 01:36:39 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CE6378E44 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666049849; bh=CcaeVGj1sc1OkJJ95ICBOwCzH4g6sT33rO4mAa8JYpY=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=ceQZI6nczKbswhO1hbvQ0Ch+TDiKzCXTmoFJfvgtsCHUpGP0KgV6Pg09X9YCfrXQB EQhtsmeTEemWuydFCkGuqo7rIngPQAzDgb/SHgGrC7p6f7J+Ztkb1+nJ9f5HFNFEgI l5NCadXlm+2M/6kDvYgFPvZgq/lliI22I0TpTRoI= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 7F42DF8025E; Tue, 18 Oct 2022 01:36:39 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D8F81F804D9; Tue, 18 Oct 2022 01:36:37 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2112.outbound.protection.outlook.com [40.107.113.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id E56F7F80149 for ; Tue, 18 Oct 2022 01:36:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E56F7F80149 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="K7K0XWJ4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sy9Q50s3Swp+aBgtAqebIO105s8u12mfdqWE6Hixi6Npv2dNBB8FYLbxe+WotFplkjEbv/0wJ10ON6BFWe6GYyA/5e7QcdDgyVMVenrngjVoGQljKNxpV3WPZw/o7PSNqyYrX5OeHzIau5fpIRovgawqkxj9K0IM/81utrK1aTBMGv+rpII4c98f/VJvzVXlh6cgAXF13ze82us8Wuj3coKkaF2/jesqkN4Wkk2c5HDLlnXz+SAtNHXwsbja+tst533EuOP8JwGwmr0TlNeO0StQHO2d5qRUHjA0lOmKOaBUugZFMJXVRltp5AlZ8l11XxCrUtun5ih41/ctFsJNsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iCc1uUpTlKt5moZluVRm8uZD9QpshNc3QhAGSxw6Lpo=; b=clwYhs7r0gcfrtzLibFo9ii5KEO2Pt4DDUjBF+N3Z3jI+OuTKF75STNDyfsmj2Wu6KiEEYy53feFbn+8foYBBj9hRGBQHpuA9+11N9b/GJjYoWblMFBoeDw6+2GXURBjVOQvx+8OVgqU3Tw18fdp9IwaLcLilK+eukUL62AEtYcqr6sqiirMhuM1WnT5QTrcKLceBcPaizrc9LeLyiW8fhmoCXJ4NQqsF9e9w73bhE2g1gE7WSVfHLYc/GInj3EQl4WMWw3/49XKf4QCCy65bahaH6jlMtLzwv1OiAw1wkeOTTfzK02+Zf7RHfskVSg7iOP4CLcmkhcAhzelFSGQsA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iCc1uUpTlKt5moZluVRm8uZD9QpshNc3QhAGSxw6Lpo=; b=K7K0XWJ4yXKXuA1GZct5nc2YNt8Ts/VhRZQeG/3lvV6bL9suDzPNMxpICpzNq45EfhiM6W40Y0za/cM+bY/qmzcNarJg0x8eseHDaPAVD1e5xPWX7w5qvdN3a+gnOfm+p78XFdxDQwde2SlKbPis9d7QUqpQ+6a8EW8qHQNqqOY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB10199.jpnprd01.prod.outlook.com (2603:1096:400:1ef::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.31; Mon, 17 Oct 2022 23:36:27 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53%6]) with mapi id 15.20.5723.033; Mon, 17 Oct 2022 23:36:27 +0000 Message-ID: <871qr6qayt.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 01/11] ASoC: soc-dapm.c: replace snd_soc_dapm_wcache to snd_soc_dapm_widget User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> References: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 17 Oct 2022 23:36:27 +0000 X-ClientProxiedBy: TY2PR0101CA0036.apcprd01.prod.exchangelabs.com (2603:1096:404:8000::22) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB10199:EE_ X-MS-Office365-Filtering-Correlation-Id: 273e13f2-3ad2-4690-06de-08dab0986946 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mqFeUU6qPVNcJyMSu0fagCsQs+i7dJCOsQP3Wug1MgMQICkClEabNvtHj1kwROqPIPCskz6JdqgWgt4jG4p6LP2PBJbGWuqVjL1AYPvJkeNNZsoVD9NMQb8bTzZ+UwegcZzCTEIva0w16xIEACk3/UhDfjFSF42tr5PzjhhmpP8kp6PHgmdQzBS7iQMNzC8oix0zD7cY+UmxqR8ben7O6TYicBrSSsL5vhmO0F3BRAQf1gvzD7cDujnThC9Zf06/aQgmIW7tfvjYNJiQki+mtkFFJg+DX+2QX6f8IaSa2/RSQ/YPxEYvL+RSJq1u6mXXwU2fMJD4RyNdoL3Q65P86eYOYQBPIuLRIMc/w4iBVAn+QbmtAT598JuBcdo7TN9GTF7bvSyQxIE2pv/ZVpP2v7mHwsQU1kbUODwJzkI2swqkwETn1EkwiRV7A5dFL70YlKsXABRSvAOq/tJHXe2aB64SpEHtL294rtgQy2uHCu+cWmp4nhPiNGbOeZcRrH+en5L2njhrq8F8NC0S3VNsRmG6FU8ve7D5L0M0W1MDJns30fWW72Pp+PSTzNm6S+pr6BwvY0kw/lFxlawCnhdxSS2IS1c9U8y8/tzwgZaE75CnzGujmRcfO/5JelZDv8IaPf/HexY+rlcW/v/UyfkSqtt26eebJtloX4pR5Fej1FPTsjeJhjPcwNmIKwWmAh5TLrdV6pWGn0qkPkOfZet4pj/DfIpg+fnXYcsWhTc8pfwo2dSbNKu4SWIS6vgwjwgRW2RQg2FM3GKlJnYyPpToUA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(39860400002)(376002)(396003)(136003)(366004)(451199015)(41300700001)(5660300002)(2906002)(8936002)(316002)(6916009)(36756003)(6506007)(52116002)(478600001)(6486002)(66476007)(66556008)(66946007)(4326008)(8676002)(83380400001)(86362001)(26005)(6512007)(38100700002)(38350700002)(2616005)(186003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WEycfnHjJcNKGw1t+XrwB+aIoz8HF+TYZlyetDAevFMxqSMlVjSpLOIEEQcUe5MsRPIkYEqKwbhucfU/qrnxf2ts9anUCDJ5ZTPkda/c6k5UBYBDiK3tee7n1DaZcqOEf2c5oatdYmbmr3fSt/jGC8aCFJbiXXM6rwfH85JIjQYh0H15dhPPFQ4VJVQEx2WjkKHeJ+4tNKMS8GlRiM8ZXYpx59Kq0rV1kmZLai+pj4IqeKVtEMT6tKTtgDGxeLErBuz2pobFXdpKNRSv15rqJa/LaVE5ENGjddiFozitkHU3Jbl/VvyRWuiWF9sccGjsp62Fmo6RoUP+r+rEvI2mH1WbjfnJ/TQFcK7IJ4477bdD97otGD0li3ltVZSBa8mcCPRqxRwyX/LnDnJgOcbWhTpFTq86ArrqlDneq1DzDlzx/tjDDXxaR3bCx1qmWZ58ojguPgqAQ/RAV2kNzoqvGXnKBoRVsTQfjh6X/Oc0r5S0NVJHbUJj3Xu6DLUhyupHKxdJNTV2eDmHlFQYT9pvygdZ6qQCed2smB8TZMLCv6yI5bGRLqleRsrRugqnNhciaNHGbc6gd5ucLGUcpu1bq0WfKL0wlIGBXe6hhKC9/hHdUQGHIYg4kDkrGQ8PHLtyFdV3gglp4hpyGyZMBzVSSiYPqOFBPyAsk3XwaIGPWq8WA5gtPfNKt4qb61ra8s4YEwZeN17gnrbc10y/1RBilM7EskqZi2W8j2wcZyok14xAHvBbc5curLVyP5olPWMoNMqfmgczJUvbX/W5rCTlgpSE+m+DKD7XzMyd9G5To3oOLL73yVpbG7VN1RjTw2tVLUJN+9Obw63iTU42KA6vnqmUwGOYKyRWJXcU+WF4fKMtFdzUEiDfym23CwDpqobaXdn2aoXBi4KBYnzL6u8C131pOGw+Bkap26iT4lCPkvAI0VsuSzmnhnjBUH/88HO/4/xYlptJLQ1k1si/D9zzxhZY07EIg21JgjtAUtMZiXe+fFJOiQ89rU4yUCjDdnSwD6uaokAHrNpQyFx4rzyN9ug2qMz+QAGnlrqPkarxfaC6R5lLXOgRDgM8ZYSgthoUQlbHwZfeGmAUsWKxPY1KiWLDeXRo3gikz5OXWg3CUXSAZfEAvnc0Ca2oZ3D2fSJ0RRclyWCBqly9O7FFfZESJHunAEPyf1UEQMRMMBvxd3Xt9OZYaNCRXLkaLm3GOd3cu0dlRsh0eFAzgnrGmIP9ZBv6hnd1ZwE4oowFtJr9ez4+twXjLpSdC4QkN9b24qKLd2OCX2/ddHuX2+JSxT9G8TSbS8v6uV/3I1YR6hVWn47dd5RxcUg5Y3yt46NDaJZKCVJjAUaRmnn1Cle/kvFmRr6edpEqboSfV7m8CCn0Bf9V14SaIGM7Aq3sdio4CX1w0JrnY7j6EQsaAvZ7pFSn+4QS2Ktd8xQJ9ZjzKuMSmamAy9rQMDE1gd3Xf36ETGysO6aCjhU+Et44p2GQ/C0NzeTzspSAZ1H5NzVwJgwnVKIZG8RnK/EPKphD4qGSxZuoA33Itsbf3Hky3dbrVq3son0La0As/5YwvuX1+lE8Ezle+mdQDnXklVbiuUI+KA7CBchMjaNjWKko7cXnBo0fnmBnksaL/1im4De3/d3u2a4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 273e13f2-3ad2-4690-06de-08dab0986946 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 23:36:27.5154 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ePSCNYPWMpuSo8t2mqsKgCs65zOLJYeBU1PWq2Q42VvZDmyejTWhk0lAsf2S+/zOodL3Pp2Pa37jC/j5/kPC6xf/IBvgYSCAd/HkvjElRxf8l5yuBkHqpFVzbXOi0DI+ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10199 Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Kuninori Morimoto Current ASoC has snd_soc_dapm_wcache, but its member is only snd_soc_dapm_widget. struct snd_soc_dapm_wcache { struct snd_soc_dapm_widget *widget; }; It is no meaning for now, and makes code unreadable. This patch replace snd_soc_dapm_wcache to snd_soc_dapm_widget directly. Signed-off-by: Kuninori Morimoto --- include/sound/soc-dapm.h | 9 ++------- sound/soc/soc-dapm.c | 29 +++++++++-------------------- 2 files changed, 11 insertions(+), 27 deletions(-) diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index ebb8e7a7fc29..29d5700393c6 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -450,7 +450,6 @@ int snd_soc_dapm_del_routes(struct snd_soc_dapm_context *dapm, int snd_soc_dapm_weak_routes(struct snd_soc_dapm_context *dapm, const struct snd_soc_dapm_route *route, int num); void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w); -void snd_soc_dapm_reset_cache(struct snd_soc_dapm_context *dapm); /* dapm events */ void snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream, @@ -680,10 +679,6 @@ struct snd_soc_dapm_update { bool has_second_set; }; -struct snd_soc_dapm_wcache { - struct snd_soc_dapm_widget *widget; -}; - /* DAPM context */ struct snd_soc_dapm_context { enum snd_soc_bias_level bias_level; @@ -699,8 +694,8 @@ struct snd_soc_dapm_context { enum snd_soc_bias_level target_bias_level; struct list_head list; - struct snd_soc_dapm_wcache path_sink_cache; - struct snd_soc_dapm_wcache path_source_cache; + struct snd_soc_dapm_widget *wcache_sink; + struct snd_soc_dapm_widget *wcache_source; #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_dapm; diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index d515e7a78ea8..1796863bff1b 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -652,10 +652,8 @@ static void soc_dapm_async_complete(struct snd_soc_dapm_context *dapm) } static struct snd_soc_dapm_widget * -dapm_wcache_lookup(struct snd_soc_dapm_wcache *wcache, const char *name) +dapm_wcache_lookup(struct snd_soc_dapm_widget *w, const char *name) { - struct snd_soc_dapm_widget *w = wcache->widget; - if (w) { struct list_head *wlist = &w->dapm->card->widgets; const int depth = 2; @@ -673,12 +671,6 @@ dapm_wcache_lookup(struct snd_soc_dapm_wcache *wcache, const char *name) return NULL; } -static inline void dapm_wcache_update(struct snd_soc_dapm_wcache *wcache, - struct snd_soc_dapm_widget *w) -{ - wcache->widget = w; -} - /** * snd_soc_dapm_force_bias_level() - Sets the DAPM bias level * @dapm: The DAPM context for which to set the level @@ -2516,12 +2508,6 @@ void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w) } EXPORT_SYMBOL_GPL(snd_soc_dapm_free_widget); -void snd_soc_dapm_reset_cache(struct snd_soc_dapm_context *dapm) -{ - dapm->path_sink_cache.widget = NULL; - dapm->path_source_cache.widget = NULL; -} - /* free all dapm widgets and resources */ static void dapm_free_widgets(struct snd_soc_dapm_context *dapm) { @@ -2532,7 +2518,9 @@ static void dapm_free_widgets(struct snd_soc_dapm_context *dapm) continue; snd_soc_dapm_free_widget(w); } - snd_soc_dapm_reset_cache(dapm); + + dapm->wcache_sink = NULL; + dapm->wcache_source = NULL; } static struct snd_soc_dapm_widget *dapm_find_widget( @@ -2961,8 +2949,8 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, source = route->source; } - wsource = dapm_wcache_lookup(&dapm->path_source_cache, source); - wsink = dapm_wcache_lookup(&dapm->path_sink_cache, sink); + wsource = dapm_wcache_lookup(dapm->wcache_source, source); + wsink = dapm_wcache_lookup(dapm->wcache_sink, sink); if (wsink && wsource) goto skip_search; @@ -3018,8 +3006,9 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, } skip_search: - dapm_wcache_update(&dapm->path_sink_cache, wsink); - dapm_wcache_update(&dapm->path_source_cache, wsource); + /* update cache */ + dapm->wcache_sink = wsink; + dapm->wcache_source = wsource; ret = snd_soc_dapm_add_path(dapm, wsource, wsink, route->control, route->connected); From patchwork Mon Oct 17 23:36:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13009698 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 68F40C4332F for ; Mon, 17 Oct 2022 23:37:38 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 623908E4B; Tue, 18 Oct 2022 01:36:46 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 623908E4B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666049856; bh=S3VnA6HFyhCb4pm7gl3u8l4JRYPS+WACkvOsQ2Q6eps=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=a/BytAY2x8LL0oEENMHmPwj2IN9/O7lYWEf7cw32FSchjb5/SerJUKuAENIKkEj89 Vvt9hjJSjgLn9hLA3XLqddbxEaBy70YE3XzZe5+WCAaZNeKYThUKA6GjwLpYXzuC3d 58vgM9xXaHjeVc+3a+4YPLoh1DYFBAGargSEmAaI= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 10A20F804FE; Tue, 18 Oct 2022 01:36:46 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D4606F8053B; Tue, 18 Oct 2022 01:36:44 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2120.outbound.protection.outlook.com [40.107.113.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 9A6C1F804FE for ; Tue, 18 Oct 2022 01:36:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9A6C1F804FE Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="lfitBL8c" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h4v1s1Z4lPk3b0noQWeWc1wJD8Jzj3pc0O9kHxYbynZc61fjh0ZvJsTiRtq5zK+bfcUGe6Gj/bOuyrMJXcNXs50AZOWpjA8h5rLQNZLSW1ypz14lVDiN/TX8KsRYgkD/AQBHT8b6SghzKQrM1DPaf5lmrOdjbLrT/JYsgk3+PKIMSujRfrPJfn3c7TNTKEfCd0hgx6EUqKuU5f+iOwKfoS6vVAo+xicKHD2SQzVdAypSJ8NZy5DhXBiybIJMn6ZEhTDwolV6Dz4JqpDIZxSCamK0GC3tCvhACiQyYz0A44SHoV00UsouVXJqf+gIVs5Xrk3LSoo0izUmRXWwfTe42A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+hVES2iAtj+Ki3Uwufdq4G5tHRiKssq2SKKEWfnNUn4=; b=d9fVPwRebuwwOw6zjtB3AzCM8oNpH1w3vOZ3QY2ivZAAdvCnOLubC+sSwZLx8EKQRlnoHsGemM8c9ee33ODy+fGn+qx1/aX0DGYEnHhNc/ERFtUBi5sy5RCiBjVI/6jQZrcU9RdrgNHaS5V4/u99pp172WfIE1C0KpAt6raWjxhvzyC9wdh/NleOyR1Jx5M0NvplQbQ3TW0BmtrQDGaOMGteG+oNKWExfEyrVphC2VlJlKQjDAQU/i8ziphFCOu3IOwJUZ8DKPswTroPKr+5OfJYXlhHPf9bEHAOZAwnAJ1mtcNKHX/4KTp0AJmEv77Cm22KBBzuBh4wDgxOjH3/eg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+hVES2iAtj+Ki3Uwufdq4G5tHRiKssq2SKKEWfnNUn4=; b=lfitBL8cRTEq3ryJG5O1hJuGewGx2y1ZQAHkvNHKB9s46/8uZ06hRt79/ZJx52yk29gUZO0STL/pEd03z6hn4DuN4X44Jt9mcFfFX3okyIzuLtKmsOmyvzTF+W4ZMg6aQWjWMjH98uLN2RCwcUBfs49cgTQuXOWdJKwOkExhIfA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB10199.jpnprd01.prod.outlook.com (2603:1096:400:1ef::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.31; Mon, 17 Oct 2022 23:36:35 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53%6]) with mapi id 15.20.5723.033; Mon, 17 Oct 2022 23:36:35 +0000 Message-ID: <87zgduowe5.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 02/11] ASoC: soc-dapm.c: tidyup error handling on snd_soc_dapm_add_route() User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> References: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 17 Oct 2022 23:36:35 +0000 X-ClientProxiedBy: TY2PR06CA0024.apcprd06.prod.outlook.com (2603:1096:404:42::36) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB10199:EE_ X-MS-Office365-Filtering-Correlation-Id: d0b26fca-64ae-4738-c7e8-08dab0986e01 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rG0IXcLVrjzLY4d7keeN3h58qm8lgroGeTj1PM28nU7YVYyjGXnyMQHrRb6UUjabFySmLn4spx9PhW5qVuSIXWs09yOYzL9skteVcT14hP7g2cB3rqTmllJBz9JR99MZwdGBk5e2Mu/Cdp9Y5p7gJRocUdLy37yggqHbIewZYg2OMuARHKmHqlO17GzBpu9YM0H+nzztWGVaxQ0CrflVxyGJykatZdU7kuNZw/BPfHL2X0NDPOT5HRGvtS2+PeIHCpjTrOFaYbFElbkxcNqk0s/wkK89utMhtIzY/pOiJVdwRQE4raqGximz3CJWQULbvCpDqNYiTOZs9vNRApt2IxJ5ieXsIAgvOqGA1LPBlca7SLINXY/Hb+CW8ZRKPN5l7xN9DUW5Xt1G/4eBmNv9y6H7AZL8BkPPEQlpdNlhCV1ENaRCAzlppCOqDMiuMnJUPyb4iaO7mWspItU8e/wFrnv3e+UCLN/w2LAvfw6mq0KzGoTjU+C7uS39jffxj+IMR6pWJjqrMez6Dm4WRi07iuABdP3JORuqlK7/joSliFYt03/mktbw8hNQgHG7cxYK8v+DBM+BixiWwW+ei8aR9ae6fnR7PBXBi1j4Yfq17NfcoQqkc48r+t0/fyRFWLs/PVqMco4x2rwIwzv2/fekN1UikfN+pnR+l7urCWP/q7FfuVYbguo9JgxDTd4yERraW/kPVxfXESlMelOGb2hU5Stud1JSo+5LoHo9O7CUaJnoa23Vd5gsa2p+P+Cmy6/Xv4ohsyYqTOeJAUFzBSYr9A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(39860400002)(376002)(396003)(136003)(366004)(451199015)(41300700001)(5660300002)(2906002)(8936002)(316002)(6916009)(36756003)(6506007)(52116002)(478600001)(6486002)(66476007)(66556008)(66946007)(4326008)(8676002)(83380400001)(86362001)(26005)(6512007)(38100700002)(38350700002)(2616005)(186003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: L4q8TbPdFcj5F+pGctZTIjShS7noXXlSNiVi28auEHLuicXjh6pcDNmtNCZh/QQa7NKLD3kxzVMuRiSshZGRY/o+R87wN0W1FfDhJkoFwSOLi55WlVt5E/H5QCCZ2nCkrcGDBpGxjh7MF7huPhW7e8EVdYmXSQufBqcTVIAzP7emXrG54NwoSHxd0KiYd+Bog5hBNPjPh1EmcsPY7N4RE943diGfRvZqzxDVbLzjHpCTIm+QPGOoKKWSTWv/AU5eIs3ayYU84C0fjd7ZefMtZMNVs8P0zVr+bKg/plcL2GqF1MnR/TVaWkCg1Sdmh2JRSni478/FGChjwbgZKVXY113ekPcBEBMZYVrhH3l2WW7KtRIzHMCqXC1HkIlCQo2efg3BtDR5/nLhmoa20rLJ+EeTLqDpyC/AjbEGsida1VL9+pX6nwW2/kdTWsx6A14nd+LEjROuq+JyjmC46+ubQ697KMJJYelBCB9dHtabJOG/dSUPwFCJSCRP45okgsN/NpG3CkGJBvtH3Hr6XpLTgDkxsXVXaOcB7l++Lh6ozT8a/mVP9esl5nhZ9bYitwUdGN/4mnYhtaQL3Q+AWLYOp+GNqHy57J6JFGsHKu3hO5/+ETUagbzgJWoC3jm1sY8o8RMoVdN5TND+eEsW8CLnLjS3TSJgBncQQRAzlErQIjxlqQkRo73ZrvTCIFOiB8yh8nUfsEN8/8E/lYq7HXGyP7W3pAKpssvwqExG7/ddWc3GW9qaoa5XDkTZUqNf1poLiFgv+9RqAzCBeAwXgpGHOppu47WNY27+iEyFeELa9uYgY0v2G+XGMJFeVnHkZglO2WC7A4GrhF60fKzSlmxFbHfcUfqm7RGP0cT6r7ODnP7RpultLxvS4cPGcgbhoY9ffnbgp3mJputKfR3runi1z/ecmZEdo7yYlETn3riWdymq7zsZO8mVTDNsKKoJyy1uvOO5thlfny7KF0wA3lP7lgHjH4wWO1aIWfH1x5AwkZ/4P8RDU+evYkSL8klIT88Knyaukt1xk5zty4yqlN1fLm6fwtg+SMxUtnos2JTg0BFG65FSmsNG3xLfdaj6isZd+FCyz6dqW8WT+UTk8hlaSIVyoGV+Uph+dZAyHGV4yM+ksNaxadAtzq74sDODKrJ3ANX7jEo4ZP666dTvpTbIYltBGjzyYNy5lk33NETQt3L3fVRqUhbl9rS34Id1IHGm4CliMJlRA4PL3ZqIDsWpNY+hvf7QXzFIITvc5IerPoGJcUOn0VIlhBTrdYGL+m1TsC3BJCVGYeLcEnuzHoMH5XDaqEphReCfejWuVND5XdzZeNXKq7CKVIUJtY7E9qvVI4PkznS5tmPHUk5kS/7QjKj89NeaPLd9T3BWj1PXyeVXSYK6E0ce1O6mVmC0GecPePixwfFRhaOxgrXJ7RhluFySKKxLhIs8K8e6X9C4eTDesMon9CaYyp7oZgR9He8hQ1WJp5MomK/lvkzSmsSvMt3/hLDxkN1A06KsI5Y002T4+PJMxmuIQRo7JI2lUa1+YForFqm76mqyKpyxvESQgNE7q0prqq8R2BAyovfzcBicGgeQLzx/mi9a2uIrI07VVhRrNVDlG51DN3q05+o+Emv8vhNp1w2Im1e3fTbNJ84= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d0b26fca-64ae-4738-c7e8-08dab0986e01 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 23:36:35.4411 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1emxR6a9nhKEirdfqwZvRvrPBqHnfD7Yt/BgdBSWOaCena8bEAbB58GFgG7SIPPCyFjvIu3FmEHZ6GT0JGZocAVN31rH6vg4M9eAak12U3b4RFMW8SYKUCsT/o8/p2bD X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10199 Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Kuninori Morimoto Current error handling on snd_soc_dapm_add_route() has some wastes. It indicates *own* error message *only* for sink or source, and return error directly at (A). OTOH, it has similar error message at (B) which indicates *both* sink/source. And more, (A) is using dev_err(), (B) is using dev_warn(). (B) is caring prefix, but (A) is not. (X) int snd_soc_dapm_add_route(...) { ... if (wsource == NULL) { (A) dev_err(...); return -ENODEV; } if (wsink == NULL) { (A) dev_err(...); return -ENODEV; } ... ret = snd_soc_dapm_add_path(...); if (ret) (B) goto err; return 0; err: (B) dev_warn(...); return ret; } Above snd_soc_dapm_add_route() (= X) is called from snd_soc_dapm_add_routes() (= Y). (X) will indicate error message by itself, but (Y) will indicate own error message at (C). (C) is duplicated. (Y) int snd_soc_dapm_add_routes(...) { ... for (...) { (X) int r = snd_soc_dapm_add_route(...); if (r < 0) { (C) dev_err(...); ret = r; } ... } ... } This patch (1) merges these error message (= A,B) into one, (2) use dev_err(), (3) remove duplicate error message (= C) from snd_soc_dapm_add_routes(). By this patch, it will indicate error message like this. - error message with prefix - not found widget will have "(*)" mark - it indicates [control] if exists. ex) [if no sink with control] ASoC: Failed to add route SOURCE -> [CTRL] -> SINK(*) [if no source without control] ASoC: Failed to add route SOURCE(*) -> SINK Signed-off-by: Kuninori Morimoto --- sound/soc/soc-dapm.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 1796863bff1b..b4f876dff994 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2994,16 +2994,11 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, if (!wsource) wsource = wtsource; - if (wsource == NULL) { - dev_err(dapm->dev, "ASoC: no source widget found for %s\n", - route->source); - return -ENODEV; - } - if (wsink == NULL) { - dev_err(dapm->dev, "ASoC: no sink widget found for %s\n", - route->sink); - return -ENODEV; - } + ret = -ENODEV; + if (!wsource) + goto err; + if (!wsink) + goto err; skip_search: /* update cache */ @@ -3012,13 +3007,14 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, ret = snd_soc_dapm_add_path(dapm, wsource, wsink, route->control, route->connected); - if (ret) - goto err; - - return 0; err: - dev_warn(dapm->dev, "ASoC: no dapm match for %s --> %s --> %s\n", - source, route->control, sink); + if (ret) + dev_err(dapm->dev, "ASoC: Failed to add route %s%s -%s%s%s> %s%s\n", + source, !wsource ? "(*)" : "", + !route->control ? "" : "> [", + !route->control ? "" : route->control, + !route->control ? "" : "] -", + sink, !wsink ? "(*)" : ""); return ret; } @@ -3104,13 +3100,8 @@ int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm, mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME); for (i = 0; i < num; i++) { int r = snd_soc_dapm_add_route(dapm, route); - if (r < 0) { - dev_err(dapm->dev, "ASoC: Failed to add route %s -> %s -> %s\n", - route->source, - route->control ? route->control : "direct", - route->sink); + if (r < 0) ret = r; - } route++; } mutex_unlock(&dapm->card->dapm_mutex); From patchwork Mon Oct 17 23:36:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13009699 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6CE58C4332F for ; Mon, 17 Oct 2022 23:38:00 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 0D61A8E57; Tue, 18 Oct 2022 01:37:08 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0D61A8E57 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666049878; bh=I5G02RjgMCidsQZkbTBCklj0B3k+nYhlPWYxJx0trTA=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=X7KHvYbeSbjEuTuk8OBxVB0ofkWNxvpQC0zd/FpBvcKlHUFPldeBYKuzlHX4FONXf DiyYwIawMgEpLMaeZ3kV9/uJk9/cnDKM1jJzryLaJoFT6cXlLwCjkAafrmwId57T72 IrDW51pNXUhBOmroLuOs9GamY1qn/LLcwxG9LTkE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id E0999F80543; Tue, 18 Oct 2022 01:36:56 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7AB5AF80543; Tue, 18 Oct 2022 01:36:56 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2108.outbound.protection.outlook.com [40.107.114.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id ECDEFF80548 for ; Tue, 18 Oct 2022 01:36:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz ECDEFF80548 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="IqCxCu4M" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GQEuVbBY6HfEUyJwycWF6ErkKuRAWml2wCM8KWgFKIBW0aroSkFXq7IaWklXINHxzaFM4Eqe/XbCj3fUAF6lifnDlUAXQ7uWF/T0HmkI4RFCTHD1GlK1etD7TCcUzqPXdBA5Scnokq/gwYCnFjVCusPshpm/S3chLpeiPVIEImuoAVpYRNOnocgqfNj/QeQQ5U56uaGkKTyyAqGqUgAOZOJY8560oDqghMqhuaqKQcZASqPEWTbPgqLJO7Uh+AUTnjNFe4WrKrwFyBtOyQXhrPA4dLSFRJWgFQ4LY2VimZND80jqhRVlb9IVqvuEwyjFAXFhZJ8Nw4wB1quseZxpLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=B+OXH2PPYfYsnFBFHjj9DsaqwdSQr9JCKTvuxXpwQco=; b=KPLdVVSwtifV+oYTQ+rIh5gYeOAQWO8wfxP3T1JswcAj0xangmn03f1UVS6G0P69CpK5DyGX5/yQMawB7OBWG+nK+K47Zne4gcoHe7O5VMaTR6x7yu3q7YRowIGoZdW4K3/zHxRkZtEK2KxHEuvltaj1nEX5QrQqrkEmOGFA6Q2pnXhEreMJxeA0/xoE7YcSRhI3f2AKkgRXjo2spfu9I/XNzxvB9h20U/pRavBT/eWd72ginwck9M5s/FtiSn2OPynCFBuO8XJcE7Y+nteHyvM8gn9RxzJEGy44DjhlyBLCoB+9SZ51FbRj9jf6wExStOmIxIuitN/Xv7Xz2/Llpw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=B+OXH2PPYfYsnFBFHjj9DsaqwdSQr9JCKTvuxXpwQco=; b=IqCxCu4MCdqv15/cIME8q0wKlPgrL53KPtecdorzoxaPWkbtpstRQBq+NrmVNQylIlARZ7rPtjBAwUTskqs4t2K/SuhwmaDnwy9auosP4QGHq2eD9/FEXF3S+20lXDhPKuRnUi9dkyvH4zf6m9zC82tXe6dpVPL35hB6IRaMAfg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB10199.jpnprd01.prod.outlook.com (2603:1096:400:1ef::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.31; Mon, 17 Oct 2022 23:36:42 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53%6]) with mapi id 15.20.5723.033; Mon, 17 Oct 2022 23:36:42 +0000 Message-ID: <87y1teowdx.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 03/11] ASoC: soc-dapm.c: remove no meaning variable from snd_soc_dapm_add_path() User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> References: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 17 Oct 2022 23:36:42 +0000 X-ClientProxiedBy: TYCPR01CA0130.jpnprd01.prod.outlook.com (2603:1096:400:26d::18) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB10199:EE_ X-MS-Office365-Filtering-Correlation-Id: 59901561-611d-4ea0-3a79-08dab0987225 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KUTW9V05hD46ZyR6Zyy8Ci0F32MijN8AHpWxYXFVplI3clizfsR/1hwuaetf75CA6CIeEkYDJmvyWxwZFg6Nr1ebGNMNpilbtV7zn0lJQylnUF0IMmW5s8KUItp+wzu53Sa4HhRUpAtMEoFauZ17bmXUU2J41s6DtSa9FEpAnaJwuYzdM55ofBZNjeD2OBbQ0/1jdXDlkbvtscD32V2ngKrhHgOFoROapeSw87viJnx5V+5rLKLYaQjuS5nQAlfbR3W30kxrIV63GfgApv+J6WGrBKaibM4cxJKRFGLG0D1lEiG9kyC2sy948buChojFw6Wnh5+8Ioce6Izy6IlG5Yxl5JiqHHAbqtb/e6a2eFbyNzq4BaNAgprmK6YbNkun3ATBrHMy+Xmk6QxIwLFC/wcws8+Wciy2ZgrcFrz6sfNHoF6GXj/7OXVSYUsSXsCNAFLX/fuYNLGsQOiOPePIczFnrX94XNoty2aYcyP7at8qxnOVlDvIb7PrgvLxwIlx5fbodjdac0jcDM+fo79pg79zg7yysqg0vbmPoMJLkyfNCE3+ripufJyLKMkGOGvW4lAUBC2w6aAL6DR3NGZymlgFV6Utb+TCJFMRVuRgLkUbCV3ReuHRFeNC+OYB1mr3tGypm4Lw3kln46vVe1G7NA3y/alFLfrtTNUO33FBiuGOx+utK/PLhvCt0P4SXAmX+ODMqKk43nhA6kJ2ufLmLXNvky1NSdYM6W13TOTBajFMVhfK5rniyld3EBrKZiKfPY+iT4D2n+tbBQI+4EMHhg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(39860400002)(376002)(396003)(136003)(366004)(451199015)(41300700001)(5660300002)(2906002)(8936002)(316002)(6916009)(36756003)(6506007)(52116002)(478600001)(6486002)(66476007)(66556008)(66946007)(4326008)(8676002)(83380400001)(86362001)(26005)(6512007)(38100700002)(38350700002)(2616005)(186003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +wDT+m88YzL9VV6TXRRpSQlLtWnm8xd0SGGPJE+V66XWRPLPRzcvw2wY8ntNReiKV15OisKyFzAX7vNiNrdiIyDzPOk21CoGHsZ2JzvITKnMJ0O3OEX8RcEAepYbUD4Q1YHJt4bMQd1e5yIn1bTB8Uut53Eek0JcN4e5XxE+AfCqOGsv1GEChQtY9oNwILr2wGwO9pQutD0agUJsbxmwtwAslpADMtXsQtUF9gGJ+fKLH7LHlau55TLf5ioJKiGINpWdgg3Un7BJCaY4ZdfOFvguSUR+UjNgThNizPWxbibp8EqR8vMMO56SW8RfPX1MA/tK52Q0pLPzcim1GfuuRHNb6pGKnLTyYC2dmqtfvh3utkaUnIPnBrVfJ+cWwGbQylbYpXiltzFS3YXlEvT5f+9QJLgdExEux169bVnPdDSgrGh3sTWX5cvR32QCq8JH47nqYGFUD+i0NcwLkKcxT7Z6jZ3reZJV/bgb17/o87bbPBoVtHYbfeURviSScKsYwjC6WdRjkGa7G4CoyIMozdln5EhfQ013WweZ8QUMmdZb5YnKQIN1skzXRQm0jSFMtfMoDYG1ACkcZLM2vV2cXBj5REoXNuUUGHVdJjWRjDWF8a4HmjsO0MjBDM4+ljwVBd1g/5PKRnEmSwugwbCBt5KIzNQX3Fdc+ClFlX/IxT7CmJCGIsibHTqJrHuckHmGEkwV4bHREgkmlzUdv1qYNK7mn4FN4XNHDW+IgGPTkVOmIUfRy2WxV5yju9Ucr5CwvfxJWPSoIHEcprH3R3BXZZR1IqzF/vwj6Z4T7GbmsPwGszle3MeiYweUm9gYSjESjGByhPTwWSbK/4DL0wnXl7rqkAkRw8y9uppY2JDoNVlIVcUV6nU3zw+oLWAcu/tGWnXdFNIk9rPAeGnqYo6nKinNMeGmWi4ZJ4Dzvwwg9i9dA3mB4wJa53NlDV+rNf/QMSI5/1Fim0LxfoS0U+wzeiEYXV8SOPYa1969nLpTSpJOxzVdjEaNyqXjN35VDrd8NkakITr2E2fJHeGOqcKcL3CGxtXLyXiBvnBBaHEcCzII4HdpgCYkVrDP6BUZ2+eiwORtF6wsjSbsPW58A90IIlZNpF7Pzg82bLXO9V2pYdTI4XkGDGtUYskNT8PZnwXvS7Gy0D5XUZYsg6L5Q5gU0pLF0s5Pws0a0VavA7/DgELGKYOw7lZ1I+sf4I6ENuX/YQxt6FM/z9rFJVoodQLRSbAse9QgBgvii04xso4FkcfCN7fPFpm+kfO7+39UNlCKpR0tDA//8pCzEhKoX4vthynBNuYfnN/RXv43thvIHi8WyzFm8K0F3UNs7Xc3jaKPdYRqBfOdjngb8qGCe4jDNHBc1hcsUAZRSm0X3lu8oEznZKDXeeZvdhw3jZ2ti/vQM6n90kNl5MzF7Nnl5+Na7x40zzJVklX4kyJ2wlU7XvW8g111J3TNIVg21/Irpqpq7qYdRlQmXDJIp7LIYlMwnjsxPQzapIgpu3h/VJp0wSlz14OUZzhh8LCmBggIioeo1QsiCrrNbrDpzRoQOkwqGC3ngaG1ZMWCJoJZBXsqTK3S0LkDVfNsYTugFnklhsksH1WFz8jPivdSIm738ui4JFri3KaX57uBKn8hlWRbuwU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59901561-611d-4ea0-3a79-08dab0987225 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 23:36:42.3844 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nMa4BUehiy32gFsVhvEkLSLsO7RDnJf2TjkeWt2RM7KXGpujftKWMHjF3KtlmZwR+KF56Kjqyrwza6XMoFt9CtFnA8drg/VI5hWoWRdyqa7D4Ws+OKV7HRDY+hJhC2NK X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10199 Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Kuninori Morimoto snd_soc_dapm_add_path() is using local variable "widgets[]", but it is same as path->node[]. This is no meaning and duplicate operation. This patch removes "widgets[]". path->node[SND_SOC_DAPM_DIR_IN] = wsource; path->node[SND_SOC_DAPM_DIR_OUT] = wsink; widgets[SND_SOC_DAPM_DIR_IN] = wsource; widgets[SND_SOC_DAPM_DIR_OUT] = wsink; Signed-off-by: Kuninori Morimoto --- sound/soc/soc-dapm.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index b4f876dff994..f9c4fd11853c 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2826,7 +2826,6 @@ static int snd_soc_dapm_add_path(struct snd_soc_dapm_context *dapm, int (*connected)(struct snd_soc_dapm_widget *source, struct snd_soc_dapm_widget *sink)) { - struct snd_soc_dapm_widget *widgets[2]; enum snd_soc_dapm_direction dir; struct snd_soc_dapm_path *path; int ret; @@ -2862,8 +2861,6 @@ static int snd_soc_dapm_add_path(struct snd_soc_dapm_context *dapm, path->node[SND_SOC_DAPM_DIR_IN] = wsource; path->node[SND_SOC_DAPM_DIR_OUT] = wsink; - widgets[SND_SOC_DAPM_DIR_IN] = wsource; - widgets[SND_SOC_DAPM_DIR_OUT] = wsink; path->connected = connected; INIT_LIST_HEAD(&path->list); @@ -2905,12 +2902,13 @@ static int snd_soc_dapm_add_path(struct snd_soc_dapm_context *dapm, } list_add(&path->list, &dapm->card->paths); + snd_soc_dapm_for_each_direction(dir) - list_add(&path->list_node[dir], &widgets[dir]->edges[dir]); + list_add(&path->list_node[dir], &path->node[dir]->edges[dir]); snd_soc_dapm_for_each_direction(dir) { - dapm_update_widget_flags(widgets[dir]); - dapm_mark_dirty(widgets[dir], "Route added"); + dapm_update_widget_flags(path->node[dir]); + dapm_mark_dirty(path->node[dir], "Route added"); } if (dapm->card->instantiated && path->connect) From patchwork Mon Oct 17 23:36:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13009700 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7C736C43217 for ; Mon, 17 Oct 2022 23:38:16 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id AF20A33B9; Tue, 18 Oct 2022 01:37:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz AF20A33B9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666049894; bh=1KvCwReGeayU6hmoQJ72YHG7EE+9x7N9TR65JcmKXM0=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=lX1wkBsqXLMM2NbtIVyXAGVzNgPkPWwX5hRc55hzIaP0yOSik3v8wLvd5EOBrvHvW c9VdHd+N13jUC7YMqg9DiVwUMCI/ww4dePEMrvJXTp3WZuCcUkLSRtCmje1+G3ND29 8hZ8/cQyAhbW4oK5Jrmm5ONDNNQsz4+KtLNoiVpA= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id D18EEF8055B; Tue, 18 Oct 2022 01:36:58 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4DC0DF8055A; Tue, 18 Oct 2022 01:36:58 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2108.outbound.protection.outlook.com [40.107.114.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id D3657F80542 for ; Tue, 18 Oct 2022 01:36:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D3657F80542 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="R0ST2PHi" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AugTApEOH020pNkTlXsC6jhezKaYU8w32p0+ng+nmFf71op2DW0V545YbPQVi6ZzO6flX3pP8QTUdGVLIMIhzwPQIx08UlLRS1Q68biReGKQ37u3NmLFuh8ekhe8nHP3ehbdWHbDFDMoao6vOLr9ABTz3tLCzVydRmmkAesUfcxZ4FatpfkYcyyWZx7f2wTkiBXsvK4dRFdrGWEXZQ1nv0jTVXU/JBbOwdV6gDXDm9Wub3zhaG1ozMuAcSwaS86FwUTVP6x4ceLGywspFimXatSG7IZC40hlf/WdSUl2riLkpy/iJghtn4z3l7tTtTnC0SsgTB49/hYMSH97Y2ojmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Bu1YmXBT19kFURly2I2kxfY267k/jEYm/1vVwbXwGFk=; b=XtNQaaowfBzNR/dg103EK/yKJVM+JpJjIoO2irR60ghbo1tqVaTx/h+QqKfGH4D1BWol9r3/tx2z36M0M6WlnoYVtsNAu5ETHJKWaZ7mEXYWVWnSY9yP2Vopr7YByqrAjkNJMn71BYaVVMfY2NIuijsRX+ruxs83WSmAUMGzuhz2y28cvlaSHKkmQRynHRy2gjL3zCz7E2l2rMOLQCiZoFySptPpHzXzXcr09cIuSE2904FwGx/WURoKkR3Or5y2GeY3w484McrsbcbYoNBhWvD9OPZ2YH6voo/OafNZX8cukhKd7feR31EYeKkgmFynhVvbrofQPoOr1yoXW1VEvw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Bu1YmXBT19kFURly2I2kxfY267k/jEYm/1vVwbXwGFk=; b=R0ST2PHilfa2RvI3CPpID/0JwJ5cdGRrzlibpvMlU1/sAmipW9CXAxCr6ALYKZZy1lMUWQe09Plz819hfhKycAJ2ogObQX2ePzLuHFw3/NfBHMqHTEQu2p/YPRYeEsYHxoDRrG3Bb6thQo3Bbw1qxSjzkK7uKdVpE7AiDdL/SJ4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB10199.jpnprd01.prod.outlook.com (2603:1096:400:1ef::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.31; Mon, 17 Oct 2022 23:36:49 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53%6]) with mapi id 15.20.5723.033; Mon, 17 Oct 2022 23:36:49 +0000 Message-ID: <87wn8yowdr.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 04/11] ASoC: soc-dapm.c: ignore parameter NULL at snd_soc_dapm_free_widget() User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> References: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 17 Oct 2022 23:36:49 +0000 X-ClientProxiedBy: TYCPR01CA0008.jpnprd01.prod.outlook.com (2603:1096:405::20) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB10199:EE_ X-MS-Office365-Filtering-Correlation-Id: a49528df-0fa6-4e13-e6c4-08dab0987648 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t3tBfNz+xp0m64QCXEyN/SmOkBU3Hoo3GRNDoNJhAO/QFui8/181l9u5ENhXMFbEgtHH9nkye0ayGrZ6r66KIDXSocyzOPWmoSOKI3CoeHU+l89ozhL0h1shEsy7bHi3K8LtN0fDHZ64UIdQDHBRUIOxs7V57/fTyCrfuUt37vhFfgm9crKDebL7aZ/ocvRjn8xQwKoZWJ0SfPeA8I5D1vOaGF53JTiKqeEIPNLLh2k1oyYgQvknofLQ0SNYUHStc+SG2OdM7VCjDY6wenP9D1fY9z+x4CbnvUf3I/AAfftJtLrq+mPw9h5G7Xg1LBfaMOl9G9WdqGWcy+WdJPeZt9tSDc0aix6WzZnwpCKw5JzfwUg1xaK3krqm+G9c5ob3itnpchninaIqmJFvT2OpZjrFI6CBWSQyYWMt9+nS4TLNPXrheETnDkQMyJsA0IrASQm9lb7SIQ5R8IGTD6jwOTx7+29KyuPJDwc8uVIl71l62bG2VjJrHT+QjcyDSDiF+NNMPfPooL8OpYuumHPm4wXpdGmSsSnMXSA8TygSYnaCloNA7PZlQdOB+ZcckpeeoRBDlH7qvXVi13aGvKvIsfnYan17+61ftl2pT42weayaCUKS56iGUTf11s3IGgo58BQ/W81epFJKuZ2uP3hMLmfWAHQZAVPQ5iWYN87/D3r0ATfeTtVvsccN9WtmxDOdvmTqiZLa8ohp/CzMtnOLr+5tkwqIx4/wAGWqMoqX6MbhpTOtKq88Jeyv/TkUksrp3aghwcBBgWVzVNIMGTgdcw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(39860400002)(376002)(396003)(136003)(366004)(451199015)(41300700001)(5660300002)(2906002)(8936002)(316002)(6916009)(36756003)(6506007)(52116002)(478600001)(6486002)(66476007)(66556008)(66946007)(4326008)(8676002)(83380400001)(86362001)(26005)(6512007)(38100700002)(38350700002)(2616005)(186003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wwhPLXZJYYplAWD1mEceXmXcd/5E81OMY2q0FveW2e5T06UzPYgM0RePRo3sGZE2wP6aC/COXz781R24VmF+wKV324Bz8Eur9eZz80U6GmBuEaY3ctu3/5YXSUcOOEgWRJC8nmbQbXS4ixfr9Puvw9RyOgVMqhXt5M77E8iRxV5WWLUvyDPgfWNxHJpMBLPQ6U7emwVWtuO7bGxu8e30iPrJa2tls17NFUfAids0Eom32SqdwKBNQcIVVUw4D6gIOVmRQaEG9660jfZ1BP50b7ecF2vA4jOx9WNiUUo/CvKal6gUFWY5lV6ba+0X9emgX/4csvYo267EtM2A6zqnsBupSN4fUm4OCXoPbcnNNiBcsxl9LJc/eyFExXHnXgaI9GVa7CjFj06NdiK4T59tNBQbAnfbzKxDmw1QM4g6uidoB9GvRCNX3mV2UT55UAApuUWq05NQeNmSOh9pSIt2IlsV/hKAzex+N4NqeQTUDqOzFSLDb3iKvX9eGpt+uVKiUeOvp77iUfEbTFcaFIlMnhZTzqbFXdzceGNI+p7pRP6+WRAK6Cc2h0+oGBsIHaYVG30Bkpzf1SCIaVtCWb6X2R3lvh1etpgk958QjE6vQbDJNTeWuF5l4Yakvl04Vf2tqit7OTktXtbssRMvums+ASvqaXcd5IdWyE9qTBdZgzFDD6UF17ST8x0Nal6fu+EG4vqxIORxIo0228p+Cgckt7qjcUCv/uTtzGyfbeBeRGx9JWKxac4ECjS/GU1XKpNkU0QF+iFk+mTbaKRDdm2rz5wRBrg0DhEr85BSsOoZTvNpURPqZ0bn66uGH+lnMFSitAMy5nxnlctQdzPFBwSnOqs1Ax2XFc0o0hzJIldGDVn24NTcr4btrWY8thkLc8kcgk50seCscEOyj8Bx/afZ9nlkvWSIU9FBeEOn+lTLJapU6XQOpDOsJE04ABtQsXOoGi33lt/cedUxQCCv+YSIc9i06Phn5wtscB8NmH35N8bg5xpFC5iMhmk5HlAEyyCw1k5cwHnS8wFXl9yfGAKD4CjJVAkIHXuTYo68i50/Q2Ofv6G6cyalVwpXT5e4Y0wdCZK/Q6zckLLtr0Vdw2fDmxQSMuB2n15H3a2/FAZ/ZKlC65SCpLYGHbFkZZfJMtx08nihgQqomCl8FIRQdlPaExANLDW9UNcTrcNyqTmOH8KVdL09nLENo5j9/05llAXG1I6sruxDW0kPwvfBp2WEBTmD4EaF3uDpKGPH/gf3czcY0+EdAf9IuRMub/lPL2guVfLLE4sgWPrlCnxUYRrLpYs75iBoTDy3pz/Ea8MZrJ0r0yk9qt0PWrJlkvcW9OkzWEBgnnHpTuYs/A8kqk5c+9xFnINkmk3SnGzlUMNfSICKcBqoBc9AhrfiS5XCwe/3x8RtJARJHYDCPgxsP8Pj9hOdX0D5lojlRz0pytgQrn4LsaoT7z7dsvOetDixnJgWInH1y8EH11Z26J+Q6zQURkapxyGuSV1HLpZTdXrhMJy/DA7sroEp24acxz7huwaGAKnK53IHT7rOSyKL2zvUKDPZixPHkm3s5PYQCsAMxKMrKgRKPlYHORfnFnSwAkTgD7W66BotOvllaJRQrM51ntiUzFL7QnP1Dpwo1b/JC+4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a49528df-0fa6-4e13-e6c4-08dab0987648 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 23:36:49.3759 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /8xwj6jy+oFoJCR0uKD4k/q64P7gw1+GrWzRf1UTwbsG2xTWFLO13HF9rhgnse3GvBimRmF3ZlpYBHQaQByxtC7+PVPeNKUJJtJAYRM2SNVWg5TmWMpp07uqiSNKRs9l X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10199 Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Kuninori Morimoto Currently snd_soc_dapm_free_widget() is assuming input parameter is non NULL. Thus, caller need to care about it. This patch care it at snd_soc_dapm_free_widget(). Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/hda.c | 6 ++---- sound/soc/intel/avs/pcm.c | 6 ++---- sound/soc/soc-dapm.c | 3 +++ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/hda.c b/sound/soc/codecs/hda.c index 61e8e9be6b8d..a79916ff351f 100644 --- a/sound/soc/codecs/hda.c +++ b/sound/soc/codecs/hda.c @@ -130,10 +130,8 @@ static void hda_codec_unregister_dais(struct hda_codec *codec, if (strcmp(dai->driver->name, pcm->name)) continue; - if (dai->playback_widget) - snd_soc_dapm_free_widget(dai->playback_widget); - if (dai->capture_widget) - snd_soc_dapm_free_widget(dai->capture_widget); + snd_soc_dapm_free_widget(dai->playback_widget); + snd_soc_dapm_free_widget(dai->capture_widget); snd_soc_unregister_dai(dai); break; } diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c index 8fe5917b1e26..8037b15cbdcf 100644 --- a/sound/soc/intel/avs/pcm.c +++ b/sound/soc/intel/avs/pcm.c @@ -1016,10 +1016,8 @@ static void avs_component_hda_unregister_dais(struct snd_soc_component *componen if (!strstr(dai->driver->name, name)) continue; - if (dai->playback_widget) - snd_soc_dapm_free_widget(dai->playback_widget); - if (dai->capture_widget) - snd_soc_dapm_free_widget(dai->capture_widget); + snd_soc_dapm_free_widget(dai->playback_widget); + snd_soc_dapm_free_widget(dai->capture_widget); snd_soc_unregister_dai(dai); } } diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index f9c4fd11853c..5280a1aafb92 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2489,6 +2489,9 @@ void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w) struct snd_soc_dapm_path *p, *next_p; enum snd_soc_dapm_direction dir; + if (!w) + return; + list_del(&w->list); list_del(&w->dirty); /* From patchwork Mon Oct 17 23:36:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13009701 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EA8E7C4332F for ; Mon, 17 Oct 2022 23:38:27 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 192A43EBC; Tue, 18 Oct 2022 01:37:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 192A43EBC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666049906; bh=wkT7vfErJJWpsTviw+cbKjtO5uVl5+jnPpuDbSK6gB8=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=m4p+tvy59YRDcXuZLC3UvCKJnEYjUBf9YHKT7u41oahoYuLurBOZtnPFtMi/tlJnf 7NQou/V9nmbtCKaXMChsvwhDyRPXpfQNVDn3/OcIEr9EBqqsuDWJFSlbNYp7UL/VXq zgIZ9p2ujJshMTZjiEAG7a2OzLprI4usvAxVgZco= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 6C95DF8053B; Tue, 18 Oct 2022 01:37:08 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DB702F8055A; Tue, 18 Oct 2022 01:37:06 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2094.outbound.protection.outlook.com [40.107.114.94]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 1D5D7F8055A for ; Tue, 18 Oct 2022 01:36:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1D5D7F8055A Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="cVxgv5yD" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gonKLXOQ1jnqzPaWxCX7XDRCPBiLt6CFg33c6SkEkWwbcnd3ltMNxshzcFq20bidZ/8gcg3v9EWnwjHgAxzCxu3W7XNNh8w578QFSRMZJRM9vBbcuCcADoBsl4GnscBVnrrgIQrWFcwrqvxp5UaHRo8LDA9LuNYXps7zsfYHWJJHYPXZIEt7bBQO5lHP9SzMD3Np0GaprImC67xE0VHU7QXjhGIJVKy4vPmcgfGhfkfmSzUsiAp35NF9Yt5Azu00I/qBZnkdfEBDgMqNbb42yBwixvUEhIPtTP9YsXXVsymJ4ztVdjqF4HQaNTgCT8IcGT2VnW9mKiNL2jAXCLN8/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=X6BjvMMYbeznEwmDLvJJUjpp7ttpBcP0nkK3R3c7j0I=; b=Z2a4ivYaMzLVVEyxK6WPEzV+uVlthFtIF+i78VcPZqgLMN6JPp0zBvOgmYX37mFRhMsm9DzZgRI0dZi7+puQni2nUhLOJ5z32MTzu2G3wpykeg0syGe1euSqzhZ8M9W9XUVo/l2CIIpgrt+L6zm3eX7QqubHb0Uxf/VEGndya+PqRbQZID1TysPkhkI8RzmrMnhXGPhmYgQuOMscABVEQlp6K9KAtAaEShuj8mG6+CV3Q76zA/nHCU/YTjk7qLgZi0dS4tejCxfLA/icpjHQX5jQrgrvjLwYKVjMVxnkcX9rKfq4Ny8RqnYouhbSNMGg2L0B1rHZUNcdcH/6bSsDUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=X6BjvMMYbeznEwmDLvJJUjpp7ttpBcP0nkK3R3c7j0I=; b=cVxgv5yDx+lmyyfgQCJsly3ZZPwwSRAFGrSaXNBKS/a6dBAXpK9dWSlhiuPgRkB/TmhgytoNSqNhdbl0q1HIHlW+GKxDYexJqQFKsrzeWlxo66gd8jQv+mvnsCsxYgu8L7t8zc6Ty0K5/nbtRaLVyR4zXMwargmXevyChzMMueA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB10199.jpnprd01.prod.outlook.com (2603:1096:400:1ef::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.31; Mon, 17 Oct 2022 23:36:56 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53%6]) with mapi id 15.20.5723.033; Mon, 17 Oct 2022 23:36:56 +0000 Message-ID: <87v8oiowdk.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 05/11] ASoC: soc-dapm.c: cleanup dapm_widget_set_power() User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> References: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 17 Oct 2022 23:36:56 +0000 X-ClientProxiedBy: TYBP286CA0005.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:ce::17) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB10199:EE_ X-MS-Office365-Filtering-Correlation-Id: 05e85208-28a1-48ce-0b0f-08dab0987a73 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0QaFYsDNStQLvEMI8brpuVlMxLkmsEa8k7e6VDZOgOwXtxNJKWqZSua9lZu3ARFeDsLBluDFuQLBVeiSfaaZ9q6ykndmmlH4JUW5grZ5OeSLH3VGO/BGn5HmKW5t4G45O6MN/oDcuVShb97iaGSLj/C2/tqIONPHuIoQkRujTDCPOE9MAZF2RFiCJ8uai4/pwXCF9xP04F9Xt/5CajNEgW17ho9Le+OeKeuTssNMW2hGnPeJxi0R+/ecyCAHq0TRC/l3aEQuwYwXXl2btMT3sdx+XACh78TXMX9USziWnVqoJ/oZNKtJy32ViMeUDPSR+BYahmDs9sfs2qPTjP1bgIOIIHEtvxYW5UqrJtcdctH5mso3zyYcxubdjtrzHRL7B4QG+5wh1lB0doPhU/loESWkDp/1A0s0n12BoURuxw67fPXCwQO8PBCmuaZXixxpFjEyHsy4ZnFjdrHvZmz5Bz863kK8Yjmnr2qnO8SOOgCDCAPyyfWaYEsrls+W4dNharcPanddutVlaSsTnfUzU9hqsbsaHrI5At3FqbNKrHBZpazGKnqW4HJGvOYiCUOu1IEtIe2mPol+qORcpaluCthWVEd/IjCuv5MxTWuf4DSZHmr0OGfArJLgvy+Ur+83OiapBwOBQN/eaEFmAlB+ndiNG3eiX1pdYnIM0dinpQDklvFIIUlpEgoYxvkSb12DgXIYdKNrRQTj7u4wCRPngrirpHmW6qwNYGk5506KK3IYMfBYm8quLCOtRjFUAukE X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(39860400002)(376002)(396003)(136003)(366004)(451199015)(41300700001)(5660300002)(2906002)(8936002)(316002)(6916009)(36756003)(6506007)(52116002)(478600001)(6486002)(66476007)(66556008)(66946007)(4326008)(8676002)(83380400001)(86362001)(26005)(6512007)(38100700002)(38350700002)(2616005)(186003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xvF/g0NFJG9dcOkEjuGCVdm7RegrDvZsUSMI1diQG4oyMYHSZwNXczYRF8WtVdcuT5aE6ERvxLxphCMpFys1JzgF8cwJC4uqq2B4fa7B0JjNHByjdnMiQukyCB06eP7g1UfUO0/asXdZjOFMOJF1C7yq+KFENyLu73XKlNcHxZQBByYPcs4zusCBFH+N8Lit6r++AAxAg5Ta+r4uJDdynwan/48jVyJgyy3rzYJC+9ZsfEDvUzO61LJFj1QF5n+yqh14+rdIPC7mXgzUPPyObngaNvEyuXwb69F/qoImaZyEylnenELiM8ZYYbsS+ClmN0hlc9aNzwXGFydvFgdgwE9FXhV+OJ1b66N3XTl4ssgNQjKFjcDFm1HSYV5RI/ImmCkskt2Osp04r2tEfRgmAyLOBT6dFrZvjkhIW150TseHQXCbfGw3O18NhNQYjrnArbEzpl6rXobO5S8SK29hULSyKSDthkR0n89d+k2kkG4jVC5XE3lwjdKHhqG/jEY41CRcqQeWM+Txc55UxZpYFyd+9TEYi6R+KEsG8SHnLz1TPIhhTwdUlg1VLB6ll3ioRbaJtafpWaNp5Mx7/9rMhrHCtzc2EvFhhyIVlNm57UwVWvhgKBLiFt2h4DUWpFJAyM+u97S9QGMr8P9iAeMlvBpUu31vsQxAa1sYSwZaAj5/Dv0jUOA9xCwXzyRDUCCT/OpJ+G78jQaTkYpbF6Edw4NHuiUS23wGMtRPNRUxzjGzHBBWlug2+gH2RGRiIVQf7jtZByAuvmlMQqcShSX6FBTpLiH2tPCw4ViSWFqrgvjxM6hrMqSURtorKADE3qAI79Omn76EdopqhdILceRHMEv7Uzp5QEbLXJge/VP++KQqMSpab8GnaKeewAkMAwQv0cktTJZcnLvVri86sDLpWDtyHctfOo9YbMGbbkcWdkXiY8x/uYxhgl7kB4T08H246+KBzlT/DDQ9k3K7hF59Ja+y+RQmjAJzp4C+n3FjYRuC5OkLx452KP9UK5UgbWjNqQ4rxHUDjFiWQHe39cv+eCh/019SQX2BVAVmPfGYnr1Xo3JsIijOT3rdKp+MJWg9XNtrlAk/inBXqIdeY4fKj5GOVC8fxEH3EYixZmxAtf2BfR3PCA5/iHnkdQWR7jeNL7/Rn19j63OKGUIteDeP4iiWCyYA4h3CwMveE+avzjFkb3QGkKVRRMR3bm6r6LDyRllBxMTLU/hQuwr9x0s8ErnTkVCcgv91MPVWd8wn5WYe/EzZsd/b36PEB3WSi/T4L23PvH++NJR4iNHJS0bS/NSxBXuznYUU0pOO73lt/pYuLXYcirsgr72XMP6LavVmclMR9EbaYrwjfN664zpBib8QL9dJCtuAcaOFi/ggcI0kjdMpEtXuPnkXrb5eEpmVQpEICPZpn/Evb1cMLpmpWnvNKrpQcsBD0zkpzba/sbIG9f1ADML18o1O5dUAJkUU+7G0ryZr7SHndeK493Pb7GK4FWr+WbB+nH09jJ6nboY5knQCNpBzbIUhKJ6PRa/tmA7R8wgirJisUZiSk97/Q/c0RQGxZTjyJOmrVEAPulEhEx09OWDVv0RUR4Gqbk4BdDaV0hs7Phl/HbT6W5kZdjGNe59mcBT385nm/6QztFM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05e85208-28a1-48ce-0b0f-08dab0987a73 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 23:36:56.3488 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: K/UDkV9ym9/5zoNsO+mypCWtKJbkMboKyQg/OME31PlQ33IrY5f85uGGKVXNul0zBmASevSikybLvmgIAVqfJFovStStwMJxgZ93TjtjD/o1Jnpi+o1YnpLFb54o21gl X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10199 Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Kuninori Morimoto This patch cleanup dapm_widget_set_power() comment, parenthesis, and 100 chars. It has no meaning, nothing will be changed. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-dapm.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 5280a1aafb92..d4281e776e44 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1884,18 +1884,19 @@ static void dapm_widget_set_power(struct snd_soc_dapm_widget *w, bool power, trace_snd_soc_dapm_widget_power(w, power); - /* If we changed our power state perhaps our neigbours changed - * also. + /* + * If we changed our power state perhaps our neigbours + * changed also. */ snd_soc_dapm_widget_for_each_source_path(w, path) dapm_widget_set_peer_power(path->source, power, path->connect); - /* Supplies can't affect their outputs, only their inputs */ - if (!w->is_supply) { + /* + * Supplies can't affect their outputs, only their inputs + */ + if (!w->is_supply) snd_soc_dapm_widget_for_each_sink_path(w, path) - dapm_widget_set_peer_power(path->sink, power, - path->connect); - } + dapm_widget_set_peer_power(path->sink, power, path->connect); if (power) dapm_seq_insert(w, up_list, true); From patchwork Mon Oct 17 23:37:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13009702 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 64144C4332F for ; Mon, 17 Oct 2022 23:38:50 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 80E698E1E; Tue, 18 Oct 2022 01:37:58 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 80E698E1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666049928; bh=0WcOp8MTXyasmNZkV8Wyu1Kx55UULwgfVzCqmvSlj1E=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=N4a4ZOIfa8Mi6QvtwFYdrAJIL29SsbSmKjCT+YqSK3wuDkTorlc1SVcsfp1EOQwJO G2s9FG5BjZO+CCavEFXVpN4vdiXby0wOST55ftJh0cR/nhO8C1RXvX7CV+QKMdFFpB oi0cZqlM3F6XTVK8RTuqflS0S3a7K3+zaece8u8g= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 420DBF8055A; Tue, 18 Oct 2022 01:37:17 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 11B53F80551; Tue, 18 Oct 2022 01:37:16 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2094.outbound.protection.outlook.com [40.107.114.94]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id EA2F9F80533 for ; Tue, 18 Oct 2022 01:37:09 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EA2F9F80533 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="HnUgH9YB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gc8TpfV+EzVe/3S3TG59fuTbk3strTWMd6/I5aUJ1priujj2dHZ4WV3zEbiCDe3fx2Dpr9AQhh3QmySn8yDBfheKXPMANUZkT9P++4c/f7Rt5Ot7xoefM2H2IYfWezWwbYeuBcFdx2OPwKzhpEDB/pM4BH8i3xb4ECfkA9faHyWzeH0bkDrRbbBvPh8FIkrcBZIuoqm4UWj4QMatEG/RF8dwSwH14COgpwgJcE6rC0sWtAJbT6uy6fLDDpANRKwn3XElrH85rQEAVsUcOZIMXjNAsgj/AeFVBgOSVBcpJZEutMx8DlrgjiP7uTITgcB+suaUzQL0QJsoC1yzaXpmNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HVVQrZc6UZrEvJwiSHgFbITlsLwkyYu1IMo64mlJr/Y=; b=XpB9bXoveazds4nJDNQMwodMiGIpXE6Ic/01kjSLzb09i63KfZo7loYk+HdU5dkaZ0rV9ekkoSgTD84M/UNpiKLfClAKLJXYEUMT4nbQa/NkdNln71I9in8apPBiVStbcZkJxH4Tbp9Hh5jN3GmwLKBY7bJ0+Kd0MtTeNEOls4fObW+2mikkZohWJfyKG2xk1j7BsQVyOLdMjBflOAkxTjtLs2bWYRSB/wBYWssa/BhcLXqT8Fg24N2K0+oGip0chkxAKWaqixy9EUk+grzGEYkmLXwGI3APQCtK+so7v+umPVnwLwlUj/OqHAOK3SD59B/nSxreqEovrAGLSiPyIA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HVVQrZc6UZrEvJwiSHgFbITlsLwkyYu1IMo64mlJr/Y=; b=HnUgH9YB4SS9jv2tIFZz/3+fNeUMceSr7vqjhHQUhULepkkglWUgKVpw6rbeNbP1pZF4h6rGKt1DwEihSkuHGL+CkLU6UCO+du8tmYFWIl1HmSz8fC4wOnrbE4YxVeflARnJtwVWPf8ebyWki594o8jiVtCVd/ujX04JEkOesI4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYCPR01MB10199.jpnprd01.prod.outlook.com (2603:1096:400:1ef::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.31; Mon, 17 Oct 2022 23:37:04 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53%6]) with mapi id 15.20.5723.033; Mon, 17 Oct 2022 23:37:02 +0000 Message-ID: <87tu42owdd.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 06/11] ASoC: soc-dapm.c: merge dapm_power_one_widget() and dapm_widget_set_power() User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> References: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 17 Oct 2022 23:37:02 +0000 X-ClientProxiedBy: TY2PR01CA0017.jpnprd01.prod.outlook.com (2603:1096:404:a::29) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYCPR01MB10199:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ca3e2cc-4f9c-4254-f784-08dab0987e5c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ffeFLK+Z0nKJTDMY5azSwL8L8aLpQpvcNTJPQ96+qVZPUxcCI6id7SMecweME8jGQwcHGa2Nv6ado+n6Mn2BoXy8ALKwMQrRtBAPLTdVxOs0pc4oIDQ3xMjEQrs9zxnE8LsXO8EzIbkUyg2T9cTwRsNdhzWWI8YbiG4PGx+AtGd22VQBPD84j+SeSs035o8TDp5gsJ481HJmlByWgLG5IkhwjxTFZweOv2wXJYqbrA4Lyxf8gsR+5GF/g7/FekTdQI74gQ4qpzl6AICZCa2sQPg1OUH4SMQsXyXw1yHRKUCeAY3FW3CYoFswvdArd9GXi2hUjnvnshTOZZUQ3iTbI5ApmPN4yXxdkJ/ZDroS8rSjJTeFFkN2kz2zLkGycC6uZjyoz/wAbu1QaBmAAMvPehtgJETNAS91CbO0ANS1o8VXhFSBjxBMH0KwcJ93RrOlKaiXSyn87aCkQAfPyr1+a8tmqXBokYM7PKukyveiFpnI1xCT6A1rQ8lYMIOGLMzm6EpyKpKkQCVtmT6e84oaZJL7Qig3nKelNxopWDNxdgoQVo8KI6tKOkgJzih7AhVPuPRpsu9CyVK36AxM4udW8hu1g4q+XxIEiuO6vfaN149uFOd/Pju0l3sVxKptalKHjXUZ3iVzwfk7Ng50UYIuP7ord7QuKxb/Gt7HiR7iWWa56jjUjBfOVOlYSfQ2Gni77cekJ8p/gk3JUgTnAqSjq6efe5xr25CJKSLzNI2P47XTqjaI6HSYKKK9kdyFkALX X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(39860400002)(376002)(396003)(136003)(366004)(451199015)(41300700001)(5660300002)(2906002)(8936002)(316002)(6916009)(36756003)(6506007)(52116002)(478600001)(6486002)(66476007)(66556008)(66946007)(4326008)(8676002)(83380400001)(86362001)(26005)(6512007)(38100700002)(38350700002)(2616005)(186003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GGcxtH40UIGK0/oKbdvHvpW2QRpL4h4juUS2IVwzfguBRqH8JgU7u2ZYMo872bNx52POwe7c6HOqGqC4slJlMP0vzpG1sYco2uvyeGssp7RZLR6gpFm6P3xcJtrd61uP6HcT0LgYQuCTWI92ejOUBx49g9QOzInjdQRJrZhemSSX4KTq6xRHbJTtD0x6u9F8QVeTFyttO/QHr+Q0mOW+8Zs0TE7Y3YPQD00F/+udyUEDWWdwyZLF8RMoVbF3xDR9fzGQnwx2+AqiiI0nzeEgbAtcEYDNFiHc5x5WToG8qU1y1Mb+amlDc1nsqIg6t3c8nNAB6w0t/LDVzraYGKlj327wnKZqTBOfI21oSHIdwKBvMxgZ8YZqcEXNIrMF1jkGChInCXE3xY/fg9JPwEsJaNqI7/6sEBn6j7ek5baSNMIoCIo+9EaeTCT4LgroL/iKedn5mAI340IzDkEp5D53sGg3IL7B+InAYWm0x2B+tqKlhyuLMwS6idf2pmsi5Qu08hiDxw6pFB/koP2HTpVoT4UtfMBWfCN10axqL0h3VujcCOtYiZIZia06BKBZUvimoS3+98yUxHyEQP7ee7cCO2DBqP8+WjHUZ5lRKYUoVnDxM8OTwoxH8oiLvcuOYZHAZ1Kbk/J+WV1iDE9pogRO1LhzfPBOgq7LP3b49c3gK7HdVo0qg1fm1OrOhGzCWRaJiFirXGOf8UKsNYyeS2Hsa+i+NtZ4kkg9gK7/9NC4RjttWPND8sP7e5uuLUAeNPIQCiSAQxneT5rdtIvhuyayKvXQN4mekIOlw43M1nWsBx1y582l34bMJ5nt3LBLRdAtbZffKm0V2AaGpd82S6b8RoJtKxgT49c9He/MA7D6+A3XXaT04nLxf/hmq1BwTUuSq61CWIlvuwelue94+SQBIJgUY62E1CuXjf/rS8Q8tE68wHCvr21n4oipyipQ7+g+WAhly5GIgKss8/w2fytSC3h0yFzvx78e4N8KuDM5y2lwogAwMPOao5NT0aQuASFzRCuXAZCJhcxcPc3BlnL0IQhRuTZoS1VWeyltQad/ijFjht6XRI31/h9IFXOkL7iKypDdAi7KDcfbw0+qvLzeeDpE7DiRDayZTymD6SLXeS0/dQBR8rGgHJfqMcLaQcw+dIMBH2n/BOuyfeXYRLurjdXcCZG+C9+Nain+K9Ni4ZvLQ1KZ/nBiEfUPH3KteWTnoDhnhE84gJqirU15SkdGZWCQ2cWD8CoMqFZ+oy5d04taapLePs7ATchKibIZffYtecdh6yE7z6MgplXG4OjS0/FtbUE97GeZZ71LlGZ+hkubsH7hRV4RLYP61dAx2hNBtbGVnOJ4wOLTTC6TxhDwVlwWczYqlAoUWWfZxwhr/phGVNalOdMRIIiB9OW2zt1WIxo5eS5VtM6T5GBYonDke2S/v7hypuIlUg0DvzIXufkFfcAZV79WnqutkTF9udgW3eEqX6pCLnNrF5iHzZSW7YD5BUwcJsXAejewV/78neGoU497qCbNA5RXobjf3pz3Jn5CWWx5+kWNzvcLnf3Cjc3vq5NXGwy2/RzRvou0J94J2SJINiinonJPVXKVz2GtXAAFrmyLnWLpTIpAY6qko26Wz7Sm2jGVRSWygHTLJy4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ca3e2cc-4f9c-4254-f784-08dab0987e5c X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 23:37:02.8823 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3ELpo3JSaHTL5/8HxC7l5JNWCUJjLqEzqoBwzuVkuqQsk/JNpKUSeELgJJXhMBeZFZFymiO5F4v5gLZVlylCFBU4xOZWF6vLNzh76KWon9joSjhTIBdHo/Tqm0ShXZ1c X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10199 Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Kuninori Morimoto dapm_widget_set_power() (= X) is called only from dapm_power_one_widget() (= Y), and total purpose of these functions are calling dapm_seq_insert() (= a) accordingly for each widget. (X) static void dapm_widget_set_power(...) { ... if (power) (a) dapm_seq_insert(w, up_list, true); else (a) dapm_seq_insert(w, down_list, false); } (Y) static void dapm_power_one_widget(...) { .. switch (w->id) { case snd_soc_dapm_pre: (a) dapm_seq_insert(w, down_list, false); break; case snd_soc_dapm_post: (a) dapm_seq_insert(w, up_list, true); break; default: power = dapm_widget_power_check(w); (X) dapm_widget_set_power(w, power, up_list, down_list); break; } } It should be more simple, but the code is unnecessarily complicated, and difficult to read/understand. This patch merge these into one. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-dapm.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index d4281e776e44..764830a51d2d 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1873,11 +1873,24 @@ static void dapm_widget_set_peer_power(struct snd_soc_dapm_widget *peer, dapm_mark_dirty(peer, "peer state change"); } -static void dapm_widget_set_power(struct snd_soc_dapm_widget *w, bool power, +static void dapm_power_one_widget(struct snd_soc_dapm_widget *w, struct list_head *up_list, struct list_head *down_list) { struct snd_soc_dapm_path *path; + int power; + + switch (w->id) { + case snd_soc_dapm_pre: + power = 0; + goto end; + case snd_soc_dapm_post: + power = 1; + goto end; + default: + } + + power = dapm_widget_power_check(w); if (w->power == power) return; @@ -1897,35 +1910,13 @@ static void dapm_widget_set_power(struct snd_soc_dapm_widget *w, bool power, if (!w->is_supply) snd_soc_dapm_widget_for_each_sink_path(w, path) dapm_widget_set_peer_power(path->sink, power, path->connect); - +end: if (power) dapm_seq_insert(w, up_list, true); else dapm_seq_insert(w, down_list, false); } -static void dapm_power_one_widget(struct snd_soc_dapm_widget *w, - struct list_head *up_list, - struct list_head *down_list) -{ - int power; - - switch (w->id) { - case snd_soc_dapm_pre: - dapm_seq_insert(w, down_list, false); - break; - case snd_soc_dapm_post: - dapm_seq_insert(w, up_list, true); - break; - - default: - power = dapm_widget_power_check(w); - - dapm_widget_set_power(w, power, up_list, down_list); - break; - } -} - static bool dapm_idle_bias_off(struct snd_soc_dapm_context *dapm) { if (dapm->idle_bias_off) From patchwork Mon Oct 17 23:37:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13009703 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AE0D8C4332F for ; Mon, 17 Oct 2022 23:39:05 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id E085C3EC9; Tue, 18 Oct 2022 01:38:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E085C3EC9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666049944; bh=uCPc4X3Cy1vwQF2SALXpScB8bqnIer2dAMWzUOHP8mY=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=vTlO5T7nXCSHRSHNmx6HluJZTqsurOKZY/cQFYLHLU1RlIoYFTjfDjlm4ZiDAvQh4 OnI9taeMb57OgyB5jrv9zn5eg1izkV5gk/9tuDgYOXqxk30LeiL42AX/X62zk42Gs/ VBjLHshJTGJX1Lg1KjItRrRy/wzLPur7sbyh/fjc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 4F1F7F80566; Tue, 18 Oct 2022 01:37:22 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id AB8C9F80579; Tue, 18 Oct 2022 01:37:20 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2101.outbound.protection.outlook.com [40.107.114.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id DF62FF80535 for ; Tue, 18 Oct 2022 01:37:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz DF62FF80535 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="R8Z5G1zL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WIGbCzNBXzkM8e+tGv2siYha8HLEbx2W1dexG2XzcmVpVn1+wWdGHVCo/bMiW+46DJ4ntYT80Kz2DZqiCfsV++QZDfkV4r4goRDd/zuqqceEZxKjPQne0k5WkplyErf59q4yk/vdnFD/yo8fhSNEGAdFcXgXhyVzTOGfMqtIxzDMA4j8CU/daeEKwWtgWkrouHRnOhng/6IdrrotbEZ4J1NDffkpxi97S0l0ghV9BFLSqQraEx84ASEbJlY0IDHdnL4b6w1K7SwQ4HJ/AsniFPDMLIBgZ1kF05WrYct//AU4rmXdGpqmERpy8Whq7R7udwXRFrwveGe8LO9xSx04FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=yJqlDNStcANf59V0aGryaosmVkvOD34eJDigLAKmZJU=; b=bavTvPCPiF4dhamS2iTSDOnO4ptxXLGqkQ73nnN34Hk2h29KMYRLTiEgFPmyQfIagf7JAPPcjNYJjuvcRCuO8rzkVdhqII/WkXW+KCv99fOvh9zGZtwCdC3te6ty1xhILg9Wn3Jf2pmY2uEc8y8otdQoyR09HE/JamesP7clx8YKRUV/EuF6bVfSsZSgMqCTPQZ91nXPFR0sgmPBCv/J3V6qnM5fLxGbQQIUO+V9VE/XdD8KwEQ4Yj6Rji3cI+qzOZl66mNMgoo+x3RM1g/TgN7or8gpByjKayweEc/Wh1oJMw0Vl5cz/ULZSR4GV3JGgXeKeNFdJE/69EsPsGADww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yJqlDNStcANf59V0aGryaosmVkvOD34eJDigLAKmZJU=; b=R8Z5G1zLiaA8/i9mUbh5gC4bZi/0u0vcT/gAkjKjM1nd52/oeXQUOPYiGK4UmsuuzRiTKDdwngztKLjPjvToGOqb3DT4USWUI6qZuEXec74BhzfpxKuMitj5NcvaPLBDtt6sx68BvGyM2f9M/lPcspiZAC75IrIHmLRtkhCxA/w= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB8180.jpnprd01.prod.outlook.com (2603:1096:604:176::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Mon, 17 Oct 2022 23:37:09 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53%6]) with mapi id 15.20.5723.033; Mon, 17 Oct 2022 23:37:09 +0000 Message-ID: <87sfjmowd6.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 07/11] ASoC: soc-dapm.c: cleanup snd_soc_dapm_new_dai() User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> References: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 17 Oct 2022 23:37:09 +0000 X-ClientProxiedBy: TYCP286CA0098.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b4::19) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB8180:EE_ X-MS-Office365-Filtering-Correlation-Id: 81ec86c1-faf0-455d-062e-08dab098824e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RjHV+4WsfbyGqemYeCBgXcpG0Xev1mZ/SWyhcWh7TcDTXFSWm6ZcrZT296oikepKl+HdoNrPfC4jAEM93L69PjtRJ84PFnVuAdL01D7m4GYzovWtjWs9g9Rlw+i+XnioaQuyn2T5O0QgP5qaVSHJej26HO19pEWc4zjoLTFuN4mSkoq8gqXNgSEO1dCEAKck8MxiR6jpTvKYAvtiHRXea97iXYgUZV3kgK30xIicmOL1z/5Q3VBSnPXx0nHX3CRkJSTHsjHfSiB4r3YmBfpv6U0RF0J9m+tuGal1U9qvUP9TyTYgjITrXf5OfLytgi6gUPc8B53nifblTlzB2T4bpYqW7Wz/NY/4CQwybUEX7X/dxRUhyHGZPAu0MXHZ4LDTYhfqoWpGA4fc6LJj4ZiCgLSWLiYREd0h95/B8RVnP4yHMh8poyBEK1HsmyyzE5VKHky/RvD+nTpy3rHIaIQEpTbWo/hpfsRkyxy/w9L8fFkLxdsPmSIqKf8x1kK3Yr1YkW0Sy4T9ZYD9OGrGRX1AyRpY7kQWcJX+kBsGq8ZiGkIiYVYa5CSDS/afUmkvVGT9/NtzFM/peEkTSA07bXqxcufQLMIPRIuw9XqSE/7Zkhqh62kMlgx+J4RVkegYexNfYGeyzuRxQMlBzHWSQZalYf9bnoN3kDTkpzyYe0RliJ4LQqpBAfQkpw45IQkkQrH0CKUqB3MK8O+9rQJah67HMSsuUfTZ4MaZm7T77zc+20gCFrLt9pfYIZeVJUBikHfsUryDjIVC9q0Upw8oib5mAg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(136003)(346002)(376002)(396003)(366004)(39860400002)(451199015)(36756003)(86362001)(5660300002)(38100700002)(2906002)(38350700002)(2616005)(186003)(83380400001)(316002)(6506007)(6512007)(478600001)(6486002)(26005)(6916009)(66946007)(66556008)(66476007)(41300700001)(4326008)(52116002)(8936002)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IPciCqdUwUoWkmXHpoznyMPqxSJXz/r5X4+J2k9qVZf+oWUAtxkJi8gDK/rkUes03YQA6tg0y375VzB4OYNzFS5a7Qa9hIp2S46lRiOXJHnhJxtLbnFbUUSI0KLICcC36uVT9DcIk/QsjDlNfbdSSdD/rU76zn+JQG62ybzLenEwikpyHQ8JprdnEb2CIWoJxwcqVmXdC4yE4yQ5viHUIUz5n9dOgLPUEtSB+KRBhZI1g+O89hgILyE03WiRh27nbzUp8ip0aL0ZYO8J6PJxZrZTWYTJ3KNwrHnxz+NCNzsW0HvONFmmed9gScfrrw9/+kZJJJT2u9QKVHhHa0fCb2w94msIGB9RhGRTU1Gf5kFmO08s8TDwv8EQrEX+wPBt33tU4bU+yo7P7wLjRGP1aX6CF4MQC8KkD4RvN8RorYOC3RWR6aQ0w0rqXEqIUDtW9uvYJGuWDIJFs0vtrJWUs4Kfrvn4lRchsKxB+vAwrxI5btAPTRzAy8GEv/L28HvaAMqiPG03vZb9259oi23Q0FVhckuRK9smciIaXAnfsKKeXpcEHHJozsyS4cExfrYdKv+OS/QKPYISPgJKFRx1M5h2GW74FZPApn0A6EReSSTKBKxfSyzz00y2kAwXdtKnQwL+CTbDqszr5pgmEz3gglxr6e85nOUSyYDGspFsqPQww7dB7itWf/xmSlxJ/0LWP1/eSvJXD+69FanKdPSRfYh+O2NJUvSg8JcXo9DQDdwzVempsyOymuHljUkOjemgBDVMWfKbKNhQOYzzx42rk3mJlTWxPwhdntacOsEXKch+4TUnDgYqRHCvrIxMs/1ua52VqsUAZI4TiBrB9I0GepHOobRTUl5N3lAFQBKidvwI8shzBOs+2S9JogVrePSmXmbpuKP7MmHeRTMmVChpCTqVzpGWZsBFH2XZwhxSRpb0Jukj2Ai2KhcJglLF2Sd7nG0VQPZiogpd46r8U3V3PjuZIbEBD/Jajg3OpT91TBj3/Nlinmh9FmHZSdj45djDImcm3jlxCZUF0b5nlkG8HhtTvuE088rIcKcS0f9yp2z+wpVOq4CRFLknVtF+OwABOh7X3C62XKUAjXDa5IWmpgKMrZ9cBpYwpDNS+LFm36mwhhcjETT8QO7zGblHO6WSVRDIGbBM8OR0ZHs0BSK6xpj4odcGrDonJHB25h/sZbgGuObWpWHQAnf7UT0fXsAR9u+95Ss0I4jcadAoXI3JBH4PVO+por7JeTn3UoXaEFcI0g+vXbU+zkHHW2v702RmlcW5SRwBxsyuMvQL4iDVcHjIS1/W5jGDFZtK0DInM8+6gnwEavej1MuYJYMweW3Cp0nVSjBaIzRZGfozotysHQVt6vVU9e8bHAHK07+etbdhqFZ2r6YM1qBltocesj4Yhw+B/2xKn6I/Krxc67kcG09vf3sjZdXsiaZYlnDKzKYKdNiqyoUqV6ONGFDE+V7L/dgR1rIRWhwJshD6Ol+vBva7FI0EIKm7xVqnn40SjxzCNGwrRR4IL2Y81TNHvXFr9YF4CHgvMNuMqeV0VYrTr6phjYkFEnVaK0ucSK1heFXCGDPM13BWfu4pNnRe3A4rtMFLZTFVQP31gElWH9qDV0czCjdc7DCP9jTLAuy3ZhA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81ec86c1-faf0-455d-062e-08dab098824e X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 23:37:09.4796 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: DSyLUSoToTmwCTAyB86O8rbQFjCfjCGexTtHPE9JGiikCwM0m2PlI35RRO9VnjfKpr3aF+W5s2p84qEnyrkgRQp8oF/S5I/7XP0iRyFRcV8QSGMovPVjYiq/RxFmRoBC X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8180 Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Kuninori Morimoto snd_soc_dapm_new_dai() setups local variable "template" at (X) and (Y), which is used at (Z). But these are difficult to read. static struct snd_soc_dapm_widget * snd_soc_dapm_new_dai() { ... ^ template.reg = ... | template.id = ... (X) template.name = ... | template.event = ... | template.event_flags = ... v template.kcontrol_news = ... if (rtd->dai_link->num_params > 1) { ... ^ template.num_kcontrols = ... (Y) template.kcontrol_news = ... v ... } ... (Z) w = snd_soc_dapm_new_control_unlocked(..., &template); } And this function has error message, but not for all cases. This patch (1) setups "template" in one place, and indicate error message for all cases. This patch cleanup the code, but nothing changed for meaning. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-dapm.c | 56 ++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 764830a51d2d..92140a78573d 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -4130,56 +4130,53 @@ snd_soc_dapm_new_dai(struct snd_soc_card *card, struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_dapm_widget template; struct snd_soc_dapm_widget *w; + const struct snd_kcontrol_new *kcontrol_news; + int num_kcontrols; const char **w_param_text; unsigned long private_value = 0; char *link_name; - int ret; + int ret = -ENOMEM; link_name = devm_kasprintf(card->dev, GFP_KERNEL, "%s-%s", rtd->dai_link->name, id); if (!link_name) - return ERR_PTR(-ENOMEM); - - memset(&template, 0, sizeof(template)); - template.reg = SND_SOC_NOPM; - template.id = snd_soc_dapm_dai_link; - template.name = link_name; - template.event = snd_soc_dai_link_event; - template.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU | - SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD; - template.kcontrol_news = NULL; + goto name_fail; /* allocate memory for control, only in case of multiple configs */ + w_param_text = NULL; + kcontrol_news = NULL; + num_kcontrols = 0; if (rtd->dai_link->num_params > 1) { w_param_text = devm_kcalloc(card->dev, rtd->dai_link->num_params, sizeof(char *), GFP_KERNEL); - if (!w_param_text) { - ret = -ENOMEM; + if (!w_param_text) goto param_fail; - } - template.num_kcontrols = 1; - template.kcontrol_news = - snd_soc_dapm_alloc_kcontrol(card, - link_name, - rtd->dai_link->params, - rtd->dai_link->num_params, - w_param_text, &private_value); - if (!template.kcontrol_news) { - ret = -ENOMEM; + num_kcontrols = 1; + kcontrol_news = snd_soc_dapm_alloc_kcontrol(card, link_name, + rtd->dai_link->params, + rtd->dai_link->num_params, + w_param_text, &private_value); + if (!kcontrol_news) goto param_fail; - } - } else { - w_param_text = NULL; } + + memset(&template, 0, sizeof(template)); + template.reg = SND_SOC_NOPM; + template.id = snd_soc_dapm_dai_link; + template.name = link_name; + template.event = snd_soc_dai_link_event; + template.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU | + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD; + template.kcontrol_news = kcontrol_news; + template.num_kcontrols = num_kcontrols; + dev_dbg(card->dev, "ASoC: adding %s widget\n", link_name); w = snd_soc_dapm_new_control_unlocked(&card->dapm, &template); if (IS_ERR(w)) { ret = PTR_ERR(w); - dev_err(rtd->dev, "ASoC: Failed to create %s widget: %d\n", - link_name, ret); goto outfree_kcontrol_news; } @@ -4193,6 +4190,9 @@ snd_soc_dapm_new_dai(struct snd_soc_card *card, rtd->dai_link->num_params, w_param_text); param_fail: devm_kfree(card->dev, link_name); +name_fail: + dev_err(rtd->dev, "ASoC: Failed to create %s-%s widget: %d\n", + rtd->dai_link->name, id, ret); return ERR_PTR(ret); } From patchwork Mon Oct 17 23:37:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13009704 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 042A5C4332F for ; Mon, 17 Oct 2022 23:39:15 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 2D7572B42; Tue, 18 Oct 2022 01:38:23 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2D7572B42 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666049953; bh=fkgw1yMMuQBAEcvq0VddaXw1EapPxK4wgcbQPFnFhxY=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=bU7PJAQcYfE9ebtj++WIdoui5WpLfM43j0grFOLYQEmeSyquwbEJTmSSmq96SrK1+ sLU8Ww5Zi1MDUiRHYbd9SGuU2Ee3IKtRkexX1rRz5MeItf5zMbbWG2Q6TpSMEgJdWd e8n1dx39Jd6RjdnR8CtBkQqEkX95GVkLFIFQ7fKk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id EF752F80542; Tue, 18 Oct 2022 01:37:24 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 28806F8057C; Tue, 18 Oct 2022 01:37:23 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2101.outbound.protection.outlook.com [40.107.114.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 758C8F80552 for ; Tue, 18 Oct 2022 01:37:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 758C8F80552 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="VmZ+6CrC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=miyNLLYQJep20na/m7OVrrE1Yh6A/3qEcZWbEjobps2d8/KwenB9ZDhncueJHQOLSNOQeFjXF05qs6lSTNmdT++93sH3bC+y6v9L0hLJG0z4W0pWlYSF3sjzGGZf1jHfGTdMTt5gqk2HQIAZJeHS/7ahTmtv2wr2ByXbrZqrV9SgPHFgkXN7/gbC64uIiambjijfsiEQmiqCh0mFZ3soZAGSA3beF4Es3tXdm6lbF1y51/eNWUKnlZ8cGqniIDHdfjJaGlQzxAZP9GtAftQioJNA+jZ8kSZi/60XC7ntUKwwyQAKK2WsvbkLnFvpJsDN1yb5IOkaN9z/tKBEy7HLxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sDRBqC2xafaWsWaiMUFTu2TKDRPdzLODXymlu7ePhXE=; b=dGBceh3XYxO7J1+JTqwdgXDJ1iV4iPM6BamfS7XG25WxCdK/iiqVd5mvxvY4JxXJheFWhSXF6Gnx9Me6OrSkdFNtsjurZElkN/uLoHVDWbGHpDEiT0LVK+j5LlVlzta9MGhMsLFGU0N9glDyPTj56uwt7rkvM+uHmkz38dHPVf2tRQBg6WIzFPWnX4dT8G1EZ0hgK/4BmcSWzWd4iJw/+GseSP3ogp6C3/16BLpwzcjy90tIQHtoVVcZQlcFxflPco7Wha/uCZ6EK67p9BbyJRhXLSg9ojNYnQ7E0ubeAy4/VYn/osTHj5V8EHuuS6SJ4fb2aG02CpGtDT82ELY9CA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sDRBqC2xafaWsWaiMUFTu2TKDRPdzLODXymlu7ePhXE=; b=VmZ+6CrCtskmvI3EiGdrg1HQirP/LCnG94DEBIoRuMcyQNrJ+YFtBkjUxCHcHC+1JHDIuie23PYUruDvK+udmxjHQlYu5uaWwKmTsCnZ4RxTl3R/sVjwNZXRnT6QOsTVnLd+0WqqS+KDIX+zxoVALD+xCsgysFb/BgSR+Icux5U= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB8180.jpnprd01.prod.outlook.com (2603:1096:604:176::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Mon, 17 Oct 2022 23:37:15 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53%6]) with mapi id 15.20.5723.033; Mon, 17 Oct 2022 23:37:15 +0000 Message-ID: <87r0z6owd0.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 08/11] ASoC: soc-dapm.c: numerical order for dapm_up_seq User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> References: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 17 Oct 2022 23:37:15 +0000 X-ClientProxiedBy: TY2PR06CA0027.apcprd06.prod.outlook.com (2603:1096:404:2e::15) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB8180:EE_ X-MS-Office365-Filtering-Correlation-Id: f9a8ca77-bcff-4bbb-b082-08dab0988600 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e2OZ2tnPU1dc+yHqxwshBVUEHU+ehAFFJPTXggxuZFrNqc+H7a1PhVsEoc5h+cvHVgAWiFQJVYw0pRnmVk0yrYiRreZzjuc579rslXUtzz672xynb2wYkiOqE6KgMGZvnYjtiHN58//OgaZy3Y7EpzwpiViLD1M8qwpH1DISdiZp5IsJJJvnYUxMmtR0Czq+bjEywAE/KdNeZB3yEVDK0YmOlo0U289e3HZIiPOBcCbqo8fBZc1oE+W2MBL+T9C382FAiVxG79koKTBBESjF0jsfJs3t5cuCGi/lvgCejqn/FIae8wLSQz4jDXEr6iII8Mq4ayo224fIZpEngOecZQL4Xtm+OjpWoLsnh8O4Hp9xxfTmjzULMSUo28wG/o7N+JDSjh9CP1bVIsTaCx7ZNLncGpyUqDkm959zQPq7IP0hRspZI+CTygqMWqe097oUHwlbZPiWtuDMSe67bO80LggnA540J89fVEXSMrRedheMTHX1ILl0waPsz7iZmvic+tfgIlx9LAyTL20HIVhxGy/yf6ySSL5L9DgEHNDjl7mnyEWHC9m3xPWDT170VzS5YXmDj842MHNqYuQcyQCyiWv9PMG8Y1FM6fXduoGM1AM6si8cmhYEXOnjR351bdYkFb+1e+ENlela0OY1kKdt9fhzqewCFT0Z54w5iJCCBd7sM0Fe91ck8FMfrr3Tf967xuVGG8RzgFMOO5CY9iMuGKtV/8hy+Tk5H6f4bV6p5eNVoaX9bs86t5zusy8hdlFED5jZNvZxaGTPtbCdEM0VKA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(136003)(346002)(376002)(396003)(366004)(39860400002)(451199015)(36756003)(86362001)(5660300002)(38100700002)(4744005)(2906002)(38350700002)(2616005)(186003)(83380400001)(316002)(6506007)(6512007)(478600001)(6486002)(26005)(6916009)(66946007)(66556008)(66476007)(41300700001)(4326008)(52116002)(8936002)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7W9qGoHWQZqD7hhGGmf2X+tQOcdbenSD9jgutIV6MX+L/RVtt0/T700x7ICCvVL0GpSJVn/MukK1Vs8JRdK3gqzpT+WjyzXP2APGxZMsQDDni/u5bEukHL+VHM0lSJu/X8AVT9zckNdMADmqLkJOCgIBf8R0yidUjgkBeSrLjoA26Wv6Xxe0GZ4eJi4iH9qxMjOA6En8eQ7wiJBFpvPk3IelnkoBQ2MyGJVF8zZgqaqnE4zyINS/dSr71GQFD7wG080zs88v8/jjaldBVyL9JPQblWNnvlK49A8EKJwqUw0VSTWaUnFhhHlvJ6QUTFKxnFV26SmfT9IFd90GlakU3qrUrFERkkJ9uCiVCz4uU1I0bxzHH71CeIVjzcp+4iJ5/FZ+iSi8e/qt9hunf3++bvJQIJZVFxrB8tFvZPG1jdva0yExyEX9H+Bpp5p/jmWHbP1/aGUU0GFL3qJm9kLg6ZwDxvvNRGfeSH0Nv4UI5WDJh9ci52sVfByWLsr7NqUnhDGMyJBU2YmV6UgAJA8F/qtjNyllsaZBJp0qFlIXiGqPPPfLIx6dGVvzQzuYyHgctZpTL6fssA0LQmUsY2UN6E6Sck8m8/3kuqE0lrKPHH7P10CPukCbh+u14KfzA9/zEZ4oIAR5FzFRdnS0rbhmbeiN3RJpQIUlaoAOXI5Cc8QOuGzWJAPtAfEfukmGbgKoLPeDY2SDhzs3sviEIs62skDlnvMwFGVLiql6ksADGXWvQ76vyJedQiecAkBDAq+BQCwDAPVRVGODu29CQucNXX84OiTmqLjLc9JgOPUBr684cxLXqs+KCyGL2Pdl4b9y6nJLTPCX51CQULtJ2g95gskTeL4Wo8bb2jueLqIbqOK9sy5Gqtn9NIq4qkVu2B6876+Og5/x3ekB7yU7lgfz0qRNR/jNMgiwPTuNkkE0D4Z7oc3qlULKWPB1Gl2pP95Yds81tQfxYfe0UGnzrdVA/nSRLxgu+w8O8isG0buR5pYQR81f4AEbDPtTY5BQ6uRSkiZhJkHDW+dTF5lnc0HjYoLGTdSaV5lNnY4a1gAmIIdn2Nld6RtXcAGkRekxP/5GjIWWYyBQWrPQMmn6M9imDn5jYZgJr0J7ZppJdoxvRNs2KtBGAn0SXFLhmUDvSIKQugLpJBVS58nxCsgTL925E7vguz37tp1/G9U8QanU0rXeMyoFpHbXN24IdMjaCuKC1h5K60tSukrIBDDhQwvwSuELQE3Mg8iGCdW1jcGvajlH+bdLjaEanWdPi1kl8b1ele0ACF9xTSQNz9r7BEdE5jAaS7X5w6nUmiMHpYiXVrqgQpgHFhnC55pf69k6xijmJ2YiyL4ZL6l0aPcwdwkVOI8ATP7j5Lvi025jju87poMNUdotiqit3AByBQlrDRayQLdum3U4QrAIIeokUXYhA2AA4DxJmJ/0dEqfd0EThfsT4KEaydRpQjZrGptW7JGnlbKbliG3stYW107oQH4F9yrmQFtpEValVQeNugljqcqg74ZSfEt1h496G+vEmu2HL0piZxzGLocaMmMssaqQ1lEs/fT7XTANxl+36GwOyBSSwUtsPu3uX5PcQp0ORGs+rd92QtJvRWUEVwJNSuBb3/Ga+eUxf8fcUglbIwig8Eo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9a8ca77-bcff-4bbb-b082-08dab0988600 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 23:37:15.6837 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: w6Aip7QQO4keyphoVezDhXF2eDisdSffAqR1+99Esxr1kXx8XSP1iazZ2sA8LmnwQXbXzNWCOSd4+aQbpGd5GstZSRGUPpDc6Kb7SLlmdQCfhOIsDhAO7rLScYyo15ro X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8180 Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Kuninori Morimoto dapm_up_seq is arranged in numerical order, but _dai_link is out of order. This patch tidyup it. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 92140a78573d..e1657eb78fdc 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -71,9 +71,9 @@ static int dapm_up_seq[] = { [snd_soc_dapm_pinctrl] = 2, [snd_soc_dapm_clock_supply] = 2, [snd_soc_dapm_supply] = 3, + [snd_soc_dapm_dai_link] = 3, [snd_soc_dapm_micbias] = 4, [snd_soc_dapm_vmid] = 4, - [snd_soc_dapm_dai_link] = 3, [snd_soc_dapm_dai_in] = 5, [snd_soc_dapm_dai_out] = 5, [snd_soc_dapm_aif_in] = 5, From patchwork Mon Oct 17 23:37:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13009705 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3B2FCC433FE for ; Mon, 17 Oct 2022 23:39:35 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 6EE0A4A07; Tue, 18 Oct 2022 01:38:43 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6EE0A4A07 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666049973; bh=ts9qgAGZ+NfUp8D0yN/ZbyZ5Yspjers7nlTJh0lV7Wk=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=DM+8LrUaPB1Zf1k7zxGu52MoipCKmxmvE4xtMnoQLSXrXtCYbzraD2+mlwDE+OPDZ /lljRUPLt72FPi/RLSt4jLLpmOkHmQcQvA+N1Ijdi+ujifB3y3YQoWuagYm4OpAkEo UkgPpriKh4BVyrcaRT8yNqaKmtz0VPUy2+W6Z3KA= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id D5668F8053D; Tue, 18 Oct 2022 01:37:38 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DD53AF800AA; Tue, 18 Oct 2022 01:37:36 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2132.outbound.protection.outlook.com [40.107.114.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 3863CF804D9 for ; Tue, 18 Oct 2022 01:37:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3863CF804D9 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="hgALOVKd" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XoxvUM83RfD6R2ZORmX32YikJCFp0wVH5dGLPEHCUS6bI26jZH4en1LlwXwY4czsvgkAyi+v/HHPz7KioD7Etz9U6LOuXnsOXv543Lq4f98gZmD7UzHdxEjfK/v2QG8b/FWt1lZ967d/BbcC82e0yb6pvOdembVOVNoyAbXq9yPR/cZxDz0PAp504UMA79QBSQHXmT8DNz25ZU2UXfjMe+27wqSyoHvMbVqOQhR+bpEyieYBfRzSUGd/6uZzTmeuZCY2Bhscn2735ywWeP5xjq1XR5ek3Uez+Et5+s97k/XBwI5whnraWCneuns9Y5es7kjP+X7Id06wyQ6i/uVEGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=k+uZwWuHOzVDByXqiRsc3L1cGM5dl4icoq7mH26bXiw=; b=Di9AwkpLKh1opOE0rXBis3juDlfgd4n/aS6Ue1FSa+E4HUpVIOuSX4dUY42pHdhzaPtaeo6E1ZXdzcVLPEhdNHx6vFbzyYz8cPjkkgrPKhEofEVgXCCrdFDrqTFIesbG3cAKbBw8ejVHrr+buO2cwQN3B9bNT8fX/DhpUpvAsb4fFhGFuhULzKD65k470OQ9OdbnhAMg6F4Xe6ZF+6e63wFySeA6JhFDaQtPybDW7whtMBMhvag0n/PissjIyrRS71EG08Pk7Gw+Q9biZhYbkAH7WFQyaChRqQ2ZHjvj73gSjG2ZH6Tp7qe3Y0zXSqU4tTmylJwhLEUW0Vl647Q5JQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=k+uZwWuHOzVDByXqiRsc3L1cGM5dl4icoq7mH26bXiw=; b=hgALOVKdNOjz7g08xNcKOiGXmJv3Bl0QYoGi5sIXCKhPU7aj+RJ8fT+SFdJtN3BC62JkJyUSWG74jI6nU6LcGfA7A32yE1pyDDqiw/MXl4qRIXOE4rEpsYImfOyXBA0vkMKgRaPpjwK6lFWopIQGrRZ8ocWX+iq5e9yh/ccYhk4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB8180.jpnprd01.prod.outlook.com (2603:1096:604:176::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Mon, 17 Oct 2022 23:37:21 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53%6]) with mapi id 15.20.5723.033; Mon, 17 Oct 2022 23:37:21 +0000 Message-ID: <87pmeqowcu.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 09/11] ASoC: soc-dapm.h: cleanup white space User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> References: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 17 Oct 2022 23:37:21 +0000 X-ClientProxiedBy: TYCPR01CA0187.jpnprd01.prod.outlook.com (2603:1096:400:2b0::8) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB8180:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f7ad0b3-9286-4e03-d6f1-08dab0988975 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S2cbnN4EhvXzEHZR8rojDQKPsC3Ehbbjmnhn9JSkmNgyuWNPAjl3EhbinpuZZ+mn7fdGR/Nozn0omM2z46P2OJLBdNf5oZIQXox4nABxCYgdOknfG9Hgq2G/5WToc/wGT1qzFnRHc2OFXXjZ44jaiYtPaHB1oxi/eqNv2cDMTUTtUqXH+at3OIn3K9MN+cw9S/yn6jek5vDwWBSZr6u9DiKad3PQlHL5tZj5fczlko4OUeCGIbSyLchHdDm2njyyOJW3CX9YUmm471kwsuYQIt3OqXX5vT2TaXb3/h7seXMeoaZPQjF6PULg1BIR6K5xhFPErCfiP/eUlRkJO5o6CanjvyKEB7LKf0L6VClHINtOlG7MDTgWaFiA0AJ0zRc9TyFngLhZX2IRxkCV4/K0VEaWKe7cEAUxZWhz9k0lBY+YWSChZRZZ1CgIvs6KWRSchumUen6/3AdpUhtFi6rakpDWhc6bvKbYlH2hfddipMac/mTpsU2bHfQfqPfmn3BdFl5En2qicF0JwsXDxgQE/x9SSf5EQ+OyVgB5h+GB6/HLCelPwnYXD9vX2Zyt0MhRaq7wx7YzOpkr8qbiil03gHh/muaIo5cLwHa5vFIdCPRFDx5fs25yTgGvnVmEIYigLauG9jA123oFFsquQGVXX9W2qWrorYSzuf0uklG77pTvJa6QVqmFJ2uLz9eIsBdbUrJTrGrnZ1B5CmOnYahTlbV9dGH7TYlM9V+ZLJb/MD066FjpPv+5qVbsOFdAs4zoW20sx9lp3BJCfvQTDZ0rxQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(136003)(346002)(376002)(396003)(366004)(39860400002)(451199015)(36756003)(86362001)(5660300002)(38100700002)(30864003)(2906002)(38350700002)(2616005)(186003)(83380400001)(316002)(6506007)(6512007)(478600001)(6486002)(26005)(6916009)(66946007)(66556008)(66476007)(41300700001)(4326008)(52116002)(8936002)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YdnN1SipelMu9PMICRXaR9s7hNF7U7TT7QGAR8zCuCBPWdlZ6x++0BWAQM96h4rJ2SEGWSIXnUPlZcDDYZFYF98t/ahUYyZVs9Co8AJH7zIptacItFCqlTyy8WqS4QlczAFnUBKQ1PNuTHtE1//E/sM/1aWBNoAhOHMk79MWsbXQGwlswHTzg734LggjZdLXd1xKmnTHZONpxKIp7rFJoi1J1DxTboPTcrriYWgOND9miVyz3ND4YnW0nIHa54PhJlY/VVhC3DQ5kgWqJm5w3Xnc2e6G55IM0bvChzrGJi44JLNSNCEnNHm2ngc7zFAdqxjf5IamTw14d87d0gDcqJCz/1KNby3MkqaoDzm25lZxJjgi/BSfpH2Upfjc5747IDfr18Hz9w+pzPrGDD296KhrKptPhchy+P3wy2eLR1iIk7phQJLqk58AXJqQRZKHUJaeAw8zDoLMcsiBSrLLw/cP/LDL7W56ZwKOARV/tu0HnXe4R5hEuQ1lyq/rG2jY4l54EuqgFBkehpf/SeU1O/0JGnPke5Fsyj7MPVm9UQSJLDJlfuWaRDguduO4bJxDCyyIfXd3T2c/J7UWuAAyTwf3s5UM/qhi7VYxYbVrZzOvNJ0pp3Nnk237TUQcNk+CbN/cmTGXfuQeIpcmFkaYfNmriJhgpkeqPiC3H33exwEPH1vCBEI3SlfUcfIDRDIASzToPlJx5SmJvAPxCeXKTtbKMI+rkhqt2NrxYRqm/qFp6LKW45x2kcJpETNesvYOqUgHWbSBdEUpJpgESifbIX8htsgv5k6HI2gHWhxX1dycJNH6334wmjMKLLbRo2Gr9DllRyE+qC/XyMswThdmeBYUd19cB36aV7kG/a32XCm4npB+wGKjzbr2n8CINwFYSGkS6BkvjgRJ43NePm5mn9ldjyZwmvTKWD8ZjzmhipqLPs7rTraUd8CVSRhLRTiF26AyBQAbDUDBOT7B51ilCjf31s94Qwr/723vVSs36bp3/4ne1cIecP0vXA+nQlAB0rB5iSOYxdBz/Al0lA+q9wV2KkE2cPi15r6I4mm5bLIGJnUBw4Dgmgi8U8JiknoZwPGrCFA7Hm//CZi4Z4zi93b4uEniIgJU3F2BlA7fu0t4+MDqbJnHY4R0wdG6X+yEvqHD6WH3wB1bobeMUCrADSQo3IiUYFw5d5A656zlmHzlzGEobehI8KZjtt9Lzvr3jI/HGepwJrZ+eW1kH9X3XMcucYqJzKl9OOLIVcLodMoMEU5v/RCTOymP9ptNGGoP7pdgv44vxBl8ju5Zf8Jlwrpmyaaq72w8nbl6eCEt4oHFX1s9NwyKl/HntT2xHjfD3+0uwCAniXvC6uz3nxMRDMOoU10/HTPlvy0aSV8ArwSmehMOVpUddRboeI3OcbNgL+M021eFHSCgrQjQHJ/5oWn/FWTjlnluTYSWCWia002wEQqdEmV27wZnJ/Fo9Fira4JqVnF73h4HAqZI4i2CaOYslmCqsEAE6l9dRBwiPw+SDGNV99A0n/zLZ85w6aizoXTG+QsQyfz00PoA+g/zBie3mQz+SsRrw/PdJNjbH7FygPysWVzFhX6g0/oQBuMjzG9MMmMQsY84gtcAGIrGQa9eUrzuPbH1kzACOuHUbW0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f7ad0b3-9286-4e03-d6f1-08dab0988975 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 23:37:21.5314 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gA22ep2R0oasBDzlddNrcX7990wYwL4BBbTnAtgWxJQzGLsHqoE6N3mC2eX2mHbuFrv8TRBNbRlHG2pOwwqNWx2RcJ912i5nX5mJQcsVDaS8QtB6x3afHwz6b9PPJSiG X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8180 Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Kuninori Morimoto soc-dapm.h defines many things, but it is using randam white space and tag. This patch do nothing, but cleanup its white space. This patch cleanup also 100 char in 1 line. Signed-off-by: Kuninori Morimoto --- include/sound/soc-dapm.h | 173 ++++++++++++++++----------------------- 1 file changed, 71 insertions(+), 102 deletions(-) diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 29d5700393c6..44597e63344d 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -341,31 +341,27 @@ struct soc_enum; #define SND_SOC_DAPM_STREAM_STOP 0x2 #define SND_SOC_DAPM_STREAM_SUSPEND 0x4 #define SND_SOC_DAPM_STREAM_RESUME 0x8 -#define SND_SOC_DAPM_STREAM_PAUSE_PUSH 0x10 +#define SND_SOC_DAPM_STREAM_PAUSE_PUSH 0x10 #define SND_SOC_DAPM_STREAM_PAUSE_RELEASE 0x20 /* dapm event types */ -#define SND_SOC_DAPM_PRE_PMU 0x1 /* before widget power up */ -#define SND_SOC_DAPM_POST_PMU 0x2 /* after widget power up */ -#define SND_SOC_DAPM_PRE_PMD 0x4 /* before widget power down */ -#define SND_SOC_DAPM_POST_PMD 0x8 /* after widget power down */ -#define SND_SOC_DAPM_PRE_REG 0x10 /* before audio path setup */ -#define SND_SOC_DAPM_POST_REG 0x20 /* after audio path setup */ -#define SND_SOC_DAPM_WILL_PMU 0x40 /* called at start of sequence */ -#define SND_SOC_DAPM_WILL_PMD 0x80 /* called at start of sequence */ -#define SND_SOC_DAPM_PRE_POST_PMD \ - (SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD) -#define SND_SOC_DAPM_PRE_POST_PMU \ - (SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU) +#define SND_SOC_DAPM_PRE_PMU 0x1 /* before widget power up */ +#define SND_SOC_DAPM_POST_PMU 0x2 /* after widget power up */ +#define SND_SOC_DAPM_PRE_PMD 0x4 /* before widget power down */ +#define SND_SOC_DAPM_POST_PMD 0x8 /* after widget power down */ +#define SND_SOC_DAPM_PRE_REG 0x10 /* before audio path setup */ +#define SND_SOC_DAPM_POST_REG 0x20 /* after audio path setup */ +#define SND_SOC_DAPM_WILL_PMU 0x40 /* called at start of sequence */ +#define SND_SOC_DAPM_WILL_PMD 0x80 /* called at start of sequence */ +#define SND_SOC_DAPM_PRE_POST_PMD (SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD) +#define SND_SOC_DAPM_PRE_POST_PMU (SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU) /* convenience event type detection */ -#define SND_SOC_DAPM_EVENT_ON(e) \ - (e & (SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU)) -#define SND_SOC_DAPM_EVENT_OFF(e) \ - (e & (SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD)) +#define SND_SOC_DAPM_EVENT_ON(e) (e & (SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU)) +#define SND_SOC_DAPM_EVENT_OFF(e) (e & (SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD)) /* regulator widget flags */ -#define SND_SOC_DAPM_REGULATOR_BYPASS 0x1 /* bypass when disabled */ +#define SND_SOC_DAPM_REGULATOR_BYPASS 0x1 /* bypass when disabled */ struct snd_soc_dapm_widget; enum snd_soc_dapm_type; @@ -396,18 +392,13 @@ enum snd_soc_bias_level { SND_SOC_BIAS_ON = 3, }; -int dapm_regulator_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event); -int dapm_clock_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event); -int dapm_pinctrl_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event); +int dapm_regulator_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event); +int dapm_clock_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event); +int dapm_pinctrl_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event); /* dapm controls */ -int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol); -int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol); +int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); +int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol, @@ -419,30 +410,24 @@ int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol, int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *uncontrol); int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm, - const struct snd_soc_dapm_widget *widget, - int num); -struct snd_soc_dapm_widget *snd_soc_dapm_new_control( - struct snd_soc_dapm_context *dapm, + const struct snd_soc_dapm_widget *widget, int num); +struct snd_soc_dapm_widget *snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, const struct snd_soc_dapm_widget *widget); -struct snd_soc_dapm_widget *snd_soc_dapm_new_control_unlocked( - struct snd_soc_dapm_context *dapm, +struct snd_soc_dapm_widget *snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, const struct snd_soc_dapm_widget *widget); -int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, - struct snd_soc_dai *dai); +int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, struct snd_soc_dai *dai); void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w); int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card); void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card); int snd_soc_dapm_update_dai(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params, - struct snd_soc_dai *dai); + struct snd_pcm_hw_params *params, struct snd_soc_dai *dai); /* dapm path setup */ int snd_soc_dapm_new_widgets(struct snd_soc_card *card); void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm); void snd_soc_dapm_init(struct snd_soc_dapm_context *dapm, - struct snd_soc_card *card, - struct snd_soc_component *component); + struct snd_soc_card *card, struct snd_soc_component *component); int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm, const struct snd_soc_dapm_route *route, int num); int snd_soc_dapm_del_routes(struct snd_soc_dapm_context *dapm, @@ -452,46 +437,34 @@ int snd_soc_dapm_weak_routes(struct snd_soc_dapm_context *dapm, void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w); /* dapm events */ -void snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream, - int event); +void snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream, int event); void snd_soc_dapm_stream_stop(struct snd_soc_pcm_runtime *rtd, int stream); void snd_soc_dapm_shutdown(struct snd_soc_card *card); /* external DAPM widget events */ int snd_soc_dapm_mixer_update_power(struct snd_soc_dapm_context *dapm, - struct snd_kcontrol *kcontrol, int connect, - struct snd_soc_dapm_update *update); + struct snd_kcontrol *kcontrol, int connect, struct snd_soc_dapm_update *update); int snd_soc_dapm_mux_update_power(struct snd_soc_dapm_context *dapm, struct snd_kcontrol *kcontrol, int mux, struct soc_enum *e, struct snd_soc_dapm_update *update); /* dapm sys fs - used by the core */ extern struct attribute *soc_dapm_dev_attrs[]; -void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm, - struct dentry *parent); +void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm, struct dentry *parent); /* dapm audio pin control and status */ -int snd_soc_dapm_enable_pin(struct snd_soc_dapm_context *dapm, - const char *pin); -int snd_soc_dapm_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, - const char *pin); -int snd_soc_dapm_disable_pin(struct snd_soc_dapm_context *dapm, - const char *pin); -int snd_soc_dapm_disable_pin_unlocked(struct snd_soc_dapm_context *dapm, - const char *pin); +int snd_soc_dapm_enable_pin(struct snd_soc_dapm_context *dapm, const char *pin); +int snd_soc_dapm_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, const char *pin); +int snd_soc_dapm_disable_pin(struct snd_soc_dapm_context *dapm, const char *pin); +int snd_soc_dapm_disable_pin_unlocked(struct snd_soc_dapm_context *dapm, const char *pin); int snd_soc_dapm_nc_pin(struct snd_soc_dapm_context *dapm, const char *pin); -int snd_soc_dapm_nc_pin_unlocked(struct snd_soc_dapm_context *dapm, - const char *pin); -int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm, - const char *pin); +int snd_soc_dapm_nc_pin_unlocked(struct snd_soc_dapm_context *dapm, const char *pin); +int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm, const char *pin); int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm); int snd_soc_dapm_sync_unlocked(struct snd_soc_dapm_context *dapm); -int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm, - const char *pin); -int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, - const char *pin); -int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm, - const char *pin); +int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm, const char *pin); +int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, const char *pin); +int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm, const char *pin); unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol); /* Mostly internal - should not normally be used */ @@ -500,40 +473,35 @@ void dapm_mark_endpoints_dirty(struct snd_soc_card *card); /* dapm path query */ int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream, struct snd_soc_dapm_widget_list **list, - bool (*custom_stop_condition)(struct snd_soc_dapm_widget *, - enum snd_soc_dapm_direction)); + bool (*custom_stop_condition)(struct snd_soc_dapm_widget *, enum snd_soc_dapm_direction)); void snd_soc_dapm_dai_free_widgets(struct snd_soc_dapm_widget_list **list); -struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm( - struct snd_kcontrol *kcontrol); +struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm(struct snd_kcontrol *kcontrol); +struct snd_soc_dapm_widget *snd_soc_dapm_kcontrol_widget(struct snd_kcontrol *kcontrol); -struct snd_soc_dapm_widget *snd_soc_dapm_kcontrol_widget( - struct snd_kcontrol *kcontrol); - -int snd_soc_dapm_force_bias_level(struct snd_soc_dapm_context *dapm, - enum snd_soc_bias_level level); +int snd_soc_dapm_force_bias_level(struct snd_soc_dapm_context *dapm, enum snd_soc_bias_level level); /* dapm widget types */ enum snd_soc_dapm_type { snd_soc_dapm_input = 0, /* input pin */ snd_soc_dapm_output, /* output pin */ - snd_soc_dapm_mux, /* selects 1 analog signal from many inputs */ - snd_soc_dapm_demux, /* connects the input to one of multiple outputs */ - snd_soc_dapm_mixer, /* mixes several analog signals together */ - snd_soc_dapm_mixer_named_ctl, /* mixer with named controls */ - snd_soc_dapm_pga, /* programmable gain/attenuation (volume) */ - snd_soc_dapm_out_drv, /* output driver */ - snd_soc_dapm_adc, /* analog to digital converter */ - snd_soc_dapm_dac, /* digital to analog converter */ + snd_soc_dapm_mux, /* selects 1 analog signal from many inputs */ + snd_soc_dapm_demux, /* connects the input to one of multiple outputs */ + snd_soc_dapm_mixer, /* mixes several analog signals together */ + snd_soc_dapm_mixer_named_ctl, /* mixer with named controls */ + snd_soc_dapm_pga, /* programmable gain/attenuation (volume) */ + snd_soc_dapm_out_drv, /* output driver */ + snd_soc_dapm_adc, /* analog to digital converter */ + snd_soc_dapm_dac, /* digital to analog converter */ snd_soc_dapm_micbias, /* microphone bias (power) - DEPRECATED: use snd_soc_dapm_supply */ - snd_soc_dapm_mic, /* microphone */ - snd_soc_dapm_hp, /* headphones */ - snd_soc_dapm_spk, /* speaker */ - snd_soc_dapm_line, /* line input/output */ + snd_soc_dapm_mic, /* microphone */ + snd_soc_dapm_hp, /* headphones */ + snd_soc_dapm_spk, /* speaker */ + snd_soc_dapm_line, /* line input/output */ snd_soc_dapm_switch, /* analog switch */ - snd_soc_dapm_vmid, /* codec bias/vmid - to minimise pops */ - snd_soc_dapm_pre, /* machine specific pre widget - exec first */ - snd_soc_dapm_post, /* machine specific post widget - exec last */ + snd_soc_dapm_vmid, /* codec bias/vmid - to minimise pops */ + snd_soc_dapm_pre, /* machine specific pre widget - exec first */ + snd_soc_dapm_post, /* machine specific post widget - exec last */ snd_soc_dapm_supply, /* power/clock supply */ snd_soc_dapm_pinctrl, /* pinctrl */ snd_soc_dapm_regulator_supply, /* external regulator */ @@ -599,9 +567,9 @@ struct snd_soc_dapm_path { }; /* status */ - u32 connect:1; /* source and sink widgets are connected */ - u32 walking:1; /* path is in the process of being walked */ - u32 weak:1; /* path ignored for power management */ + u32 connect:1; /* source and sink widgets are connected */ + u32 walking:1; /* path is in the process of being walked */ + u32 weak:1; /* path ignored for power management */ u32 is_supply:1; /* At least one of the connected widgets is a supply */ int (*connected)(struct snd_soc_dapm_widget *source, @@ -615,8 +583,8 @@ struct snd_soc_dapm_path { /* dapm widget */ struct snd_soc_dapm_widget { enum snd_soc_dapm_type id; - const char *name; /* widget name */ - const char *sname; /* stream name */ + const char *name; /* widget name */ + const char *sname; /* stream name */ struct list_head list; struct snd_soc_dapm_context *dapm; @@ -635,7 +603,7 @@ struct snd_soc_dapm_widget { unsigned char connected:1; /* connected codec pin */ unsigned char new:1; /* cnew complete */ unsigned char force:1; /* force state */ - unsigned char ignore_suspend:1; /* kept enabled over suspend */ + unsigned char ignore_suspend:1; /* kept enabled over suspend */ unsigned char new_power:1; /* power from this run */ unsigned char power_checked:1; /* power checked this run */ unsigned char is_supply:1; /* Widget is a supply type widget */ @@ -682,13 +650,14 @@ struct snd_soc_dapm_update { /* DAPM context */ struct snd_soc_dapm_context { enum snd_soc_bias_level bias_level; - unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */ - /* Go to BIAS_OFF in suspend if the DAPM context is idle */ - unsigned int suspend_bias_off:1; - struct device *dev; /* from parent - for debug */ - struct snd_soc_component *component; /* parent component */ - struct snd_soc_card *card; /* parent card */ + /* bit field */ + unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */ + unsigned int suspend_bias_off:1; /* Use BIAS_OFF in suspend if the DAPM is idle */ + + struct device *dev; /* from parent - for debug */ + struct snd_soc_component *component; /* parent component */ + struct snd_soc_card *card; /* parent card */ /* used during DAPM updates */ enum snd_soc_bias_level target_bias_level; @@ -762,8 +731,8 @@ enum snd_soc_dapm_direction { #define SND_SOC_DAPM_DIR_TO_EP(x) BIT(x) -#define SND_SOC_DAPM_EP_SOURCE SND_SOC_DAPM_DIR_TO_EP(SND_SOC_DAPM_DIR_IN) -#define SND_SOC_DAPM_EP_SINK SND_SOC_DAPM_DIR_TO_EP(SND_SOC_DAPM_DIR_OUT) +#define SND_SOC_DAPM_EP_SOURCE SND_SOC_DAPM_DIR_TO_EP(SND_SOC_DAPM_DIR_IN) +#define SND_SOC_DAPM_EP_SINK SND_SOC_DAPM_DIR_TO_EP(SND_SOC_DAPM_DIR_OUT) /** * snd_soc_dapm_widget_for_each_sink_path - Iterates over all paths in the From patchwork Mon Oct 17 23:37:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13009706 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C79CEC433FE for ; Mon, 17 Oct 2022 23:39:55 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 0D23E3E07; Tue, 18 Oct 2022 01:39:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0D23E3E07 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666049994; bh=QB+3wt1ouhpJpsrupQxpbiZ46465zHSxemrQyBGg5m8=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=fhFMC73x5JvZZEA6ojFIqffDGhNn7dknpMCK6AEfnn1cCzNysrkeUZcXnwGYLmOMY gv5S4gGz/YX5bVbK/mjBWadmHaFAizIoYgEwWa2xiRBELbMOSpn0tEnDWqqmct2yer 0KbSXhYuhKqErDJSO640dRKzQ+P6XjWn4gp1Ul04= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 4F9CEF8059F; Tue, 18 Oct 2022 01:37:41 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2BAA8F8059F; Tue, 18 Oct 2022 01:37:40 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2132.outbound.protection.outlook.com [40.107.114.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 7E236F80149 for ; Tue, 18 Oct 2022 01:37:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7E236F80149 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="ThBykJmR" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L6eNG3m1DKOOFuej/WAy/MXkQQ0WPSv0ummsMEEHtzBEr7RxPo8kgXVMEhbF7DJ4btn7ayAa0ddFXi7hcUn6r14oq+DZQpti4Z4gf53gEsaj4gAlaLFkbaIiD0zONK+xLqNTxicSkqYZmojYXUJyDKedWMWt/Dntjp82GCOB0cdXpmH/ziULcmVQ9iuGjtBN9ZYQT/s5tUP5QDW1UZQu4AdVpeBfUH5pGQnfmqy5DcvQxmtmTgEp6/AS9DNAcFcQmk9ebHT3Ovb2JXBofPBcEKtCC5mKT3yvE5UKyjyWaG4QAGQT7KB+wnZFdDENNdK8AzO5XsxEFs+7Uf8TUN11mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=U8GmyKLYjPI6WO6tQMsbWAe2YZf1jXH6TaAyCcOrq4g=; b=RSAE0FDk7R5kOV80xGubLYKZzjXZwzPeK+wUbTeAUfaeEQm5EUErhzujgSEHQYG/Jc4I72UQqRluzcTeyOVr/ZrPocJCKM3zHcVqd/isuHDZaefGAFKDtqDt8krB6ChAl+E/35/SBZeKeCj4etB3yFNiuBSkVOs5cyBAMW1aGX8FD2JPjCCZiO7UPTrwAYsHbQtBI3u7jBVC3BVljbrkhu83SCKuaHAkWfpsrmDCddf4FVo5aFhx7rfCu0ApMbDwSNAu3g9e+KYxH1shhEecaYWuKPQQrVrmP/48j8H4oF8UFR1wu0rVOIQLItHXx5mTzzQegj/SsgA94Sq9EhxNKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=U8GmyKLYjPI6WO6tQMsbWAe2YZf1jXH6TaAyCcOrq4g=; b=ThBykJmRk9iquOwbwURuQV6n2VC5CkLPfy/b2bA1nTJjf5xwpgxSzq5OGXFRRyXQNj2hv76G0lPcEw9Dp87qRo+/B8d78hafZYZ18nNrSsXA0qPqqGZpuHwkjHpRlaCnmpRPx66VdLsMwG702RaaVSGyI9izKXznl6Z7CnVJF6I= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB8180.jpnprd01.prod.outlook.com (2603:1096:604:176::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Mon, 17 Oct 2022 23:37:27 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53%6]) with mapi id 15.20.5723.033; Mon, 17 Oct 2022 23:37:27 +0000 Message-ID: <87o7uaowcp.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 10/11] ASoC: soc-dapm.h: fixup comment for snd_soc_dapm_widget_for_each_path() User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> References: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 17 Oct 2022 23:37:26 +0000 X-ClientProxiedBy: TYAPR01CA0066.jpnprd01.prod.outlook.com (2603:1096:404:2b::30) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB8180:EE_ X-MS-Office365-Filtering-Correlation-Id: e04a4cb3-65eb-4387-cd4c-08dab0988cb8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iTWix9erTVsAb/xVgANUc8w7+h9mkV1v+CO7BysCDwaG/8A+Is28fBQZzi9TQAyZZnnBXf4OjZWc1jwwEQIAj+z1i1TL6JMrD369fyE/U4807yhkfpgg/QD88Lhi4TsQRVFCClyL0I+BwYvcKPruXAg+8N1IrBz1zccmIF8krz3oW4Iriqb192xIFbOwCzWf1/oa+OlwFerTHQ9YokoJj0laeIwpGEPQoux3fYIbu3xSfUcMjycsa4tQHPQmZlVOtup3xCMmHKWqEnD3kTIzc35wpjzURdgRYMXGOWqi/9HKeWrsTxz3yTVY3ZLa34Ckz+JSM27LlXOvGwFXeAI1v1otMpmJzb37xhLKK4VBq0IErXBbZY8sdYOeYKkQfORNSwTLrSbtVvajv3tnz0fHuJR2iWbFDMaNEJE4UliCwiD+TW2QWHBP1IP1Py0Ou/+xUxlRopy1LcR+Rr5qxGFYS/ie2xztylScSMO6IyqqV2KsCEtbrp9CxVS12pLHHmlkKZKaXHwa8G5T/5aPJgFbgKNg2jkw7EK2owdsEV1M5YO5lXsB/mFzOkfWE2/mNlo0APQNRhuuB0fpQjbJjsL5T8lH/RNnNT/KPW8gfUokrBoI1L9PMI/oQp00GO7ooxTu7ANo5aTThavVMCg+T9Rw/mIuMMDEOi2XJIsttmCKXWSK1PsyMYEFT2IVQDjTL3HcAU42/0xavh5T7OV//61W2pxrbsh02n1EXIyxOkm4NylNQfbBUSlBUGvQyZiF0ajbduwFzJiXXh4OAAdikckznQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(136003)(346002)(376002)(396003)(366004)(39860400002)(451199015)(36756003)(86362001)(5660300002)(38100700002)(2906002)(38350700002)(2616005)(186003)(83380400001)(316002)(6506007)(6512007)(478600001)(6486002)(26005)(6916009)(66946007)(66556008)(66476007)(41300700001)(4326008)(52116002)(8936002)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dzHeQNB0R896iMKnagqbkI6kDnDk1k7wIjRivPPscjFJALkKPOQ6l+AO8JVduTlWZtJI4DRbGBhXKXsTdNz8V9ujK2waJfEN6U+/1qqoUqUTHd3ImXmSg+EgYkXYfRkFA6G4dpqv73+YNpTtcg911sB7Qdg2YySkl9ynwQbD7hSDV3aXv1t9k4oao5If1YDcdGvZp4+UdipvdLG6JYK0Kj6DwSFpEELRahhNvZlMEx6LXYRlUFfQyeLqxXU32PgA0n5OEA0+69N47rsNEwUU4IWSU6dBWWLD3YUScXffgKpCgFrFe6VZN9r6JWhE+xoYzUYpd8bs9+0lVZcVc+XbiRGjIzDV23yz1f6D7eHn503QmboL4mdrVBXEf+47O2QFaJsf0kQ9yJh3dYUnfQeyvAxY0FNoE47Qc9HrMjuwjnx8V1nPp172JUKugtaZVQTwyLZd9UCLVHnOfj3lHcwScZ6j6TpAgnzc6XTkvuCHovGtIkcHdWUzB0k7w9Kco7Cahz+sY05yZ+CO+tlbGbeWktP1rbMMn/lU5SVTgi+4mK7JLNCO3MzA0IhI1s8O1UcGQhwnovSjS7sh1n6b+4UxPLk4r9PJ9ekWE0o4/Vofg4YPqMokRN3OX9TjUODVQOjNedzz2xttUb4Wi8C0LvnFDuFxp0xQJ57ddmBTQDzIeDgOEVSwiBXHM2XIutsDJUWWSPz3dof1KHN0icrZW0tRcrIjqveoxao/t9o4ZLcKQIdqXJNQjQ46dWDtPpzjji2dWQWROApyCb3d33SYeByQVeAjjBYh1RNjOsjG3YccmgKgbKs8+l5yv3GWc3SHEmdgwqwJETtnpO4umsPhnaxPfSL7qGtTk8IwIYMLsvWdcd9p8JKDg9lSoJRtJBWV133gmBuI81+wgdUlrhnDT3BSOFqgDK4MAuBFHeywplex0cOQ5kfcxZCrzrsQ/d1XRIaJwrk6JF57C1x3z8xLQRyhlZ0oMb1u73WrkmSJjXeK8efYCmGyHTWivTvxEDWqRFG3LRaQWXeg5F745Kz3ZkvX8XQjE7G4UvbhMde+uWWC0p6RSMPbSFN0QyOc3WyIprbjqMhCJ4GdJK1JeHUwwo/LSPgDiwiGH+0jALJJ/YeB2elzqAbm+iVrm71VfTtQgYs3NR7DpELMAxs3WgkSTzRJFXSDOER4C0huAxOFwHwycZT/D+dxWwVl83WS70IEn2CHBcoJX+xtBZZyblMs7UJX45Dv8u7TO7HOJfn6NKLJj0e+Bydt7CTcgi9xNvdTnLYyJoJxSeURibWrHnswx2Sih5UClP0elvxEWw84XWXONjoqMwMt4MFff7ncFM8B4VKoFrp22zeSDaRyPOSsonoNItAqJvKc4wOsL1AfwkkzthUMSs7SsxjVCa0tHhNnwBCTwwapcVvH0GZJQlZ8LfvRw2mtlXtcvY54D4AALLIAKHq6PtTpFeGHvDUml0TCTuwuozbDxOupQiVdivtG41lWBaVpIBnS8D9Sv1zj4Vj7jmtaiX23ksGYruLG6NTzTTy1OVgA2zCLmJMA2S4m7UACBa2g0KKR8kOwjzUfuU+M1QuiqfxdCitmKSCewR9T55VRCzYHpi8Ooii4/qPk7LiB//QAzjeosteGeeo2hq5fJL0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e04a4cb3-65eb-4387-cd4c-08dab0988cb8 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 23:37:26.9423 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jy1eve4fwPc8Kda46GqxACe2opkM7DxapSOUdAgTZV/Mj7bq9MrDMbu6waiN9QrWdDF3chO+MYF8DBiiSeyRmYZc1sUVXcnEQ8HuavuoXUBUvbUZZ8zU7uRYkw2J/ad8 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8180 Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Kuninori Morimoto The comment of snd_soc_dapm_widget_for_each_path() (= X) has "_sink_" (= s), but this is typo. With "_sink_" is already exist at (A). This patch fixup it. /** (s) * snd_soc_dapm_widget_for_each_sink_path - ... * **** */ (X) #define snd_soc_dapm_widget_for_each_path(w, dir, p) /** (s) * snd_soc_dapm_widget_for_each_sink_path_safe - ... * **** */ (X) #define snd_soc_dapm_widget_for_each_path_safe(w, dir, p, next_p) (A) #define snd_soc_dapm_widget_for_each_sink_path(w, p) **** Signed-off-by: Kuninori Morimoto --- include/sound/soc-dapm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 44597e63344d..77495e5988c1 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -735,7 +735,7 @@ enum snd_soc_dapm_direction { #define SND_SOC_DAPM_EP_SINK SND_SOC_DAPM_DIR_TO_EP(SND_SOC_DAPM_DIR_OUT) /** - * snd_soc_dapm_widget_for_each_sink_path - Iterates over all paths in the + * snd_soc_dapm_widget_for_each_path - Iterates over all paths in the * specified direction of a widget * @w: The widget * @dir: Whether to iterate over the paths where the specified widget is the @@ -746,7 +746,7 @@ enum snd_soc_dapm_direction { list_for_each_entry(p, &w->edges[dir], list_node[dir]) /** - * snd_soc_dapm_widget_for_each_sink_path_safe - Iterates over all paths in the + * snd_soc_dapm_widget_for_each_path_safe - Iterates over all paths in the * specified direction of a widget * @w: The widget * @dir: Whether to iterate over the paths where the specified widget is the @@ -754,7 +754,7 @@ enum snd_soc_dapm_direction { * @p: The path iterator variable * @next_p: Temporary storage for the next path * - * This function works like snd_soc_dapm_widget_for_each_sink_path, expect that + * This function works like snd_soc_dapm_widget_for_each_path, expect that * it is safe to remove the current path from the list while iterating */ #define snd_soc_dapm_widget_for_each_path_safe(w, dir, p, next_p) \ From patchwork Mon Oct 17 23:37:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13009707 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BE840C433FE for ; Mon, 17 Oct 2022 23:40:04 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 03A258E35; Tue, 18 Oct 2022 01:39:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 03A258E35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666050003; bh=DXjoQ6fWdOF140b03+p6tZNuGNBBK1fcepGfgEQSjq4=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=ZQt1FFE1G9jtPFZ82YHR5rlvtdVPb/bXZ0ZTyICxm7tx381sWD3KIE6e/IXzksFNH eithVEwkAcX+CU3b+fIAQH7pW8MmuiZSjn3QVBkd2fzVbGD3qWExKvcAYJmzNDpiNQ mvxx2EwfmrLLH/fIYtJ7YVXwZwTdtoEe7Q9QHXm0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 34C44F805A8; Tue, 18 Oct 2022 01:37:46 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D7627F805AA; Tue, 18 Oct 2022 01:37:41 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2132.outbound.protection.outlook.com [40.107.114.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 24859F80558 for ; Tue, 18 Oct 2022 01:37:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 24859F80558 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="L/k2tEvl" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=acYfLaxduk/DA+pC1tEH6JZgMv3bmVqj/7uiwSmmSnJzLOxvH+YnvmbRGuBdli5LE2PQXM7dKfCnQVbltXM0GOUzmCauLAmTBMhtttQ9OiIhRTH3lasZSujDoMDfodb90pWvt0H074o6abG8U+lRp9wnlb9EckMEBGc86FwgCpa0GZnNb7LIp5vT/UmtLkDipGhEcCb00LSE9Pfkmxg4tbQZXvF6avoJ+eCFCojCa4XzU/AmBeT10dDrpRPvrxtkM0ZtttLryLDQvxyvmFVqk/fNb5uvg2XKTStZnmgTY+Gsc7Tjz003JL3hrA3MNkciIJqGox1V8nXsdjtTK+EK2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YcJwnwKypDyuSGc3/d08Q7cuBDi9r8no8ZMLU529TCo=; b=m308bdeEferKpyKNtBKBKV+owaA8L2JxStsaE0X69PgCcBp5WSSmeXYhRLjkelPqqfy9hTzQbNjElE8pDurp4zWPwXMcYyunBSiBomuwMkoAUF2EpIXs4wYYEpEZiTEDwuQPutriVrvukBSHfFyasOAhP0YcKKJig7v4ox8oGE8rmUR7h4i16rZEWWOLwno7y8Z2Yr3mNs2J6NFxEzIFrZNxm+0naGuTCfEXjH6Ci8IKvkhCjmkXQ6tRyrdtD6h79WvNp10uoTDIM40EwrRKZM1lXuyc+orzE7kNXMZNRNQmFd9ZqnqTn1uigcvqLRWCXXDnJAc0gp2FIDe+e+oZlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YcJwnwKypDyuSGc3/d08Q7cuBDi9r8no8ZMLU529TCo=; b=L/k2tEvlg4ZbDgxbTMW+QuIBf0782N8Ccg2JQQOHy1X2GxsrGyMdnw4paoj+LYwXBbRlKtexU/1/vg9xU+iZ2ZLijm6DmLwRXGEXrPa6eVdQl2jDVD68hu5Hcz76kgZG2DxuAAexlGBtPtJeQjtM6z1Ieehy3IoYHIPsul41G4g= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB8180.jpnprd01.prod.outlook.com (2603:1096:604:176::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Mon, 17 Oct 2022 23:37:32 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::8860:a9ae:8e74:ec53%6]) with mapi id 15.20.5723.033; Mon, 17 Oct 2022 23:37:32 +0000 Message-ID: <87mt9uowcj.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 11/11] ASoC: soc-dpcm.h: remove snd_soc_dpcm::hw_param User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> References: <8735bmqazf.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 17 Oct 2022 23:37:32 +0000 X-ClientProxiedBy: TYCP286CA0061.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31a::13) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB8180:EE_ X-MS-Office365-Filtering-Correlation-Id: 0b1ee9eb-ee64-4a52-2e74-08dab0989003 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AS39LE59YTzU+VLIX87zjDf1l9Jwk62POjWmQKwI1Tqs479RFb8Xy+QDK78maP1OuTaunEKZZmNjvZICR1S0F1VegacwKWWHFwhtgFIOsOQDFbkmK7spPeSqB5O3N29gYwht7i8PTPuJNQgZa1BTrGosIkITZyaGCkh9T3v0eCVdsQTRiKco1U868c2iS3G5leJ9wR6OHCQGCO05HaiUimN6gRvPYli3cyoho/Zrv3932rnCUcXg8ib1DO81cUhNu3ua85/l42MQ7fdyDHJbIQrdvrlfdyAIh9L6Lx7KBaxVFPI34JgY1EgB8Kq/s+7wL9IvED7X8FfvX8KvsjFMD8ujPHNgPQoQw1nHT7fxH/4/0GNnhDi9iJvd/UzsGPE8AzFzKpRewrITxK2F8pHVYP+mTDavXepIKbLO+CK729v+FOqMX342j1ImbKKD/xXjZJk0ziV4YWqr53uTMFVrrxRWN+0fi0x+wxBlaqMwNxx8YLVSfEVaXvfWlNIoFGbP7HbRzIyio9ORMK3NP0eF6QLb/S7JMykH2f97/fSW7e/oDszbwQPPbpFmd9uFU5Td5e9iSFT96BDYwn/wSM5grPIGEMAL6JaLXMt4DaLl+TaoKzrN4s6pfW51Wa2EioyPfOuWcaLqcWCNpl8xwxQACZhqMG7ZgGUDYJQ8qR50vCiWIXFK4asgG0hvUz2GAV0NTz7s73JWotJ+6MJg0dWoY5wnCt5g3dZMGBQRNl3ATzZqpLvltE2YUzd+itGTVpki X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(136003)(346002)(376002)(396003)(366004)(39860400002)(451199015)(36756003)(86362001)(5660300002)(38100700002)(2906002)(38350700002)(2616005)(186003)(83380400001)(316002)(6506007)(6512007)(478600001)(6486002)(26005)(6916009)(66946007)(66556008)(66476007)(41300700001)(4326008)(52116002)(8936002)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vApVoZ4qCrANkeHdzY2klNqqTfcPcSOp8P5VBZLGLFU7XgML6+fmr8S1gtvCb8XycYd1OCxRll7bC4AoQCfM7MXaqQWSE+Wyh65FkaH7JOU2Ho3rbBRnSaY0XSFwrVXAphWwYst71LrfEsKweo3u1MjMVffS89MROLK8aqsneXMEjHQaib8zv2/6osoRz9fmDVaT0jR8KLpixOn6XtgdiSYmbCcdhVk16+sQyWNFlJZkUW5LRym8f7uYk6Nyv4X6wjy8NCQTB1DXIJEDbR0TS07XCk7yF4MSdee2yXPvaTmoKPSK1kS+YTef83Cd/GXRyV/NHuzbOj/zitRqnytgllB3tKhD3pemp/8HZ/LJdC9NW8LBEjv1Ai/u6xL0LL0MYgFrhz/U6yQfX12G5QMzNTk5TFdJeorbvsL/xNQ1TTOwZsXDwJ/762+kVs8xitMDUzAyYZ5NH4gVqDTBl+mkVIzhBB39Sip77LZFHfY13oFb58RcQ63SjuupYX0tP1NaNxU319GOT5HGbybUViFijlfJQIe+EmZj3DgGjHrkG+a6v1qrlAw3UkvirLeUPH0E+8XlPMOxxGEpkLe1fDOm8pxS/h2KT2iG+dKRoXpy5KMNQWBEbpuQme+25eaM68tnsFF2mOn5AWfl4ajktnK6kKjQ22e9aQLjgxX09gTEL90IkvsYn1LY1b6yVHyyHaXu31CBHm8tS/Z3yEDrHtvm7w/BAeEhSDfSt7aX04i71QYP4Wm3UWlpQTdiKtvD3GTEzU8bXyV2XuR0bywzXd2kq8lkXfsPn35BPHtg88hDwbprNLYSPhiUpCpgWXzDZPTGpVerv7m3iq05j2s3Eo4UpssPS9OBp77CCcfE6C2bPm3g64EM1RtbFkIeTbvSmqYfcCIvVFMgeiqiQMPWAG4rJBXck0rHlzt/vJy1PwNyNx150OUzF7xZ0/MB96TMY1a3rcZVCax6HPjqA6DbIBubxaq8cLZ3wEcZLajkY2aeQesL+k7/K8co+wFVQAd/HJvts8SluZDSVcS51c9rEiZY+IkrENVBtq531+uIVqWeG7/IIMUZVRjdmNb69O6m0v+BjK2TTwGuPHPM9v89MXjOnJ8R5WO6l24NtsL44rVHMd2oXjs7Oqy1orELaurPO4YHqQ9XHH5a1L7rjicjYeQ7jCsfqNe3MMw7Bt7ec/flgsFZTwuGKNGuFTj1S6NeovyE0nOlq94LDFlkso57cLINlxabJvbBmUikYJ/aBQK1Y3sobfW9gXZcQvalb3BYs7Rw54a1O3vlcpRBBALbV+P8dxANV2HaNPOXxwPjxiLoQE9+S9ppC5UoC8gi3ulNmtgSJiYCitJzBmByiBD5bB08X+yUao76HqZRp3klRbshRIuhbQ8EWhJWQKxXknUaFgEYJtUT52Ym68ZvDo9FMY6oNhdhF3SSA/A6dAR12pGT6lhxfCBrO5P8eDxF9BoQ0Gzy0zLCB36r9QK8u3BYZ0Tcen6MNsI/er/GxsXadXX58/e/VWo0/erqSb/AcXfL2NDjvtmJeEZ+Ajxnn3HgvZJ14UReCtjKpiBXOhAAg/A/033snyp9BUUXhqO+mFkMeE2frK6dwmA1rUho1VhMVZ1sqozbHprjbdpCNwzE9fyYYcE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0b1ee9eb-ee64-4a52-2e74-08dab0989003 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 23:37:32.4929 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Unjy44WBfrX5TZ4KH18MvRwsXthm9/O6M9XNkAil3v08/QjOkmb+6khHIieoT4M05i4g5XX+L+eKp3OMuwop1/Lochnaq/CPyd74QzlPPw0qqXRvu9sgIz0gdPwNFtT6 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8180 Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Kuninori Morimoto Current soc-pcm.c is coping fe hw_param to dpcm->hw_param (A), fixup it (B), and copy it to be (C). int dpcm_be_dai_hw_params(...) { ... for_each_dpcm_be(fe, stream, dpcm) { ... /* copy params for each dpcm */ (A) memcpy(&dpcm->hw_params, &fe->dpcm[stream].hw_params, ...) ; /* perform any hw_params fixups */ (B) ret = snd_soc_link_be_hw_params_fixup(be, &dpcm->hw_params); ... /* copy the fixed-up hw params for BE dai */ (C) memcpy(&be->dpcm[stream].hw_params, &dpcm->hw_params, ...); ... } ... } But here, (1) it is coping hw_params without caring stream (Playback/Capture), (2) we can get same value from be. We don't need to have dpcm->hw_params. This patch removes it. Signed-off-by: Kuninori Morimoto --- include/sound/soc-dpcm.h | 2 -- sound/soc/sh/rcar/core.c | 3 ++- sound/soc/soc-pcm.c | 12 +++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h index 5b689c663290..2864aed72998 100644 --- a/include/sound/soc-dpcm.h +++ b/include/sound/soc-dpcm.h @@ -78,8 +78,6 @@ struct snd_soc_dpcm { struct list_head list_be; struct list_head list_fe; - /* hw params for this link - may be different for each link */ - struct snd_pcm_hw_params hw_params; #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_state; #endif diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 7e380d71b0f8..6cebaef77f84 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1518,7 +1518,8 @@ static int rsnd_hw_params(struct snd_soc_component *component, int stream = substream->stream; for_each_dpcm_be(fe, stream, dpcm) { - struct snd_pcm_hw_params *be_params = &dpcm->hw_params; + struct snd_soc_pcm_runtime *be = dpcm->be; + struct snd_pcm_hw_params *be_params = &be->dpcm[stream].hw_params; if (params_channels(hw_params) != params_channels(be_params)) io->converted_chan = params_channels(be_params); diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 2ce9a8188378..57d748ee291e 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -155,7 +155,7 @@ static ssize_t dpcm_show_state(struct snd_soc_pcm_runtime *fe, for_each_dpcm_be(fe, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; - params = &dpcm->hw_params; + params = &be->dpcm[stream].hw_params; offset += scnprintf(buf + offset, size - offset, "- %s\n", be->dai_link->name); @@ -1980,6 +1980,8 @@ int dpcm_be_dai_hw_params(struct snd_soc_pcm_runtime *fe, int stream) int ret; for_each_dpcm_be(fe, stream, dpcm) { + struct snd_pcm_hw_params hw_params; + be = dpcm->be; be_substream = snd_soc_dpcm_get_substream(be, stream); @@ -1988,16 +1990,16 @@ int dpcm_be_dai_hw_params(struct snd_soc_pcm_runtime *fe, int stream) continue; /* copy params for each dpcm */ - memcpy(&dpcm->hw_params, &fe->dpcm[stream].hw_params, + memcpy(&hw_params, &fe->dpcm[stream].hw_params, sizeof(struct snd_pcm_hw_params)); /* perform any hw_params fixups */ - ret = snd_soc_link_be_hw_params_fixup(be, &dpcm->hw_params); + ret = snd_soc_link_be_hw_params_fixup(be, &hw_params); if (ret < 0) goto unwind; /* copy the fixed-up hw params for BE dai */ - memcpy(&be->dpcm[stream].hw_params, &dpcm->hw_params, + memcpy(&be->dpcm[stream].hw_params, &hw_params, sizeof(struct snd_pcm_hw_params)); /* only allow hw_params() if no connected FEs are running */ @@ -2012,7 +2014,7 @@ int dpcm_be_dai_hw_params(struct snd_soc_pcm_runtime *fe, int stream) dev_dbg(be->dev, "ASoC: hw_params BE %s\n", be->dai_link->name); - ret = __soc_pcm_hw_params(be, be_substream, &dpcm->hw_params); + ret = __soc_pcm_hw_params(be, be_substream, &hw_params); if (ret < 0) goto unwind;