From patchwork Mon Aug 5 00:44:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13752941 Received: from TY3P286CU002.outbound.protection.outlook.com (mail-japaneastazon11010030.outbound.protection.outlook.com [52.101.229.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3348C22625 for ; Mon, 5 Aug 2024 00:44:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.229.30 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722818674; cv=fail; b=DxEd2O2ZYPz/mkunuZifhu1IrQB/zVDmpMYWHvd4SrGEptf85UlHGoKI6NxF2z3mpD/7NsGWFNCevLJLoHnqKMXYjyyj5yOdxsWBgYXbuB94fBj4nAF4OnlV9+NduU1IIQFa5qW68go97q0cEwolJpZjaGYFAfi1HZtuWsZanIE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722818674; c=relaxed/simple; bh=oqAZo2jNs3ZSGL9laaVmjn/iHxf2kyqpUv2k8OAzn08=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=RQTEwd++lh6A3GlxDOCrSvTUghAYeEChz0KtCLhWw/9Sa+Z9e+kOR8g0Z7rIe+SGJHwVyq5U5pvKyhYB8q8WAYpBgHhrPiU1GLX4BW776q+doeLjwFXTXZ2isbaBZ96uWcGfCjrJpWJuC5EtVu0VGZ/sG9KAKvs3SZ2bVnB60Q8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=iCTnlZ8d; arc=fail smtp.client-ip=52.101.229.30 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="iCTnlZ8d" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jrJmDTCFMWybkV1F9vZ/56TC3PkLwo+Ro0PDJtdvB+gh9QAZ6HbjBzTkWH8QmiHdnm+dTyBA1Ht3uxcdUyFEFVFjQcHtlW+RiIAQ1UHi8eCzAfYZhNehyH69dKc78KevN3evQkWVhdeu1Zi22gq8KN+GcUjUQYBuEWOClgZN/2vgcgt0x4DF4P/vYwWgazW1/0ONoNf3aq6KyS7DtvTPcr/iYuMSzGKprpgeHLrXX31m4MPqV4U+3/5YKFUT2gn6/WPsWrh5ayKvgfKen1bL23riEYvfzWIWRkm4s/RpW2zWcu1JJ0iBmSVGyZWF6yagqi/dkISnMlTUmfNQuABVWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=+FDt0zQg654JzDyXUZ5gDWAJp/otcxnDwet1mgZwM+0=; b=Pxy16Ytrf2W41L3LQZOzzSqWXu94AtuJMXwU5exPRavpoBGxdMuYgXLpqxXIkSoC4ZV22Tea2WTTGgOVe08hA0gYMMF4K9R6/WJPn4oOYPhYjZZEWG6tJQpVBJgm4q29O9wh52oBagOpD7CKyoZkEEsGTm56pi6uCAnFGwzgihpG3/KqYb/KMSJq6ny63VjPlUL2ZFmPgaBt7MOnxCV6wFB087OY5RPVFbCplVyqjTZurlgtFjBFBxTObx2JNp7Pu/lQ7RHWbuLFdvjLANn2XBS4vCqC4XyKLAKu8iF+osCOebil5blLHzyEHj2Kbzmov015x+MaqK4klxyii9I9oA== 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=+FDt0zQg654JzDyXUZ5gDWAJp/otcxnDwet1mgZwM+0=; b=iCTnlZ8dcfjiYTgi0c7zePTn/MjyIJzJv87nu08hQoH27dmO/PRBWN/cKeAGa3JGdVVX/weWiMmBTVpg1doUYvhnGPMwOjhegPXFVPh6OT2IfWAhoiWM8bNJsjQiE9oHZ5E/c/p5UZN2lIIDr+wXaLPN3HI3lS1eqTLsY3+Vnrg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) by TYWPR01MB11466.jpnprd01.prod.outlook.com (2603:1096:400:400::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.26; Mon, 5 Aug 2024 00:44:31 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.7828.023; Mon, 5 Aug 2024 00:44:31 +0000 Message-ID: <87mslrvlw1.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 112/113] ASoC: hisilicon: use snd_pcm_is_playback/capture() User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-staging@lists.linux.dev, Linux-ALSA In-Reply-To: <874j7z3j1a.wl-kuninori.morimoto.gx@renesas.com> References: <874j7z3j1a.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 5 Aug 2024 00:44:31 +0000 X-ClientProxiedBy: TYCPR01CA0053.jpnprd01.prod.outlook.com (2603:1096:405:2::17) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|TYWPR01MB11466:EE_ X-MS-Office365-Filtering-Correlation-Id: 7d2d503b-60d5-44b8-210e-08dcb4e7c4ba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: OM7sXm9UGrBXmm2gkYntzZvu/T7JIHQB5t0g4hXCTGCUpSWxnWarUqM6ozxtf5kiP1hf+ib95Oih7dJ5UgQPbRBQS/M8zgqM3if11nR6pMLcGWfnjY2q1o1GFX2YLQ7Mrls9hec2w++6Vwma71h5q62C7NxJqYU5I8t7KNawTPgzAnRnkbbx5QX5xhulS6A0EynrM70reaYRgPBb/Z5V0R+5MwFDbOBja2G1Vn8VktzS/9CYdN8hxmPi8j0LQkYgPUkwVpP7D1aFBuDSQhkrFoEY3fAZcWQz1x8Pr8PUbkSq3d/r5QAUX/7cn0Z9DN5/nbSGre76xL2MxtCaQAbq2ihS1Fw0FsFRCq/J3Nnxw4RtaDtXHpeK4McYx8T4++oKmp7qfKWKAMT8fvw8yG5VVvMtSDUIllcUqutyc7MlWQlw+Ti+vZj5pW23dG6klPV1tg8RxVzDMFvb5zQnrUMVuxvVQCG8dOqjhTWEvdpz5qp60X6l0CY0KZcdQXtUSWe+4huClQ1ZEn8o1HmOzgYuGOe0KohNLGXEX7dikp4ZsoKHLozR8+/sIqEVJawboM8OUF5Ox9THArKUzX/RyO4/HqKUpSMD74n2N58Ihl2B98PkBL70MQGNnMUdzDIT9AJiJtf+Ku/UdTfp7CF7iX5u/Qi3Q/VDgdSSh2NDGzF2ova6gL7CY5xwPSItxecbQ/xyF35NSm+JwPr+5hwEGF0BxNFIjESFFNnxP0vGj9COmoDahkqbuxHd4wDdgjiGuhmbfuEIVcMa8TbFI/ezhazc35Ai2Vo8qBClEtA+PWYZY3LF5VYkMnJPgoF80bJZNRGlnnItLYgY1P6jHVyFKdW7kGQ1RTnuG8y/KDI0TyAenMKMlJxdVCu0MvCzuRtoO6BiKMOt07ystQLzyVMbw75nzkP5GlMpr3cjVXrKgJzFmEiCQXPPit1nj54VuQs+u13BMZpYEP5c5XMC1JcC7T4lSKRoH/tY0vDU9jvAnlfDy5JXRnxUnY7evZOmV+A3buHmfpTG+7IaYVas87mB195e/CkF7+IzZrvLzE4AllEZiRK87IuYp8EdMWhhtVR2ptfYqc8ua3NUMXqCRBgVE1B6lX47ZETaYPpk3P8LczZcTsNB0aXozylEu2EkxyRu+B0PMckSpnQQ9gV5mBr8XwffyQ1jBZ207kbx/jvc/i3Oaie1h7LwkHD7mVj+g3FGv58mthCYfouDbjSf0y6sQNOuBWdolWzn8sS/B8KNC0m5hupjrj3Zz/BJ6seHzV23w1J+pDk44CfO/1NI/Qi05kx5UsYWZmtbsM+nMK08X6nos/QA+GRY11gCUIfbcelOxDh0ZjNT0cQO+minOdD3mSEhkhX8+8PNGZTDhPitltV6UbKZdJqFTuQGXbISwyOTkEgFK8NdITMMgHRVzjPlFuHIbw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZbgSi9t6gLnEqzMNUUTMd8LJRn/uzBbhIOQOXd7rDBXOqKSR5VX8uJAyD7fLtlmF5Xn8aT/q4/3HS1TViQwdSmKBLERtPJf2F4kUzEJ4dcUC0173aVefQF1F2pRHtw3uB2IqMShCi7eIW33HoBV2bpyqmmEeoTzMOdACHojyYdHAj+bmHXxQnOYC3NU30/u8xVFDn8pUURUoIn/sP1M34o5d6tEft0E4Q/MrtIpHr8h14euGtuFNGE4xQK8SYJT9xb/76Uu2EhwCjiaZ9iL8bzNscXRp7OPV8tMvTrVKO0vcgQXRO/sh6+jvjtpB+OMMyj/4D4/gRWB5egj5JR18D3foIx486mqlFA633trDhMwGXOcDoAeRJwMRYihxgxNFGEUfj0xG3bmjGmxKWsFEjl12x0tTs5x++3cSB8K9KzwipwiRvmCtDwX3iX1fWHnk/CrZBi9ibb8gwVkZQZdidqGtHIB3nUgbPfEGM+KPdv0k9rwbtmSo05+PDjngbVv+7j3yo5h+rDULrl10pVw9aUiYgaglsrsdlHD6zOsUt5EnQhAX6fqiKuP5vIlq/O1jw3huzRPyrvjSd6djFo5vkIFBxDibeY50wvhA5E1PCviH6uuqzZy6nO3phq62Y27CsB2Ydzd71+JFH3PUJKIYGjjoyKnXD2wB+cDuQDknfgxy722ObKdXX351yTdQpnnVishohsmpR26o5JgFqvEo3TISOuk2Nwzgp5pq1p3wh3qRK7keb5G/73X2PhNHRwUXZmgodj0nFyHGPhVCiGXzmgOnM1D2FB37wPRxzYsGiaHPwAaN8r0YFQtQMMQfLAVcWkz5AY1pk7+GRshU5hbfzonZ57ZaHAv/6dw18WAGTWj6q2XEnZGpW9omf+JYICHrp+bPY9gBK+VmFBOrYKfbkh0pD1q+BpU4A0HhN0onel+cvdVpRM6tetJfiVlzvmU3g2KTQGoGC5SlpP+40KEoEkdd7necx37xDqky+juhLXMxQ5CxU3ufe0I3Vsy2B5teai3tYuxOK9/q81SAyj3MOj7hg2lBoNUkVKEloqs3wqCYYA6fClmMrZwfjlBu9OFpDhXHzqmGa1UH6ddoMOvcbz8IfOmK3rGHoGNbm8Zy54wGUYGRwP1ITdujD2e4y6qJKt7hwtVmdrw/8fZLWkm+SP090NPk16Qx6PkPy9xRVjQzAqO15fng4t/g3jimKh4OBcJ4fzpGM3nyJ5+0JRwhxIqnaDdUbh+bJmR69iaptLr7rI1qxaGNLs52MCtW82d/hlVCR8tZ+d+tPhuNhiL9o4Al3lAL2uGSYqAap4aef0dRtkjlL6W5fXuBP9KDKZS+lIqPGh+qsAc8FjobiKonMIbufWF6FjwW03bLoi6h75zkYNW2zzbILCbcLnCfC7sr+e3sLCBa89DLE0K2LVaH5iuWycDfRh1vY/JtY2VOhsh1S/qgNURO9Z9VyZm7cxwxAgsSHUpaaw03BgKNqG+8h8NYInDHGC/MrmRceMEpN2+pTNv9mzS7TSCcQQZgLESQaKjGAsMAW4XaVSfQ5squl+FUH2H/h2F4ihxT76D7EfKlgFFvTIpEKkXRuF+3mBMN+9amp3aPtMmZqk/ub8aJB7gqqPN4wC1celWzXRXIau8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7d2d503b-60d5-44b8-210e-08dcb4e7c4ba X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2024 00:44:31.1521 (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: CDZ0XpQPLwsZsT9HgsMCJDCVTaRV/yflatXDovVnvDVNIN3nb0zVW9WoUV8feJtjTuS2eoppvo9CtQauqwS+1acbUyNu4svqzTVDwcMSJnMIfLPabOL1O0WDz8GlqtCn X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB11466 We can use snd_pcm_is_playback/capture(). Let's use it. Signed-off-by: Kuninori Morimoto --- sound/soc/hisilicon/hi6210-i2s.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/hisilicon/hi6210-i2s.c b/sound/soc/hisilicon/hi6210-i2s.c index 250ae3781d140..37ffec8ff721f 100644 --- a/sound/soc/hisilicon/hi6210-i2s.c +++ b/sound/soc/hisilicon/hi6210-i2s.c @@ -421,7 +421,7 @@ static int hi6210_i2s_hw_params(struct snd_pcm_substream *substream, dma_data->maxburst = 2; - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + if (snd_pcm_is_playback(substream)) dma_data->addr = i2s->base_phys + HII2S_ST_DL_CHANNEL; else dma_data->addr = i2s->base_phys + HII2S_STEREO_UPLINK_CHANNEL; @@ -478,14 +478,14 @@ static int hi6210_i2s_trigger(struct snd_pcm_substream *substream, int cmd, switch (cmd) { case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + if (snd_pcm_is_capture(substream)) hi6210_i2s_rxctrl(cpu_dai, 1); else hi6210_i2s_txctrl(cpu_dai, 1); break; case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + if (snd_pcm_is_capture(substream)) hi6210_i2s_rxctrl(cpu_dai, 0); else hi6210_i2s_txctrl(cpu_dai, 0);