| Message ID | 20220519154318.2153729-38-ckeepax@opensource.cirrus.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show
Return-Path: <linux-omap-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
by smtp.lore.kernel.org (Postfix) with ESMTP id AF027C4332F
for <linux-omap@archiver.kernel.org>; Thu, 19 May 2022 15:47:51 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S239395AbiESPrt (ORCPT <rfc822;linux-omap@archiver.kernel.org>);
Thu, 19 May 2022 11:47:49 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53494 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S241382AbiESPqR (ORCPT
<rfc822;linux-omap@vger.kernel.org>); Thu, 19 May 2022 11:46:17 -0400
Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com
[67.231.149.25])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EA457DE06;
Thu, 19 May 2022 08:44:24 -0700 (PDT)
Received: from pps.filterd (m0077473.ppops.net [127.0.0.1])
by mx0a-001ae601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id
24J6k127002261;
Thu, 19 May 2022 10:43:40 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com;
h=from : to : cc :
subject : date : message-id : in-reply-to : references : mime-version :
content-transfer-encoding : content-type; s=PODMain02222019;
bh=O1k08BLLSrWLN8bDTTYO6I9etCPuXwIsP0TRdmjUUh8=;
b=lnkQKKHHuHjFy2bWDCn0K8JZyA+GsPfpvFgZ8fqdM3BOiG35hdgPqaNpjQdsSrkj7Yf6
lLQfqfot2Htp2f4p2B5VtLD7M31mLzMxKDe0gK3iWoZA/8zc2ES0NKcd/kZ+d4CGyhp0
vbglizWFVHzMOLJ8ncPuvYJGW6mS0fkaRV7tbgzqEpAZEyrPvld/OPJju8LzLbO6DQEU
P+EpLEuGVy8l14E3a7Fdh8Z4Kq4hPmOGRNUmJSwU7O72KAe7t+YBxeA5nCo3d8JDsVKM
ttTS+KvBrQlEwv5NLq3EpoiNmjPkXY4/jN9gB1hOvjQQJegSUx9dCkbYs1V/iU8U2/Wq Fg==
Received: from ediex01.ad.cirrus.com ([84.19.233.68])
by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3g29u37mcf-10
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128
verify=NOT);
Thu, 19 May 2022 10:43:39 -0500
Received: from EDIEX01.ad.cirrus.com (198.61.84.80) by EDIEX01.ad.cirrus.com
(198.61.84.80) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 19 May
2022 16:43:21 +0100
Received: from ediswmail.ad.cirrus.com (198.61.86.93) by EDIEX01.ad.cirrus.com
(198.61.84.80) with Microsoft SMTP Server id 15.1.2375.24 via Frontend
Transport; Thu, 19 May 2022 16:43:21 +0100
Received: from algalon.ad.cirrus.com (algalon.ad.cirrus.com [198.90.251.122])
by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 10C0511DA;
Thu, 19 May 2022 15:43:21 +0000 (UTC)
From: Charles Keepax <ckeepax@opensource.cirrus.com>
To: <broonie@kernel.org>
CC: <lgirdwood@gmail.com>, <kuninori.morimoto.gx@renesas.com>,
<nicolas.ferre@microchip.com>, <nsaenz@kernel.org>,
<shawnguo@kernel.org>, <linux-imx@nxp.com>,
<cezary.rojewski@intel.com>,
<pierre-louis.bossart@linux.intel.com>,
<linux-mips@vger.kernel.org>, <linux-mediatek@lists.infradead.org>,
<linux-amlogic@lists.infradead.org>, <daniel@zonque.org>,
<srinivas.kandagatla@linaro.org>,
<linux-rockchip@lists.infradead.org>, <krzk@kernel.org>,
<linux-stm32@st-md-mailman.stormreply.com>,
<linux-sunxi@lists.linux.dev>, <linux-tegra@vger.kernel.org>,
<linux-omap@vger.kernel.org>, <linux-xtensa@linux-xtensa.org>,
<peter.ujfalusi@gmail.com>, <jarkko.nikula@bitmer.com>,
<heiko@sntech.de>, <jbrunet@baylibre.com>, <kernel@pengutronix.de>,
<alsa-devel@alsa-project.org>, <patches@opensource.cirrus.com>
Subject: [PATCH 37/56] ASoC: img: Rename set_fmt_new back to set_fmt
Date: Thu, 19 May 2022 16:42:59 +0100
Message-ID: <20220519154318.2153729-38-ckeepax@opensource.cirrus.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20220519154318.2153729-1-ckeepax@opensource.cirrus.com>
References: <20220519154318.2153729-1-ckeepax@opensource.cirrus.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Proofpoint-GUID: zERY7-qXw1jE8CwXTYUsZQAsiyaYzUHL
X-Proofpoint-ORIG-GUID: zERY7-qXw1jE8CwXTYUsZQAsiyaYzUHL
X-Proofpoint-Spam-Reason: safe
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
|
| Series |
Specify clock provider directly to CPU DAIs
|
expand
|
diff --git a/sound/soc/img/img-i2s-in.c b/sound/soc/img/img-i2s-in.c index 79e733bc0ae69..97cab6d95b169 100644 --- a/sound/soc/img/img-i2s-in.c +++ b/sound/soc/img/img-i2s-in.c @@ -373,7 +373,7 @@ static int img_i2s_in_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) static const struct snd_soc_dai_ops img_i2s_in_dai_ops = { .trigger = img_i2s_in_trigger, .hw_params = img_i2s_in_hw_params, - .set_fmt_new = img_i2s_in_set_fmt + .set_fmt = img_i2s_in_set_fmt }; static int img_i2s_in_dai_probe(struct snd_soc_dai *dai) diff --git a/sound/soc/img/img-i2s-out.c b/sound/soc/img/img-i2s-out.c index d92539603d6cb..9ec6fc528e2b4 100644 --- a/sound/soc/img/img-i2s-out.c +++ b/sound/soc/img/img-i2s-out.c @@ -381,7 +381,7 @@ static int img_i2s_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) static const struct snd_soc_dai_ops img_i2s_out_dai_ops = { .trigger = img_i2s_out_trigger, .hw_params = img_i2s_out_hw_params, - .set_fmt_new = img_i2s_out_set_fmt + .set_fmt = img_i2s_out_set_fmt }; static int img_i2s_out_dai_probe(struct snd_soc_dai *dai)
Now the core has been migrated across to the new direct clock specification we can move the drivers back to the normal set_fmt callback. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> --- sound/soc/img/img-i2s-in.c | 2 +- sound/soc/img/img-i2s-out.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)