From patchwork Wed Oct 19 00:35:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 616470 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 4C993C433FE for ; Wed, 19 Oct 2022 00:37:10 +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 2DA20A846; Wed, 19 Oct 2022 02:36:18 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2DA20A846 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666139828; 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=B+1OTtPSEAg6VD6Ae60TJhXQfXvT3mkR2QfVnvBI8FF51+sPvh90u6zvPsYGuL9EB fEa134QJ1BAfUQcX1m0q/Ni+T3ouVKKk7Jp8AIQF5DMBLo7xaDBnJkeCj0mG2i7ZEt SpGCneuIiLbnPCHR3oT6ROlw7DOUNqPt5IEwE1vk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 819E6F80543; Wed, 19 Oct 2022 02:36:10 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 76752F80548; Wed, 19 Oct 2022 02:36:09 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2092.outbound.protection.outlook.com [40.107.113.92]) (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 06405F8053C for ; Wed, 19 Oct 2022 02:36:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 06405F8053C Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="kaPpNqFy" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qwn54uyU0Px7QrcM63O7QZda/A5QQN08NDOUywT3knL0sHoQtfMSAB8/xeiiUdG7lAD4wjUP1384atgP5OqOjqyTNar0k8e9gS59sgtLTWwwy/vUFcEHimBaundphSCD1x0LAZugcV/cpUelovGj3rbNPS2zrNFa7SezdHoIhMopFlqb8QJftF3mgAIIjxbI6nqs/8Sf0RT3flvfm/HJe1d1MKA0CXOXlWiuOeh0pgASK2E8WeYDwXqZmT81SluOAMaFswaZgNJHeGEeTvy0BzuXV2FccnrAhys3diJ5SVmW7MVzY625vXLiHeDTpn2ne17QM/IPdLwxUm2uvHIgBQ== 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=QvaIbF+LNRJe+S6j7s5T20vjW94zPbN2t4aI8rvO6ekMCIoVxo6dUp7RNPeTpsgtVaNyVsPhEqVzhqeX9IiTMjT8pry+lHmuuKGOA8CT8OhY3Rmf+YjhcLz6NY/IisIyYJOPjbYa/V2sN/BSiLFq8Z0/D7ChLjuUbDUzaDX+GBfB2BVoD6EQS0sItU2oTydFuhLu3Oh1dkNEEfJwDpolrD3PTByZIv3+uOWEFRf1X8MbJye5OaboLS09NbsC0qA7vs4v7ygb7btPQ+ESWfMnWwXPkJ51NtHDBUqE9fMFLdPQFvXfWCGMrsPS6inIffMioMXrcG8z75J9OsJ4BVYzAA== 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=kaPpNqFygnbJQONYh3Exr2wZ9zBv7jpChVW1xkzXm3mN5RC5iaZKfZJwalmYeBrTzMR42RufcnIZBqdF+1/ZQ9mt+ReqqADi9qYat3e1QISLjxGfPAKgDNxM+MRkJYC9oAHuJZ5LLiqpC23s16BPALMM0jwS3d9zYoENmAdhxB0= 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 OS3PR01MB8892.jpnprd01.prod.outlook.com (2603:1096:604:17d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.33; Wed, 19 Oct 2022 00:35:57 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4cba:2bd5:dfd4:f3cf]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4cba:2bd5:dfd4:f3cf%5]) with mapi id 15.20.5723.034; Wed, 19 Oct 2022 00:35:57 +0000 Message-ID: <87a65stztf.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87bkq8tzu1.wl-kuninori.morimoto.gx@renesas.com> References: <87bkq8tzu1.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 19 Oct 2022 00:35:57 +0000 X-ClientProxiedBy: TYAPR01CA0183.jpnprd01.prod.outlook.com (2603:1096:404:ba::27) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB8892:EE_ X-MS-Office365-Filtering-Correlation-Id: 2eaceac9-4fa5-42d6-fd2d-08dab169e36e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A8a00T13YlOV0uCuRmCm8oUCuBP2hsBZZ2gQt5IU/7Xq+bLrpPzcD2gji8eLV73V/4zzZpMEbp3KkSwKVB7AL+HjuLC8v5XSUosrYt/8XiP+idY6pRd29PfaOaZFHLlLVTvKBZE5ic6XQoZY4inkAe+VvnrUJpn7lQRtKPBX5mSuzi/AWS44AE0bH09SFZfS0Yc6b6kjS3z4jwb0VEfxsiGPEI4ETnyzGojQx4J74l6VuEJmROpP/O7zlDmNjzGNCTrhzmb1DDfuh1boYa48Sd2ItLMVWzuZxXwPMlcjYCbGegwoGrpuoezObQWSF/BEELmSxO3Pg8dsACAOGus43iBxrAMc4MzImeXOk+yDvsD9n/tplVq/1EfuT8eBE6lYq8qHvwIAQrkGg/zUF20k3tMg6vxZrN49d1fG0JYYoDj+bYL+iLqYkE/O+QpO9HQSi0XTuxsLUWAQYi31Gxan4DtwhjGUsRTCkmVHmRd5ceBJ+iEMKlWzWt/woDUCpWCRpRjYeK0faKMn8lQPL21t7AKAxSXDeJGudZ6lEgVy5S1ePvVKrYh81ZipH3ij2Dhn4i9ycVKwPZqTeCfPjDgR+VURZsQMBmg6S19gfs1wkcWheQESwBpCFkBDAXkAA6ydbyq2z9cHRrxK2H+xDj8kg+ImzbAP/QYyAFUUaocaLbsDIB9ewwS2KFx+pUextEz6VcamM6TS0I2JIwOvBJmM7p0Tiux0pW7m21+Uw5UbqH/GIBJo5TWVhEJaJymIY2fNgXkfOypdscm0VU4KK7hCVA== 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)(366004)(346002)(39860400002)(376002)(136003)(396003)(451199015)(36756003)(86362001)(4326008)(316002)(66476007)(6916009)(66556008)(66946007)(8676002)(5660300002)(38100700002)(38350700002)(6486002)(478600001)(41300700001)(52116002)(6512007)(6506007)(26005)(2906002)(8936002)(186003)(2616005)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XAKqe8Z2arXyOntKWiIH4IDuY8uf4cbcC/DZ5Eue9d9uk5U5as5cTai3KjmiIBvfb6ecwRm0loA1Qrh0Y8OaK87rmRC27yjH+FTW3+VQ2z4ug5ucvE8j0YusFZb5BrbwcdYA6e3ivMTFojk/cFeWKsz6a7LJzvMjh627HjsTUkaCFz4UyrjzLoskPX7bJ+HFTyzCvoI2WkSUsQFfTxI4LDgRrZ2bYaidKn7/5eOZWFi7+M40scZ30mPI/YAH6nfBzonhbmfWDWJy2m5P498Ui26qaTEY4aHPQ8J2aCYxa1zbOvx6thTeqcsRE2X2pjaHsAGpqjn4zxiv9r03r/ZJwlTV7fkXZHJQIZnu8QCDzV7fXUELBPfFDyFoxvYl0TEMJkJt4qYpw7Omxf5W5g/04wvOqLSeIgxoFk7m+IH83n8lwL0zSwgZLGOYKgz7bs7MAg35USu1IhbVrz5YGLVaf4MKVxvXhi0oVlC+h8mEnrU4yY5HwkVqoVnSonNMQHez7KKiEoygCsoG/ImwEMeIF/qf4Y3hePL5r/8XK/diFKI0+aBxzrYBk3sazFj+3s+LisAdDyk/K1ackobuegFUKZA0DTptvUDx4Y/mel1bDDDfef+IFHB+K9Aot9moCr+52HnPqFBRhwrN9Q1CX0V/5t1p6zfw185LrEX59VWHS37kI2+T7A+X8Ici/ncLFCV8B5lOCBSr7cl9eNjooA4JrUb1VS2mg2Jxyx/DOo1IZmANATxJTW9xIzHJ/baMPUsois3OVEVnc3A88RoCeurAD4yTVCM9Sf9F1Zd2CNuUPyPVMkAhMILieDZfLH1iZQXQ6+Y/791rV1gF4OPm40iAFBMioXYa80Iuscogmr9YpTYG8hutYYVRY2iliPHqFTidaP/2hrInCx5MJzEQeiudYu6r7GuNlyfeSy/rqWJAym/zVEXXYX/4V1lIUSPZGBEOMNKVqJG5b6fVaB2RCsBpVnsuIJkYGUj10vyFfCjiU95hYxlnctd10CulLJS91t/M4zCgN3FOp4YUChhjNpJrNiFmSvi+7LLXx7c/bD/zHsYEuc0vyLaXvhobLv5acC0x20SL4bkgyoQy63o9GUogptlJLeYEBbvgfiIEHmy8EwWLpoA3W8k7O7o6NejUwa31TIozgDIHv/hmwpDw5lexnCv7RdiyCzN7i1OPSzD9wMgrAyizuVQOLkDqseKfkhx+c8N8A8OunKOx0ucQgri7TzjkfiBIKFd1WK8MHDrY7WqY6TPy1zsLBMKXwiOwwMvhwO7f/QBHqAqeBZmXySiV/6nv7fBUdfdamD/UFnWSGJsjdP2xV6WfoUv/zW7zhWI6Cioh3baLLN8+PhJu3MGNtr3Rv8l91+QFS9vyux71BK/z2EolaSrofz2STfCy4gEkBQsf7HhDETs0Cd6fJKwDxJRJOF8LAj5airivgYvQlzaBGdRw1ovLZak5wSOu01Ic3RGKBTyvVZocBF0iVley3Wf6nhDVBL+DCdTqZzPc3w1El1cMyLE/W+nbba1FoQ1h3cCuwwtiP6WzFnNjbrzNpHHs9xkhcaaW8AAqMY7Pe56861iA5rEdTcMc5X3qb8WhYVl22ulAs2l73n4TMw/2Icbt51ikJXfCvbSlkbxCRu8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2eaceac9-4fa5-42d6-fd2d-08dab169e36e X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 00:35:57.2824 (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: A6UOLDSjytH62pLNtLNwuGUsZlRLG70gh/M9PgLVaPz/eEdwejDjYtfObCIPKV5z+TI13gSp3LdY7nKAo53kklCuvgvh7bebUXJhb+0ch251zAuNU82wk+Z7hoXkmr6w X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8892 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 Wed Oct 19 00:36:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 616469 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 87DBDC4332F for ; Wed, 19 Oct 2022 00: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 7460FA855; Wed, 19 Oct 2022 02:36:39 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7460FA855 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666139849; 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=dyZL6tlHpaqYwWYw8U2Va1B+HDjyQiCUuPdkO26Z+8GTBXwc3DisqQ42xxvpmPU7l 5gEDITixB4UASkonZfR4agLPCvlOcczPvH7/9puk/t32lTFDf0oHK6NY/dWyG2iROy d0qB20VsW/PJmIkbwfYOAfn3W6siilWlfqD3KZY4= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 0B95AF8053B; Wed, 19 Oct 2022 02:36:30 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 561D2F80542; Wed, 19 Oct 2022 02:36:28 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2124.outbound.protection.outlook.com [40.107.114.124]) (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 86880F80535 for ; Wed, 19 Oct 2022 02:36:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 86880F80535 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="jJxwR2Af" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IIXRaidOYP1p8dG58XC+hRLhBVYT/a1xLjuj7hGhkuMg3K2vN6F6ucaO1XhfsN4l4fWQWmv7OW1xQWFA7WjTBGLLSAUbI7QSOlNVsBH+uzepKtfCkGPKEfn4n9L6FbyHEPA9jKwPiTJHIpNnMR6Dqfq7CUfL0ZN584CvuVuRgc4sHTOCOgQTgG+6kxOGAn2ANXd0VEI3DHy+62VU6yIY0YQQeF90jGMulQnwJy1eUQZUN5ZoENOKHPgCZS8Yi3TLQ81vkh/jVLEq04rV9YX3cDrpGGSEvvLkm36NzgiveVVZTMzRPXGbLV9MZn+CIlGO0NDf0R8WtN/ciwdf1E9Xlw== 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=XZzObXiZCzMSVEwsRLmeLymugAitwIVMpgpVbQVczqzS284JqcA5XL5qT5Z4SPWiSkCNOp7ZHpVQaCxbYUFD1rTOnmVFP8uwXpphptCvv1h+XP2wN13DpSzCW0Bvu91pJlqf5DFlorEeuJ2Q9LtTal4vc2niwLUPAPiNpdRNr7NBKer16hYVbPQMW1e9wDHwc+wk1Uf9m9vgozUEfO4xbnWReoJKaa84jHw2L6NmFi16+nc6oPTp7QYU/nB4RhNB1Mvgtigw2ILixCLe7hLHu20SPcbuN8jlQl+kLHr9FC66/gzQ3H/ACMQCnDoCLJzQObqyB9aG10FV8eofsR1GLg== 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=jJxwR2AfX+jrKmakuaNCgecCmkF5Z5iiJTX+hV/jM5Cw6D9q8mj31yivPmv1O+FuJIQtCFzxHmZQrNwX0pkhJo1/x4A1tZXMwKhiT1hCJWeMYoihPEfY6a6ka9DU53aM4bop1C6gNXRoCZPUV83c0lu5Qmo2ghlMghAwV3drWr4= 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 TYCPR01MB9419.jpnprd01.prod.outlook.com (2603:1096:400:198::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.34; Wed, 19 Oct 2022 00:36:14 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4cba:2bd5:dfd4:f3cf]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4cba:2bd5:dfd4:f3cf%5]) with mapi id 15.20.5723.034; Wed, 19 Oct 2022 00:36:14 +0000 Message-ID: <877d0wtzsx.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87bkq8tzu1.wl-kuninori.morimoto.gx@renesas.com> References: <87bkq8tzu1.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 19 Oct 2022 00:36:14 +0000 X-ClientProxiedBy: TYAPR01CA0089.jpnprd01.prod.outlook.com (2603:1096:404:2c::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_|TYCPR01MB9419:EE_ X-MS-Office365-Filtering-Correlation-Id: 185d01f0-66a3-448d-d5c5-08dab169edae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yk7SKC5w8KpHHw5gwfgAaVnws31iD07z+4wQaEo8Z6yBlIRI0l+gyXra/icWiFKhfA9dqkU3sjvUotP2T04erY1mt53MXgA1n6yW7iNMgH3numaHq/RDDC5p7GyW41lIp2Vw6N97dPLlmoycLCidkdFSBIHnDQFgIFTuoODcSRzm4OTGDwyBJyUZk7oU94Ob68crEQd88wVvuRCIFuVdG9TmdpQjeO6HMXBPfPA/zZ29PZylBCCO9n/tE88r8T5SpEV8uUF7lPgo0tDq19NEtk5s4UKwef/UVmaqgJf1C1LGmHYy1ItQCbda/VcGSdj2qxU/G6serQMxSnGKJ7F5Ghxe9KSoGAxL679JTcp7/mBGuCcePBq49Qy8wM6aJhtEEO7yp8ZETZuxtB0aGQ8g8q/+Nn5LTX9UBGTpvVgLG/MQfE/TqphVsIZkVAVxY77+2Fc0i+WLopBK5FwQE+V62JN6rj3MmoajngdwKgagxJyLJ6ShwHd3JM+9ob+cTJVZK1lwaF/JsSRwfsDKFHxLi6uZ+lw9qB5CehDsFYwBrUFdR1eshwVPDO4kgrqhWhzZBHvt3Oa88moaRovAPBDJPfXiQt7iawG5qFk+W8lqjInuvWqufZuB8yZ2+2NSmF0MNbPjPikhqER64Wbu9vufyJurJz+C8Hq1bj0IdJEEf2nWfzbFcpvAmqEQmNhUt2eTy6Tt+B3vi5PBL0EjjlhNR4zPGGoa8jI2y0rtFtOzmoLgkMgFprOAmC3pmbKHLsJTcFQOkltywlS/MmSXx9AXQA== 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)(396003)(366004)(39860400002)(376002)(346002)(136003)(451199015)(2906002)(66556008)(38350700002)(66476007)(4326008)(8936002)(38100700002)(5660300002)(41300700001)(86362001)(36756003)(8676002)(6512007)(26005)(6506007)(52116002)(6916009)(186003)(2616005)(6486002)(478600001)(66946007)(316002)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fWTFYmL/9oKoTcgMbqjlEtbzwHtjE1YRFKNnDVShKmQmxczrS1n1zgjMuf4+pYF1hjW4gYREK8Vutw4MJrZ2Yjdd62wesTcmvlL/6F0CWa5W9E5W+iOorNntxbUpMfvQhU6qm/I7hStGXu/D2ak6pwcTIe5TZmdKtT+KvZmRMkjDPi+RZaestvZcWZPj2hYY2N2JO2OB3LUe2aNV0qZANReq7BnaeZjcCG+GwYj5yzSwrDkNJLiMVtAqpMNbK/9d4E3yE7rRGz2eY+bf3ncOxOShYJg7qqbzr2Co6anqktU/SBNQLijOfgbJArEp2V46fOhngq56CRoJWVQ1OCnOBn2GXfOmG0TEjhLVzuSVGAM9K+g8btU3xe9rfGoW0EDLSo23CWdIQ3nu4UFXVHamw38zYXY2Eq4Bnf+N6vUgk7cTZ6fJ4YqG9daNaXVcxTerrpQUw4+oKURSKMDQu5biqu6YfQr+RK1s3Ltq/O4/k74Gcy0YIfU/bf5jYP929Z6OKd7i3MowULwfowQ3XgnQOaRB7SSok/SNAaU/Aji4YxLNgflBfpv8Urw3S2a01wCJCJmy34UeXoOjOlz4X0USJdD3HwPh0SiBvYifUlzp0ogzf819X1Q2r2wmY9lUaSMyzLJi07D7GYXaILp8LgV/xOIRLCiEdOIkSjpAvs8r3wzzA3coXe95hd2vgH1pUS0z4iLV5nD0zLvo5xneUFnY8Wck6HS/q1n1nS+tAYu6zfIeI3gC7F1OlpcGQh9RT/5HPPF8Kq2R2y1r29LEWmLs7kI91js0SZKjVytd5nXxnC6BctUKfVMlVA4+X/bXvg2iyg4KeaUDZErXdbIVGffKA5M/3RHs225+Vt5pzCOuPNzthXDElUOPvCv+Agr1qDDNcfGnWriaWlcjbpjMuWfKeUGz4QtLaqUzSLldT72qdHQk+Zgo7r6K0sSyfHGnnt8Og7l2jqIbXqfS5uXUPD01r+vEWkOkLKaxkkSk01smPtYC53f9bE+L2HobL0FrLoM5S5EVOymnmWsJ0VzIRFMMr7jSiPbwXFlrO7NwTMWYU4Dq2/obIBRR0yD1IIy9oPVMrVJWE+cvyGJFvknxwwdjbY+YmYJXH9/7tO6Qo+nmAzcpEED24pp4kLUjH7ndGPJpkPvB75pcgHIRME29/ndDAV6jfzc9CmbJIVLbLRYXpiXGI0C09l7UqKyp33SD+Q2v8WAJ6Ln3K0lZxrXKhSCD2NO3HjSmO4ETLiNC+hgPsSOL0Qs77NqAesUp/FFN//XJlq6h3on0qpdjR2q/U+mJ9eFHBqsYt3YnlMFIHYNqRh36X0ioOOCCWX4pCyLfD3kJeaJk8s5hu0dM7YDAn/OewpI9TBfNYeli/3wstmuOl6sLvCopVVsgMPca9wFHbL0gUdSTT0JuE884A3tE9qb8MY4rrLWLcfOCZ6aXSdTwWztMwCXnjnBnS+Qei55h6ZTfT34saw36DuugzxDwm38BGyoRY/8snrM6UP+EzmklEn03E6h/i8I8g+a1cTGR7VzNUWimWOqdnV1lIQLUu/8ZLWKu1ZcAHAOXuBfBJFN8salXH/QwIv7ed/8EjFbBzK9yAYxcUDJnXrSOJW3r+n1AifRYMPu5y8y77qT4gIAmHVk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 185d01f0-66a3-448d-d5c5-08dab169edae X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 00:36:14.5249 (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: khUtAKDOa1MX4hhqFuBYQOoC6owm3u0mo05V8bm8e+7sdg5HsDHuAQkotLiqPHPG6Nm5VuKcwxAJ8wt76gN6xWT8GPXYg1r6+sGkHlRj3Lqq7IRSjlwt756W5p+GjL3p X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB9419 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 Wed Oct 19 00:36:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 616468 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 05C38C4332F for ; Wed, 19 Oct 2022 00:38:03 +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 2CD0EA865; Wed, 19 Oct 2022 02:37:12 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2CD0EA865 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666139882; 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=A1HkFVbbpnM5VUSNJaFrI4vNYwdCgujjfrQ7T1Ml8wpQJUmkMvlS+yAvVdo/TCLSq Dugz3qYAIxkttlusPrVBUD2Ck1g59dWaVk+IA5dYyAQJ+JjLlCVx6vTBgBQpHUcZ6n N2bwmrt5Rz8lUE5pPciMdpIDb7w3OnOa+5hNeZec= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 02808F804C1; Wed, 19 Oct 2022 02:36:45 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id AB21AF804BD; Wed, 19 Oct 2022 02:36:43 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2137.outbound.protection.outlook.com [40.107.114.137]) (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 E7891F80567 for ; Wed, 19 Oct 2022 02:36:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E7891F80567 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="frFd5VkJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SZAm4HXrHv+pd0cprS/JtS69YYvxbFVncsTLQyQnybP+Xj9YjMd8o0PW5LaySXeeZilskYQKyXAOQTzNRyJ2HQ73YFbGJec/ejAQZYvtusZhzz9lqYEtNJrJuemnVA0UBKQmDGxhwJiXoBmniVEkdkupecpKDkrAnpGLhUPX5mtOzKyItiz2av24EV0QvmgvLuLyr3xuZN+IZLOnnc2rozXn09MA0XYXWsshF2T36gq5CARQLhOH7rDLG6XXUzgzGzAHYAjC2GD7h3MEal3M1i0a08LvtMK348GdwWtnn29xbiAVGBixzhJBjWGZwa+uXWh/6FkJTjnUqF3ULVL+dw== 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=VSrUxRZLGkba6Alj/eOWFfsm8iJD0voXbgOPh80P028HkzV1rGpfjcnP2qT8FfN6eBSKHHbYjp3iwcGL/qN2qpJef1WzMG4+6IgzCDCTNyJYy4gTw5MittkgXkvMSkj3FRSGHoXucck5nbNb7tCekSGI2ucm9XlWYox/wH9wCKxD5ll4hC8PzSapmeCUFA8CfmKU1iTjgo0TeQ2VnnLtZlRCHudUQt/97wH/TG5BOBNuzKNvei0v379yR7oBTZeBImwpGdb+h6nzPoVRF7PgnCr5mq89BMHOPKlE7id7V3w53PB3U7qGCOzo83io1k92oCP7Ai+WUD5m0qOrRCwtzQ== 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=frFd5VkJXLDOBsWjOdqWYyQvXOUKYGT2gkvVuQ4c4I+Z0+iKYoY3+OpIr2+kONDsQ5RT1YSGHhkOza+jhjczx5c3ogMMX4OVwLO6ooaNRaL2+YAPVwqJLCLe1s2XVeGunBHlLIMMS7GkjP7T2IAaO3O/nSb5zk26JDt4I5vmWj4= 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 TY3PR01MB9919.jpnprd01.prod.outlook.com (2603:1096:400:22d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.33; Wed, 19 Oct 2022 00:36:31 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4cba:2bd5:dfd4:f3cf]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4cba:2bd5:dfd4:f3cf%5]) with mapi id 15.20.5723.034; Wed, 19 Oct 2022 00:36:30 +0000 Message-ID: <874jw0tzsh.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87bkq8tzu1.wl-kuninori.morimoto.gx@renesas.com> References: <87bkq8tzu1.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 19 Oct 2022 00:36:30 +0000 X-ClientProxiedBy: TYCP286CA0052.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b5::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_|TY3PR01MB9919:EE_ X-MS-Office365-Filtering-Correlation-Id: 21d9c8d6-17d2-4244-3885-08dab169f781 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bOgUYndrRBuNYE/xs54Dgi6BXYQebLFUAvF80RqBSweFcV2lTrm3aRDI9H6UDpeEzQJy26JBmrwYZgCqz3UVVknRbPNh7A8t2+b2rMAS4qobImmJuIS8hWDAtgnp9P+38j5dpVnJ20BezWwXz6KzF6QLCnPQ3MCjofJqTAajcSlFQ8M3XpZ02iYoLacXACsT+9ttLcABZy7NWeLoiWYaqFJzKEmqbUW+KeMcyhE/Qm7Bqs2TNobSjG4kHGO0mzgGwPqSj0ZSz8XjS+jfsxTTD1yjsCOOPLxryS6rjZmwkChA9Qtq16qgBzA5LC1k+A/HBFthqEeCc3Obw57YXsWOmM1eOkD4KG9lxXKMo/lhzXPm0u1cCW5GBcwaCi2nUhpaowdxL3wzOGBEJmRQapwuERWmUfxEstY7KdHyD3SbkzUKkhi1LxSAdMssHzknQvw7+fU2zpao/J9kI4Xkrzqt7kaq26ftWQs2GmTTuVu2m02R35MIUY8fvlrf9JY8SvjIPOIeALmt9YNbsfNkmyoAFKYP17DfM/igPtmgncCezipuVqbZKne0ggaTaQYajyu/RYvPv2Xfp43xmHGL79Tu5pZffQSQjrzbMUh2j99LUjD6Zl+UsNEVoqLmlnjGAr7CovwF3/ZymHOYUSJRNENOJCGuciNmWN1VWYy2EduEepqefla222J1s16m+qoTREzHN5G5JpooKm1u44+TwfgBcwdd5B1xjZyySgeT8vgtJlcRR2pSdOAexkcKfQMC3guktFQdtnN167kji5Ly/UyWgw== 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)(366004)(39860400002)(376002)(346002)(136003)(396003)(451199015)(83380400001)(2906002)(86362001)(2616005)(186003)(8936002)(66946007)(38100700002)(38350700002)(5660300002)(41300700001)(66556008)(4326008)(8676002)(66476007)(6916009)(316002)(26005)(36756003)(6512007)(52116002)(6506007)(6486002)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: giSBO0VrHgQHha4Uivejwl+wnlQ5j0TltSKIJBpC0UooersJUK9xZ5U+H2uaQ2mol8cfqyUvDzrT5hW7l7W4iQ3kUcrejgFx5Ap7+d2JAUHwjMFiQ4dZbjhtRw2NYFqT+oUPPImoZML7zTrb2zPYW6vS9RbYiNXAA628f2cnh4Iu30DVqYNJdWDT9bf8ArdJu5c0FF0m7kfBQjSliUwPT5ajq5AgISHXUg/wU0gpqSsVJ4WzY6LDxzn8cNadV63rHZS/GrXmIKoKa9Ey619E+B8NTwI/swZOi2taGwDNMxMQcdkueTLzdResjS/EjoTZB8HC95vFnpDFHv1xshiELLIZ87QgsCPVPyPcMlfoXpd2neNsYka773I+aIFZg5LT5NzAji/nvc52RUwuRo9Vgr8tDBPYNJL5Uy5sLL7dt/SaDKqWQzGlS/My674bV91ICYOzIaoqfDz+KNw4ZYyRlbeHhO9KptBsb6W+cS52uNErAosIu19HNxB/P/66bIumC7R1LAK9X7CHgigRjSbQffcjf7jWjn5tdIjs2yjKP7KZyQqjxUCQHWVFTX6wr2y+DBAk8+18BgWxPCitU+iGUnB1/zFlY91qfortBoHuk5cNzjeA2xhODS34xs3UYJ5HCwbYbNqNN4orblRZ7O9Go3N+oZa2xTTa29l5yv0C27Qq2/JMsP4OZh83J7gTCid4bEQCvKJIqVLqu8gNjmqkSlD2bSXD13IVMKmMf4FAw2tSeVGbfoYsfl65RfRsGowzT5SFgoPinfci9NEHEGds4HPkWaUjJ1gJZF3Zzf9PZyfztjTa2hBjhuet2LRSQco2ybhkM9qMOaatQgiPmkYwj7zrfbeSMk1/4SVKrbXtWLHdS1BP5VvPRmbtwTuhd/2mWYO/+iVVCVvYeqh+28heYQcVlRsk82LYDqd17w3EOJfrW8rXnpzjRyhj0Hx4h4NV0p6Rs66r9X8VCv+AHiSaWb+xCW8rkoTq8r3HrA2HcS/sQ1iwtg+gI7DgJniVP6jDerWZprcY02I42x0now0+7CA+Eha9v0MUybt9ySw+X8/lRCLT+aM0D89GJEm70hOKlWNAhL9KG3MOm5nllrd+0AS88gqFm64Uh72tfZK/jXEvRmZyEqOJ3nH6eLHjmBZepLXHCOam3G0K5fUKugRWiyK1bUuAnl/+A7UY3+FpG9raNFUCdB7N7LD99PC+vjklSwWV9K+auFP+2b+csE12evS0juWlFAS1nnMVUie6IrCmVn3IaSlXVibTqdO9TafthJyyCiBgfpGRJflfOlkOfW1kbtqcdkEbh5/wgqj9CXWhMOBsW1rDiyW3WG+2pXY5j/LtiLhydpsRx19ut+TqlFbUjytDsrABi3VI4s6u/VtXGM1FL1DAzZfvbqs4D/Q2h0F9Yo06gfpnOn5vgmaeQKvBxzfsV9JSyVWrMFk5kOia7j/QKj29h3yZQ3CMsiKs4+n8faeh/5gaYENbg1VH7E6+RGxjbPRgMl4FZEa7bDuXEJf3AStoPmwKcc21sWrPS0Vq+jPyZ6JmvLvQxpVyCPFVglDcG9J97tkd6LLeM42TKtbDLbJ5H33Wp/zPeS6If2YlsSQFBlgCbV13IF2VmtgtElltTaoZ82fgI6gNCyM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21d9c8d6-17d2-4244-3885-08dab169f781 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 00:36:30.9094 (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: P8y7udVfTdO27bLeJ3+nI45AoH5LgHgy9IsGu/FdLji5bFKQsNKU3kDBTxMlrBda1SqvZOs7VvEd6GFGwILfIM8+xfDg0ar25oJSuEnp+EE1/6WpaKu/2ex4j2yfAvn9 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB9919 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 Wed Oct 19 00:37:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 616467 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 B45EFC433FE for ; Wed, 19 Oct 2022 00:38:43 +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 E0BEDA815; Wed, 19 Oct 2022 02:37:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E0BEDA815 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666139922; bh=Z5ypgF4kyn/zGFL+XOSNJmsGz35Cdw+1X9hMiCpNKIg=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=eX72A+95/U3ypIvASI30vPqcc1Q42wrvCTkXAWzutemr38SZWW+lPjOjwKDwyU3S4 DDSifQ0ongGKF1kLkZO7XZEXHr1vw41NiK/H82ig5Gj3zLqKZ99pnQH8L+9XXN8O6h kBzqhGCYKsOqtxaNzHDbSaurY1LukcFIbYRmYzkE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id B4D59F80559; Wed, 19 Oct 2022 02:37:12 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id AC244F80559; Wed, 19 Oct 2022 02:37:11 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2100.outbound.protection.outlook.com [40.107.114.100]) (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 20EA4F80568 for ; Wed, 19 Oct 2022 02:37:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 20EA4F80568 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="aKaV0Bn2" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IsoHVkQVoHjD9VvklO/jpGHIQ0e3frmKmYgP1dNIESv+u4Fo4C1HhAzN0UsNT3CuSVk+rMW8b1t2sCnqFGzUU0yR3zabJLhybyYM2d25HJdVTezFa9Ufzd4bLx3CajQFKKLZnE6aElafJ76MuvFqRkZQfxdUAku0Y7TcNMr6nvbWMntxjNpUf2ozRVXbyJn196xnOH4w2fsJjM4z8BiaNKOovw+CVo5a+apgm1UZu3p+iH1/Gg/48hDZHjhmDuTxTEkDhJ5XNKfPYxGpm3ma4B9q4RJdR+eK3aZfvCy2NwAO0WmDSu3lUo8yvfstk0Rxq3nT+tnBenHy2OfoDhoEhg== 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=P1dcD58IHI2bVXrfEPybspbiXOjQvm4c89L2cuOJrkw=; b=FcSPiLspt5Ywp7j1id1B3YpeDzZNcp9t6PJVax2wLCOcqYmSvXG4SeVbE7+J2kC4OImn32FU1dY1KjwVEbVqm4IL74I+P0wb+cJPbbza2TkkSF1KBRep0lDeDYGjIRr8s8J8oeeB644yFHuW4uRZkIn92XGVgSjiz/m4WalmseeIScSmda2GwVPqG6GwmHKLx+JOtOMHLXpkE1+WaEossksZvkkaee2WWmKHQBgsnfuhkmof1a4LuTNAIgrL5YVcq/CAqysjiBC7pwtZSBnsJaMctQ5MJTeiLvJB++wGRiMn9qoi7I9tcWqIfS/j1du6L9pBm3H5N7reekKAt5j3HQ== 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=P1dcD58IHI2bVXrfEPybspbiXOjQvm4c89L2cuOJrkw=; b=aKaV0Bn2GittbOfhkp1ce+bjRxyoH0s0Kvz2AA/yJ2WSReDRZo4GfLZglbiExLv14PszngDsbzRHkVi43azpCU7ZIkGld6aRJOGQi2wj7Vd/MiwXmnsd5pphqcUnSiGhr/+3AykStQ4M9UGYOa6zEfN9vfNp+25+vx2QcMOdmGc= 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 TYCPR01MB10412.jpnprd01.prod.outlook.com (2603:1096:400:244::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Wed, 19 Oct 2022 00:37:00 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4cba:2bd5:dfd4:f3cf]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4cba:2bd5:dfd4:f3cf%5]) with mapi id 15.20.5723.034; Wed, 19 Oct 2022 00:37:00 +0000 Message-ID: <871qr4tzro.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87bkq8tzu1.wl-kuninori.morimoto.gx@renesas.com> References: <87bkq8tzu1.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 19 Oct 2022 00:37:00 +0000 X-ClientProxiedBy: TY2PR01CA0024.jpnprd01.prod.outlook.com (2603:1096:404:a::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_|TYCPR01MB10412:EE_ X-MS-Office365-Filtering-Correlation-Id: 928b5007-fe99-46d4-59ba-08dab16a08f8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 723CV8R9tAqTr38omdJTX95kBsjOy4dndTrrpKM36cqUW0SzF2AYPg0eaG01EhSc7Kywt1odW5OQXk/qAf7Mu9+VCVLZnASwyx4Ywni0zkDXaU41G50q3FUHLtOjHR1ZO6/66JdV3sbXYcUoaCRomI/tkeg3Ycfkj960xcf2GXop+lxjRNbVw0vg+tfYBYTDZt5sn3R/9hUns+1V4do8geb8YaE6j+mI7OuEChjkmGi26sSWGCgQIIpDb1V3k/4aDqXlppyGmTg5XXURJdLhnWF24whXwY2bFwamp6LV2P7kyh1D9DuQSsnxoclB0lyyJAWXj0B58nF61jOOEnOjBWT4vy/u5TE031t1RyosokZnqzhlAdsuVNv7w36BmVpjrPtkEzXzl99DjfKooMQDL7M6qmVXa311n0rbH9aWUniWgRQO1PuplbrxVSbk0HIHBmypCogYpKAqQC/6m68iK/coKwy6+9MHOcgPY0pAjZ+33myDUO1N1D2shbgUV1fVCVRRm+8PreYy+ZG583zArJUAoA9omCKCW+/aAigHmF/3gPi5tUwCZ1FE33QbebS/ZNzevEyXmOGAMfjRfLCeu0ZYuCIZ8y2PMqpoGQNDw1MkWKrDtU8tNSjWzX4Jm2JCGmJpiDivOyPNBFb8PV1TXAqZsBX9PK8z+rq1yKyV0vUPViWgeG0ZLA6TV15svLOOtokk138pdMijSkutFz/+GP0DaU15tbDJb1v/YNEtqdIyeJylWghBTYRhfAgkhLqckrDhkriWQVE/4YUgRtzeZQ== 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)(396003)(366004)(136003)(376002)(451199015)(66556008)(8676002)(316002)(66476007)(6916009)(41300700001)(478600001)(4326008)(26005)(52116002)(6506007)(6512007)(186003)(2616005)(5660300002)(6486002)(2906002)(8936002)(36756003)(83380400001)(38100700002)(66946007)(38350700002)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VEIpZnPm/gBmUNy57Ac00AJpUkqrrhMOXuocQY7WrssnTuUbSDRox/PxaqkoKtbTFZi5Ww3n/3RVLEYgIh0xHtL21GX/RJWAqn1IOL2Be+xOT1LyQ2/Tvz5hEcfxxt6ZJwV3flV7VyMOubtoNwlV3hBWraigZOqPmCzdxi87HhLg0AUwcvtHcKyEiQLk5fihWvzidUd1UKrquktZDwBLn7NCqPEit8r/GIHcX5AVr9n9TDXbsFlsH2279MAbf1l+bfNtTantkC2S7UGJ/5v9wRhX4x4Zz8JaJNEXMr1yhmwlK9j2rOWHF8ddyJzqzZVE8wZ5nU36efJTGq3TSByz8sr7JlPIiaAKVfEHDwX3B/NBoI16pah5S2gQl5PcbtzePQnZwdT+eT2xuUJ8Yrf7kSGtmYRTz8U0zPlC0bzTZIojz45HX6qvBMa+QwZHHSc86vnSCTJyFg4b92jsFR75TeK2yzLfQaDjKLXKZlVzOQ2CRIgPGswf/bbVx1GyWSjZREDoXgpj0fNKnL4OZZ4uQJwKWnn/mA0Veiyq7nr9XKkeqjeond7t0iEN+Oy/INYo42UmoXTY1YImL3XvWAwJuaXLOXwDx1Yf0BzL2V6gCd954Y36ReVPz0kgRm4z7phq1vnP0P7hDSpUbUcluQ8m1l3FrPiO4HX1jpsWDZHFce9MecqIgrntFK2re6GrWvyd/dtgf6qlxU1Nlahet/FIB3nDR1yxYdya/5vKOx14nOs4ziAe+O3mpciz0bgMMonQ11arr80z/iM+6cU5Q3EDbCCGCSwRA/i8bTpmp+GQsuCJ4OOPIipse7D7c98+47XunwKyDwjTsg90SUcWupv7tOjNR4i/yg1XEO72UOeumjZZNmBek5K0dHzm3l/4CaUswJ8nS5/r/rqTFu2GnoPhkrhAsM2ogT2S4tFIxow2qWKI1kbL16mRkk1WKJlnewUIPHwAr1tlfQ7BUiZgbjnNFgvmrg3xh1Hw+DeJH6Jjl94TB4p5ND+tXNytFmf0X4UMouFB/+q90cfYutiomhgp1vr3PBHKQ9AUOPWW/ZasOCl8tz17M9XCVlsxpRIklEUuSPpyVoivH/EgvZwdOPCgQyGCfsCopZsr62FNsxDcZ5yULN0zGk2gzOyaBTyYc1SYEu9PdhBep07t4aAUchcXEK7Xsj3i3m4eTrLDlmmWiKHAtma4zXz5YRkk9idA6YkZ6zssgtrSz9v8zA1iuNXkDbhCGaFvBjm+ydDYuFjAZZwFB++gUpgWJ8wUnNtWzsmCenb1bFHrb8sLRTH5VVlR5aSOEs9kTjVZKMpgVIRmhRHzf5r1kQgvCJlQKj+zZoB4wE6UY0b1mc3GApl1NkSvcwbuiacQSLkvJTddPVHv2UIk1uYt9oy3C+UuA8XCRAt2GVjIjNWk3lI9cqhLS8fs+azcXxleKHkk/3UeKt6Gx9H2DfyIJ5JJCD8BdhOc1WnlYrWmk2vv4oZ43BDhTZqfx/mkDZvf4seuIqUZvZk1NUWH2khVYLqDskSsJtoWkdJnzLS6fKhjXvcLiW3qHSbbH9zMrNVkGmFqe2dRv/xjN0ALOMM3CUr5exIwJO6LQw2dUtLVpmHKYYVj3fTQQpfyEhN053c4GBowChy09VeQfuc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 928b5007-fe99-46d4-59ba-08dab16a08f8 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 00:37:00.2739 (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: qhQzALuVYKVGQd7BgENGdhhXxhqCfadjbmRq5/RgrOcb2P/hDuMFDJxCrNUA+hxsZlHH6sZeGYgaPJBlTON8Qq9YCD4h00khb0tyqnBTUH2N7CdPkgDx8Ka/x3yU/AKi X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10412 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 7a170e16d34e..ddaa079cfe5c 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -4131,56 +4131,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; } @@ -4194,6 +4191,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 Wed Oct 19 00:37:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 616466 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 2139EC4332F for ; Wed, 19 Oct 2022 00:39:12 +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 2D6DD17C5; Wed, 19 Oct 2022 02:38:21 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2D6DD17C5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666139951; 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=hsxQlBE1+pspjmWMT6GioQjfbfW0++RwmX6JVFDKr0JUdYVqpqCVb42vA+Kun3GPk JCuoDtvIgkAfVfmJ/M9eJ7QU8V0RGja5pi67qVUU/S/kWJiYJ+F4zDuQPsSYZ477Dj 2o/yRuMaK7iQ02DROspl5WXxAg96smEcVR7AQbLs= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id E6EBDF8053B; Wed, 19 Oct 2022 02:37:29 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 593F8F80579; Wed, 19 Oct 2022 02:37:29 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2132.outbound.protection.outlook.com [40.107.113.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 2C14CF800AA for ; Wed, 19 Oct 2022 02:37:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2C14CF800AA Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="hpVjhACw" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lko7Rk75XBd2G1VmUyQ4GWAal7X4Fey+EeBRFgWEWseWVc6hF2RDGHwIpPJSESgeR6NwCWBi5hZCTJcDP1mGuHyQ4vOcItsC3VrSpVd5IA/cH/Nh0rgzQf7pb8RYCBEuTB3XDEi7bFCur6whQOp/9vMHV55mDXAm3sQMDjZIxGusMgQKU26Y3FGdP120druh2XhwPJ8IPu6ld0tr2SWmcGa3dxNmUlH/525ojN1nRhcglO6sKI/sHxC5zt07S13gGmUXRp13iuJGvJ8LbQ7YE8WFgxi/upLgZI86rUMd5pgZwTwHvWXW16HETsPiZmW8mQ7qpwoX0y1p7LGADXlm3w== 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=kbMwQdO0/Q2oSs0H129yMksLdYbV4jXo1GA6g+YTi9hpWwaA1Gw80acegf9NrU0nDsY0z0YE+tmkirAQa6Otv1lJUYWqrTsx7HciLMrz2B6/RPoHdM6RyzPmxJ6G948pSaLpcN2G2Nlt1gWgvgi6ty+/i/ammGLa9dc0nDPBjHaqaJW+Zr5iaTMjDWeeKglhpRB5qkzXcEvqBaz2kksEWBioozoWBiRwJ05Lxbpfc1f/ff4ah0EMrcQkNww2drGkqBWud8qdyXDAm60rwuCOgMYHn3y31HEWF7S0QBOnPwaRDa8EFpdehrIl58xwnvPFB25YPJuiZI2yh17/RCJeCg== 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=hpVjhACwbbXMw1lv7nmqDYqrT//gsFs3w09h3d8JFb3SD+AAafrIVrBsu+mFwsDvzRJPs3BFiHjxbRk8Zf1mZxKZYBAkmHvbRLt/axz//ZGmaw3GqVLbGpa2b4tpnuKsrqimYOuj+gr1S9I9XlqfVwfsUWU89seWJBqjJcNz3pE= 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 TYCPR01MB10149.jpnprd01.prod.outlook.com (2603:1096:400:1ed::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.33; Wed, 19 Oct 2022 00:37:20 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4cba:2bd5:dfd4:f3cf]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4cba:2bd5:dfd4:f3cf%5]) with mapi id 15.20.5723.034; Wed, 19 Oct 2022 00:37:20 +0000 Message-ID: <87wn8wsl6n.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87bkq8tzu1.wl-kuninori.morimoto.gx@renesas.com> References: <87bkq8tzu1.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 19 Oct 2022 00:37:20 +0000 X-ClientProxiedBy: TYCPR01CA0053.jpnprd01.prod.outlook.com (2603:1096:405:2::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_|TYCPR01MB10149:EE_ X-MS-Office365-Filtering-Correlation-Id: c65d78ec-3f8f-47c8-f365-08dab16a1525 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uGznGzB3c9uyJwU7CE94zXb4vkOGAvWpsLBJKxO6OULjcDo1OuMoZLAKbExSekyCQuVHNlMNGRygdHyGDwHEakZWmc0RLhJ8tVm8+dp/zzkUKjEBuf/5UJPqe4NsosGtQPG0HmduVISLRqNQziobvjXx/xUE+LUopnF3K9DGfKfoacknlchYlOPw3StUTwe9S9IsTt0FXo4m95ozZ7ZirQs6VNkPJsyXNzoV01Gu5D3FTBA2+hZ+3hRXGBmONYyziKyWEazw47CSI4appA8Yip0bngYQ0bp4rEyesBTm5uDVvHeHVZ/z4y4mZ8o7lCgsVUG2mi8SYCVm/mG+e0rnmGsTYlqhFjL/xpcRLS7vwUkwHef0b79npQDQOesDyzSAxIHbDYGw8Ohr+E3SgIaIyuFhycQUTbiGRcXYWX0r4mJ/k7OLYZJhsGvt60ow5tbMU8EBlIe0rS3JvdT5SIDnxcgNhI900EHXJshBHhlQS8o07D4ralndLXZeO/gbjRdTVltEoPPPPzmsjRzz08G9YYreTznzlIHduhnHf2QFSy99l95e46DgUCbw8WCYjb4rOcVEb2EJ+j+1ZPLhEjhLsceYWMDtdL5q1buD0FoSOaGBxSv4Dnyq0dgwYEsn+/UUX/6OhcYW3LEGTjT3/KYWWyVgYGi4Z6v5R8JdPsWhB1Le52radJ5JsYZP475TR6CWtE5rvD3LSQVuPZkeLBkn+dz2fX73VQXnkimS31D3R+2oSYvHUFFbzIhVjcVALJ6+3vSKEjFBpGABLBvdj+pBsg== 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)(366004)(136003)(376002)(39860400002)(396003)(346002)(451199015)(41300700001)(316002)(66476007)(4326008)(66946007)(8676002)(66556008)(36756003)(6916009)(38100700002)(6512007)(38350700002)(26005)(52116002)(6486002)(6506007)(478600001)(86362001)(186003)(83380400001)(2616005)(2906002)(5660300002)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Fz7CtPhgGhEnHnO6OYz3opqLs9I0bUxJlc00PEW55KatmSWnT2oouA6+jtMOirnlBPsQHj5iBeZaVQZw39JgqGB2zW92WdavZ8XR/4ZxThaoKLYYVlreOxtAagMXz8Oy/wxVP1+mTobDKq+EcqA+n0jKhW5GF0ILBsFBzao2+d6w/SUl6V5jGYxoLAIRHnhi1pTOubH2n0IXBWcu6HcKB85iNI02CZQ5Lp3ljtska+Na73+rpS82EGceEUbYKZaC25F4qUU3/fNut76WcAP8rsx/4PvqyYUrktuOEp2aQY/qIebjrBLPMlPWmw5BH3SFsg5Ty2XMRIimx+oPsQHPpAtiEtAvW9ByGpGzRU9D4M3SG2wjX2Aj9Fjz4z0jiHRgOKKBswN+Gspxc/kTIMFpgDUEeXEKxmftHnD9Sm24XrlLzXOeIjTJMEPb2dx/eZmFmEG57lrcntpmFrv+hNLWdzXJQqAHca5KDkdF+Oll2OufP9jRQIez3F5HyVA9/6fsxXiGe2Dd8UWe4GXg4jc43jLhHV7jzYKkH4due9Q4HxdHnQbCts723K/ayOk2rUThimA61zqt3zkMosikwYaT61we2vgAxskRayY0sotvtpRw1gRJyZeQ4McfJhLUo28DLU1vmVbh4Cn7pJRuKNxcGDsF32WKO2ZpgmygAQIswUVNXUxIfl2eUPdyKgCQh4cY8KSHwUZK5y3SU5OuPI1Xz6RXIAY7h9/Gu2G16/wSCQeMRpYn0YT923R97eIgBzdoO5oQnRDBATndLNdbOPkjsVPPivDTmzCGIdIudMn9NyaZkJvtc+i8HhqHxiW0V5zFsYAtrQJv5Z8Af373msrWUFmIQi8oQOOl8DM1jttZjSVjcr62d9eSwkvTVevIbXGxtGShDIWx79wzsJuPHvhwtv+3Vv7RnPE3yJ45AJqf7JJQBltOyIaJ78Sc6Ors3RoGXsS4oh/JifLNim2SKvIeKZ5p/tABw37ojI4+7j2ygHuHkNQIvTQ+Z6U3qQ9SQb+iGI3JccKzyBGQumHPKm3REQSi1i9Z516vXydbm+4APp/3NjJMX+wypCT1XuxLf1GHPO93Anpdsgs1NCwpqWJjprqLFRANbVtCtADHPYIld6/J6PWX3ESUdpBO2L6RaL6c8OrPVLZDLMSvGHH8HdibpajL0T2mzCi57gOMIp56PS5E8T5va/U2O7DHyE1Sy4H58jlKUIHNP5G1fsTFiI+j4psOJ6Y8AA3P2iTLiBZ7YnFH2JYPCgdVsExzQ/Jph2ZAxe77fpFaJxMn4BD5c87FuhnN3Ssnb1uSFMdqPQeGVe6NYA8TbLO/vuphLfWZlIZQwjFO43rfIzWz9NGxUMN8YGdJLpmKf9JvoSDBQldxDgqxKLII3VkV/jOfU4X6HlvI5+eeCUOWSslD8LUTIMQ1UfDBH4ifYCZyvTuEiSdQb50uG7Xuu3SsscDM9wLnHzm21sK1NDySGgZKjGn9aBwxXsLoe6V7G+tChC9e002u8yjLaD0Xl9jee/uHXM5aP+1QOV4sheexxxOSP9bAwl/HCo47NHnjx21H45YdHmjD5Oh8GdDOGrChfAc6OG08+oZK5Dj8KfVtyxWZlQFf3Fz3YbgfMxV7twi/qymxeaomjso= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: c65d78ec-3f8f-47c8-f365-08dab16a1525 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 00:37:20.7210 (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: /CYXpbbOoYyu6uJhp5paJHzuqPfgR74dpFxtBHFFu+l89WhkmzAAvxwVWkxf7qsyzeT5N5RomnX75ZX2WP2o9FWplem3YoEQ0/FQ5dGI6yrTjtWY6QUkVb/14pcvuevk X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10149 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 Wed Oct 19 00: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: 616465 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 CF2B4C4332F for ; Wed, 19 Oct 2022 00:39:43 +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 155F6A821; Wed, 19 Oct 2022 02:38:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 155F6A821 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1666139982; 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=sXHOm6kQMW9WymQvEjeUF/xc89cpNcaURjELTzqeq8LhCHBrs5mblqjEOuw9t1iyI MO4TBn6EdhG9cqtRcYl+d4CTtnXfuIpESbhs9DlmyLftazKgVfpLPFc0us7UyrkZys IJi6aztBNitt6dhdCzdns6tQRKyIIaYGlbnkOjHg= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 6B127F80566; Wed, 19 Oct 2022 02:37:40 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 60478F80587; Wed, 19 Oct 2022 02:37:38 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2090.outbound.protection.outlook.com [40.107.114.90]) (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 7CAD1F8024C for ; Wed, 19 Oct 2022 02:37:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7CAD1F8024C Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="eOgsgxl/" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aHziJGBVxvNTdjW/W86deVSTneDeUIxZQerZEkkxBbR2ALziCEVqU27N4/Zt1RZNm2yuD7gLCNwH49Z8USjswilueyNf7mScN96fHrwqRvSzO4f+PtRIIhzzU+PcCu/5j33Y/1kqpJDa/sKUK9RteIt/qFKuFTVV4PTARxIzsv8clOOucg5xQBFlf+9hWnXHFxXcKGEGTcW8qCMRYTdZ5SWp2ONGMhvbXBc2CNqMqQptmmGJoG5tn5XPNIv152zyb0ETsBgXH1r8YOZoZg3oKLFsOb0pSyee5sLcgX8R9BdPe7cHUharsZ5IQCMkSxs87i30vn8yjs+lj9kUTTKwFw== 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=KcXsBrOUZW8hIPcvorrnwbYMY/Ewm1f2ARIr/NFrJLXie+o2xW5kYEiLAhMuRrS8NqQsSeavKEXkdXzmHYZloaScFMIFc6R3xxhEu02iW45odBhyb6TBWCYMc9ItqvC+DQZDyszzBtZOHC6727U8wdtndlhlEXctrce6Yn3j4jLH5qsneaJXIv8uXNcpthW3R+XzEVq07mOeZrmoEK3M0mwsd3OK8f+4r2Q/sDiWB7Y9bQ9WPa0/854X/0pO2z2fDqQ7M+jgDFSxmQ4MoycQBNC7D4So5tsr1MKzn+vPj1fBUO+JV3Gn0+6eL+pbMdqAhZy6JFFIoSrwX0ak7BDfIA== 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=eOgsgxl/QYqeCfZxST/YHabPOEsxQHMguCr/zYusQBVqV7xxI5vbh6kQkrWqE78BHbnAQAtoosEsrVmjoChaG/52K/P+4DbrTN4BIEwp40K5DicJpKbSxwYhfOMkHZ8WM9mFNvUINwmscEooUDv6PJHLBMppInUbyc1YHFI0yjw= 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 TYWPR01MB9374.jpnprd01.prod.outlook.com (2603:1096:400:1a3::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.30; Wed, 19 Oct 2022 00:37:26 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4cba:2bd5:dfd4:f3cf]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::4cba:2bd5:dfd4:f3cf%5]) with mapi id 15.20.5723.034; Wed, 19 Oct 2022 00:37:26 +0000 Message-ID: <87v8ogsl6h.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87bkq8tzu1.wl-kuninori.morimoto.gx@renesas.com> References: <87bkq8tzu1.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 19 Oct 2022 00:37:26 +0000 X-ClientProxiedBy: TYCPR01CA0067.jpnprd01.prod.outlook.com (2603:1096:405:2::31) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|TYWPR01MB9374:EE_ X-MS-Office365-Filtering-Correlation-Id: cf9057a1-f5b3-4397-9c69-08dab16a18c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dV3aIjdsmyYQ+/zkd30hmVPqKWQsHDvpiA7SZgBN+j0Aa4RKzZ60FRQTKCRSe1q4oDArEf8AJvSRFyEy+nddFn++4ATzcbq4yRClmOmXxlzZBsGA6NRdnCO7gL/gQaQ/Qg0gf6y1nGI26h6ZlLSfSlB33rr1qq/Ae1V/GxtcU0zT0MccRpayCHRJbv7UAx3DDbdWFRsJgGTG5H0D8xk6sL4Yst9Q5hbmQc5YZ4gFMmjKGcOxLt0LOjO6Nb/8sLqimYsHSFDk/IyaLnJuDMt/kzGVJFZiYF+C5ehuHN85Tzo2zCRgdhn0S5aOUW5L427+XU5MzaHu8u9ZcFV/Fpp+kOKA0Fmh74yCfwk9nYxYkap2BRzY4/bRK/lMk1KECOW8a+2mFCLJYzFt9FyB7s2/CrGipP3XSStKQTkkNb/22u7p3YvN1V37SHr7z3ngCPCPfKBoghOo13ISdn+gq0gaDHuS+dkRIdehxyAWFfmXvPW0IaxB7eJIt7LOp8+eM6iertKrbcEw0JGUJzysjuP+jZy3VVg7LhtULewX0RhdrFHtbNpGqJe4XPULCv/Tl2ajHN7c/fuH69j+KiN0YrBPb4sPY7xg+4EitysaWCZoOI95wbBfaC0e7ZdodTdwTHR9AsHwYgnKwMcDG4KatEZEreEm2BwBkLoam9GeiD5m7gesDcXkm2J4FsTLH6fwomph8UXPv8tkv3JRNl0AWoqLRSyeIlZxpqtv1m/Gi6l5YyrfGxKGR6zFEYpesYM6N+8Vt+GW7uxYAqKlD0tVm32BCw== 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)(376002)(136003)(396003)(346002)(39860400002)(366004)(451199015)(6916009)(6486002)(36756003)(86362001)(5660300002)(38350700002)(2906002)(38100700002)(2616005)(186003)(83380400001)(26005)(52116002)(478600001)(316002)(6506007)(41300700001)(66476007)(66556008)(66946007)(4326008)(8936002)(6512007)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yJmdd5kWovytUk5fGF6LNJtFHKov8tIUK26Y8BgCzyKFjSMpIfDwSTh0Hwarw5fgUk7Lzr5LvBTSFDEW4P00xCWQ3DZfPwVwBg6Zm21rv7Ri93ggSmM3j4+piAu0hYx21FpThEcL23zrgoERbw+XG5I3X9mORLQJdvM5Df0nxXvxk+x8vkQp6QHovPcYz9urMinMCyU/QaRiMQJNFqwGElbGHa4xe2IAoxFzzFR8GkvNZ9ZcLS+NEUoCW7TXiqJM3VPWxx98vd3T5jppMr/ge3wyt8ww3bpz7Cg8pc6w9CGvCYGvppFR5cfMY6fVfD2YEdgiEZR3giuc0OD3n8jwoCSc8IlOXtrK4YKaSifhxBGCX4pOi2vlFzGju1LIl7GAVHcuNpboMikHMwdeMMqMjFs8eP+OHFqOg/jHnhOxU+uuvTv+7/xiOUgpsFJ4vGaUAd3Dz2y1o+3GqMdomlC7G1k0eXrrYhuKypAY35Giq9ptaf55cXSoN5dGdcSMuIB1CqdexdRdt2d2+dNWRD2lpFkZ2YDA8TbmQFwr4DoPRozlx+vCyzrMUO9lbTH63JRUrhv9Rb8TQ8uzB204V5Ux4hNYzC5mghdz1UWYUYBuf5oAj/MR3c+ekcr+601iz7x4bYeoPRQ3qLmV4x+6GbNRWcg+gC9R1SW0x5OsX+f7J+eGVUh+wTgIuqYl+EothWUSjjZUZ25BCdF3P1tbIOdGHMY+BNhaNhtT16+T2OrojVkIyMln4DBxT7hJV2x22KT4gwJcrCIg0ZzGXkT17RyTnIkxy90RU9D4VlvnNUjpLxvqsyDsCMjWD95u/4y0aCdl7v8+YKwlBFSK19iYiR3tMxP9jvVgZBgAOfOJtB3uTk0/VJrP67ZqZLeJgp35+J6t8iFCJAmb/CAQ+koQM/QJT0SND8f8cuD2grYwaG3BRgtixoWHoK/Bp6fnnppVSCMRTIV6TuZS5UY6U3XF7WKvcqEFAhhVFN6JcZWm4jHx2Xd6dvsh5cX2/xnU9qsfPXK3lmOKAcz1VGZb+72PQ0ZyZvKzYZ5AsL73qvUSTqYZ2nUbHJK+6LwbN/sVquacivbaqufv12HfnczDv+v4lYmV3SLg7hxO9VSzA9qrKupuiAlqttMME8xfQ/XkaaKF889M4oaczXhN8XSoNijcoosTwoGUPNz3nERfcsmVSku4Se553iufLKOsQQKkhoQoYYxqZ+4kCykd+ok5FvmHfkExcRF7WiLgQ5P9r+yzVIGZv8oq4/Nh4D2NZW9AFToBRUuVkyPgCvBx9tbw+FiPEPxpNWdMbQ7sRx996tH3JO+NnUsztgo1bYhgyJFtuN5NY7m+QipgWOSMJZ0fctxwh4FkX9/XU/FdjurTD2qp+IvFv81V31ehFU5zGaSe4zY7t3sYTGkVoIuAi+dvvkSxp4wUajby/1MGUcLTErelHyAbN+0IoH4nIjmli7bOYu4+bjMiu+WU9AEM0qGI3tBhDzEhVN59OrYGhBqUQI+wRIiOMUif5zdIX7BouLN7txoKG4Ym+8sbLI9uy3lChtMjfZuuDy94MoJ0gLEufRk2MzmoRt6IQQcbkmJ1SB2tv2qS4Q1aGYaocFBCS3KAPHyq+vDmOyrgx46gjTLspgjuh4sQF3A= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf9057a1-f5b3-4397-9c69-08dab16a18c3 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 00:37:26.7093 (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: eZAHF9gKW1Gn/cNlonu15oUe7ZijHDcCo2TkZpEY/tJPnheZq84JD7vhrbufs+0omyARtMo9vBaUyfOGaHJ4Xkw/uGmrV9feW5Q6hMDa50VDGidER3ddbhY0gKg+d+Vj X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB9374 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;