From patchwork Sun Oct 1 23:47:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9979917 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4036F603FF for ; Sun, 1 Oct 2017 23:54:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2236728870 for ; Sun, 1 Oct 2017 23:54:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 156682889B; Sun, 1 Oct 2017 23:54:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B72DB2886C for ; Sun, 1 Oct 2017 23:54:10 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 40F84266EA0; Mon, 2 Oct 2017 01:48:04 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 55B4B266EA9; Mon, 2 Oct 2017 01:48:02 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 28CA6266E55 for ; Mon, 2 Oct 2017 01:47:56 +0200 (CEST) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 02 Oct 2017 08:47:53 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 846D94CFD6; Mon, 2 Oct 2017 08:47:53 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.42,466,1500908400"; d="scan'208";a="258234524" Received: from mail-sg2apc01lp0242.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.242]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 02 Oct 2017 08:47:52 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=SavSQai3PFoKd07yYn57VMvd+jf3mq07Ic67VuiEZwM=; b=KRsdow0ooWUdWhH3kaoPYu0YPcNU+hJOsKjXKhxy4l3Z23qQNP/NMObXwVX8nUisn6AZ1pSqWAuSjJ2ttVYFTt4R5vo5nQ1F6rguM51MuOQ3dRIYbqp3Ko3McWgUmvkqt/4Cp+4QvJvXCK6KUrl3bCQBF3MezktReXVKUbAm+3g= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.138) by SG2PR0601MB1886.apcprd06.prod.outlook.com (2603:1096:3:9::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Sun, 1 Oct 2017 23:47:50 +0000 Message-ID: <871smmo2st.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") To: Mark Brown In-Reply-To: <873772o2ty.wl%kuninori.morimoto.gx@renesas.com> References: <873772o2ty.wl%kuninori.morimoto.gx@renesas.com> Date: Sun, 1 Oct 2017 23:47:50 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: KAWPR01CA0058.jpnprd01.prod.outlook.com (2603:1096:402:b::18) To SG2PR0601MB1886.apcprd06.prod.outlook.com (2603:1096:3:9::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0ebd4557-0ea3-4591-d1a2-08d50926d40a X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:SG2PR0601MB1886; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1886; 3:uqgQjffdO47s03IM2eG9o/ukjTkQE+ZY3TO08HmqPa6tUvLMXPUq+MC8oP/lxJbsk9BVNqnjfAZZ6j7IysyZDuMNb1Ke8fbU82Qk6D9GTclQ8EcYCUhp8HaOfkCHo1CanKC1rPrxhrY2Rv7XseyHe2cf5vL4x6GdHQN+Z3+NKWpeM10PPAp61YlV431LLLZWm9OWeZ3TRJ+q+/GNmJ7VWAAd40rQVJzN8BAFW+QRrahAx+dsIxQS0iOlp2U4Jc73; 25:aXT5P2KPZlfwuxtZlarTiT/54HGRTURvgHKGbsZGOTM+wD6nmtqkHzGU1ZbSnvw+uBtNlmdJfnPEjflcJ9u8sIkORhAT/KZXS8n5wu9I9iBHkrEFkZQrTETy3zmk2jF61aXj/6VEMDQCF8lW5+L2Po9jPCpAuxGoe3BBmYVk5FRYTq/t9/VURirBw4EW1hQUtGfwweaZu5/Rk++pDkeAZmdu2K+WNOWlu5XjoskA5yNHijVwLeoVShnBH5OPkT+/mbwnIURAyWpGGKUGjANjAq9Lx5MXQ0mXH7SytCgOsQq7PTLaPuUbRc1boOBNrEWoKq0TkL9B6QIBvwGEnNez6g==; 31:rzrkSwa/NCu2nQmQ9lRNOaN4NknwZLZHZcO4kTBcrqbogbK2lcNtomZxZhvVwZ1HX04J/oK0O/fYQBfMq76o2Eoh36JHL651D8eNrfzNDm5Phw9Nx/KdZSeKoU2IWe/OO/rcs3Cu3H5AT7tzhxeAvHWxeU8pBf3yb8SmFiiZ05pMeYE1LK7QxNEtcmdiu9iY6PlC65RX2Xx+QGZkCXr0OrZAqSFT4MUNaHQcM9G5Lu8= X-MS-TrafficTypeDiagnostic: SG2PR0601MB1886: X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1886; 20:TIpMDhf7YIYsCAnS0HK7LKBHy0woqgXFIeYTKaUnO2O/sa+ZZ/NT+058lcm9kXwooYpAp82DKVu3jva3O1x+g3MYPRc8sd8R6IIfXew3fnM4Zb1xwBcf9IKP9pQsNJkFlddknLAMXIvIoUMAIZWOr0BeqmQu9gGb9AHxK+lMh81w1QS5RKQerIAYqp8bGLWgMrYn1tSjZlAWw88NxIIeEuG6WoIPdZLJa9CGFA6bahqcz9vfqhoC/vOkLhJp+sSAstkN/2Ll63NCQ5a6SXahmqWof9RCGZJ3K3fezMEG5CeU2DICL+hI6IBNQIswftaT4TjfxFq6cZpXriZ79JVNoZ3TEuCp9ZWBkcjGK0dVFgBF7uPmDzVgEEWpdY9SuGOXg7vQPjQjXucbGEN2WLvjrPxfLOZU93i9Ho4FxedatTxtor0N2IFMuolBkTvS5cAxeyYX4/N+kYlst23PM9N+mOLxCIECaDce9HewzMkuZv1gxSkz6KjBPvPmdaHkM53V; 4:u3KUORYD5tOR9DxYl1WLaMePkwNiGHEkZ/yOMQm6zIVzNc3mtj1vDkF23vWD2W25hNootGLkGJvRIb/g5xRdq7YE95ItK1WEfP2e07dTXLekMGZ9bMxgAOOaLf9y+4ifyjuWV+sirZZbahCtRmCCMQK4zn+tr6Ca/uTFDzSdTbC5LPWBxzxUvUGvgE8/dA7i0Lm5t2GO+2SdrOCOmks7Dq+DuGv7gwu/ZXRsw/U+mRRv2PRkWldTtY5RqoP1gJwXHXpdlBj0AR3jF3/CdhSNNVNYGR+8dJyCySdn3RFI4RI= X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(93006095)(93001095)(3002001)(10201501046)(6055026)(6041248)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SG2PR0601MB1886; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SG2PR0601MB1886; X-Forefront-PRVS: 0447DB1C71 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(376002)(346002)(199003)(189002)(316002)(86362001)(8936002)(50466002)(189998001)(105586002)(16586007)(106356001)(83506001)(68736007)(6486002)(76176999)(50986999)(2906002)(47776003)(6916009)(101416001)(478600001)(53416004)(97736004)(2950100002)(33646002)(7736002)(81166006)(81156014)(58126008)(54906003)(8676002)(54356999)(69596002)(5660300001)(16526017)(4326008)(36756003)(25786009)(3846002)(107886003)(6116002)(53936002)(23726003)(66066001)(305945005)(41533002)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1886; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1886; 23:zzklpmY7IVlSumV5rQPtQNMvpZr64WgdGT752XH?= =?us-ascii?Q?uCVsBIib8XIWohkDb3yD5QQEE3FMMaNN8NwyeBZo4SZwBVyvMmQPIeVwRbOV?= =?us-ascii?Q?Mi1eEpBSo/DzKO/rvOcW7XXTOZxuy25jSKndpASypA6YbtHeeNZU4NMlpOJe?= =?us-ascii?Q?sRXKERoBQLkJiuoCDUg3aTe5CXTeRNC7fEhqsA24hveBOZoN3LT3bkWFHy8n?= =?us-ascii?Q?w26XHWcmZ/NME4FdVvoXb83fVw+EWgAtz2abxMV7Uj1N+yq48wuO8T1n9Srg?= =?us-ascii?Q?lpChGTvDzt8LAJ2uOMWXsrhDyoF2SbBPdnqEe0fw1xjKpw+WHgZ+7cnepLDU?= =?us-ascii?Q?8koUf7RBvu5EMtgce5/XuDlWwvKnV6pKQ1kog1iJCjF63ulVk2edXzg0y+JG?= =?us-ascii?Q?QpKRpFSspNQhy2Qz22PIZOMdTeoblFM3aB7drBf69brikMEL/oUN/MXe/jSt?= =?us-ascii?Q?rxmAFP9AjD6WmOZMfk0sh4DEARi9w7TpsiR1hql37o3UqcJYICj+8HaVS6qs?= =?us-ascii?Q?H+rHo/vvsJJZNJtoDYfrtH0rzeRNSxL/oQsMYIc6oXUCwtEFODzVFCzJmydf?= =?us-ascii?Q?Bj/aHcNcOFy0K3QT6padnWvAtVprEm3k7csycd1dHW2X81Sv0hQ98Yw8fb5V?= =?us-ascii?Q?NZTQuzWD0BXNF2UQ1lxbghjfVgPbB8IO+Z5NGM6IzLy9Y223MQpogmTri0mJ?= =?us-ascii?Q?LNIxc4e8PU3VnQ+ldT8LbdXHtcebvfjGuQ2lKxqncsipssGCQuSbvo9Wyq2O?= =?us-ascii?Q?Eldt7jhwcLZ+4GU1YlG9v27Pnp9uTWHKAEfl1CoRLBHFFwdkEo6BAAOknJmD?= =?us-ascii?Q?1RePI5lOfFvygReETXcVpf/LIImIBy2UOmIGyAc2OIt41FJdSi7qhLZt/bHV?= =?us-ascii?Q?A+IU27eNnlBZjf336Yz/uPE8Pm1RbI6J6eARmFsrr5rZajSfc78o+Gg+qdH1?= =?us-ascii?Q?bq9AuqVk/dAXOM3ZMFgMDiOOiwR2HsUbR7L3os49ZJZRPSDjWNDII4gHQeJM?= =?us-ascii?Q?oVnugvuXCSQ+NAKs8ynxGVOns3/UowpB2ufCbuJvUouYiUgjTvkVXbFqfkYP?= =?us-ascii?Q?jVgvUxfvNNMr02FrkwYPxwNQHtjnAjwwe3nhESMBXsX4/QevTbW1aDraR3CZ?= =?us-ascii?Q?EtSSVBhtpCzTlhOnCqUuMJzUv2tg2z9uQs1vtPDvTV+T5964vbQSEKw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1886; 6:vbXgibn6ZfYJ6drxIRZJ/NXrrbq7v/o53rZQt0mK37N6X6qBkbkUbZs4euD+StKG/Tg09+ockLhOxhP3OAjMmrdAz4PLAyDY3UXEzG/3msI1xYqqyldEthFLjd9XTF/cFbkwTap+N54TF9lFx/WRLEOJuu4SkdEPfLubskj7hqS3yIIm8bOV/26/UoPnIazKsIKZeMYkUmzdp5XRCSjmujbzbTb0RWkLAkiNAe8WbFWI3nPYxqJtIiMVcQoIFc8O7EyhGetx9j/W2qFyCNy0h15REK6cBKJLQpOyBfOogsfyG2/S9uytfSih9NbdkDKJbCbDGzeGocZHoGBonKtmdw==; 5:/CN6eLyhnzEfB7rhZ7GIHyX5lZaWA1tDPQ1CWRM+ChhO/DG/VnkSqfGBBcduSf9538TDgwRJFxWaMguLQ9X2O6worBQyZ9ZcJ5b6dR23fpGNa5tUnmo3fdNyPYvBNcfUFYdwHkfxWsGKEB+wQYsg0/QyNqQQK3Smp4F7+OgM1wY=; 24:BJLpRLtRxqpRRGQFEL6zAdXHz5Q2NBiUASJ1qR9kkSg4zB5GTQ4mK925MAOfTQ0GQ4jow4ykJvhw02i+VrZvQNInxzww0CqGeAfunTylrgY=; 7:dprQK8kWRTqLIIzD/gcteN58rDAvh2o3D/ETEVbSZ6guBFM52j83M0DbajZyPovb22r9IvQuzAMb/gPxy3tjSpRI+LqZ8qTChVTmbEGlM/D/Ntp7M4EstxzKSH6pojai6FoDXRC44fDy00xJ5dwYxYQP+o0wP8SmrUxjH4X2PQSAjOsl2tQQ2rYjBF82wH4A6yTqDwBiMmHx9HOlImVFzWyxNjmDf/O66M/W/ZFLKX8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1886; 20:0HVonBqeeHqUSoPKoOwyUi6reky6QRBGIO8CIkrRInT6pT1Hag62wOTDfT8w/SdmGaP4klpVC1Dp7eckGY8ALN3a+82NDWmHkkG2Rw62c79tslNEe8pdZqDwKAQmHtpbKyaFroU4M8YsIJU5TrRyJAmKI3wgxtlOYfWSleKeuE4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2017 23:47:50.7272 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1886 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon , Hiroyuki Yokoyama Subject: [alsa-devel] [PATCH 1/6 v3] ASoC: rsnd: add generic rsnd_flags_xxx() macro X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto SSI is using rsnd_ssi_flags_xxx() macro to control flags. But it is useful macro not only for SSI. This patch replace it to more generic rsnd_flags_xxx(). Signed-off-by: Kuninori Morimoto Tested-by: Hiroyuki Yokoyama --- v2 -> v3 - tidyup rsnd_flags_del() sound/soc/sh/rcar/rsnd.h | 4 ++++ sound/soc/sh/rcar/ssi.c | 27 ++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index c5de71f..beffbec 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -601,6 +601,10 @@ struct rsnd_priv { #define rsnd_is_gen1(priv) (((priv)->flags & RSND_GEN_MASK) == RSND_GEN1) #define rsnd_is_gen2(priv) (((priv)->flags & RSND_GEN_MASK) == RSND_GEN2) +#define rsnd_flags_has(p, f) ((p)->flags & (f)) +#define rsnd_flags_set(p, f) ((p)->flags |= (f)) +#define rsnd_flags_del(p, f) ((p)->flags &= ~(f)) + /* * rsnd_kctrl */ diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 03c2a1f..4ed8871 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -101,9 +101,6 @@ struct rsnd_ssi { #define rsnd_ssi_get(priv, id) ((struct rsnd_ssi *)(priv->ssi) + id) #define rsnd_ssi_nr(priv) ((priv)->ssi_nr) #define rsnd_mod_to_ssi(_mod) container_of((_mod), struct rsnd_ssi, mod) -#define rsnd_ssi_flags_has(p, f) ((p)->flags & f) -#define rsnd_ssi_flags_set(p, f) ((p)->flags |= f) -#define rsnd_ssi_flags_del(p, f) ((p)->flags = ((p)->flags & ~f)) #define rsnd_ssi_is_parent(ssi, io) ((ssi) == rsnd_io_to_mod_ssip(io)) #define rsnd_ssi_is_multi_slave(mod, io) \ (rsnd_ssi_multi_slaves(io) & (1 << rsnd_mod_id(mod))) @@ -116,10 +113,10 @@ int rsnd_ssi_hdmi_port(struct rsnd_dai_stream *io) struct rsnd_mod *mod = rsnd_io_to_mod_ssi(io); struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); - if (rsnd_ssi_flags_has(ssi, RSND_SSI_HDMI0)) + if (rsnd_flags_has(ssi, RSND_SSI_HDMI0)) return RSND_SSI_HDMI_PORT0; - if (rsnd_ssi_flags_has(ssi, RSND_SSI_HDMI1)) + if (rsnd_flags_has(ssi, RSND_SSI_HDMI1)) return RSND_SSI_HDMI_PORT1; return 0; @@ -134,7 +131,7 @@ int rsnd_ssi_use_busif(struct rsnd_dai_stream *io) if (!rsnd_ssi_is_dma_mode(mod)) return 0; - if (!(rsnd_ssi_flags_has(ssi, RSND_SSI_NO_BUSIF))) + if (!(rsnd_flags_has(ssi, RSND_SSI_NO_BUSIF))) use_busif = 1; if (rsnd_io_to_mod_src(io)) use_busif = 1; @@ -793,13 +790,13 @@ static int rsnd_ssi_common_probe(struct rsnd_mod *mod, * But it don't need to call request_irq() many times. * Let's control it by RSND_SSI_PROBED flag. */ - if (!rsnd_ssi_flags_has(ssi, RSND_SSI_PROBED)) { + if (!rsnd_flags_has(ssi, RSND_SSI_PROBED)) { ret = request_irq(ssi->irq, rsnd_ssi_interrupt, IRQF_SHARED, dev_name(dev), mod); - rsnd_ssi_flags_set(ssi, RSND_SSI_PROBED); + rsnd_flags_set(ssi, RSND_SSI_PROBED); } return ret; @@ -817,10 +814,10 @@ static int rsnd_ssi_common_remove(struct rsnd_mod *mod, return 0; /* PIO will request IRQ again */ - if (rsnd_ssi_flags_has(ssi, RSND_SSI_PROBED)) { + if (rsnd_flags_has(ssi, RSND_SSI_PROBED)) { free_irq(ssi->irq, mod); - rsnd_ssi_flags_del(ssi, RSND_SSI_PROBED); + rsnd_flags_del(ssi, RSND_SSI_PROBED); } return 0; @@ -1003,13 +1000,13 @@ static void __rsnd_ssi_parse_hdmi_connection(struct rsnd_priv *priv, ssi = rsnd_mod_to_ssi(mod); if (strstr(remote_ep->full_name, "hdmi0")) { - rsnd_ssi_flags_set(ssi, RSND_SSI_HDMI0); + rsnd_flags_set(ssi, RSND_SSI_HDMI0); dev_dbg(dev, "%s[%d] connected to HDMI0\n", rsnd_mod_name(mod), rsnd_mod_id(mod)); } if (strstr(remote_ep->full_name, "hdmi1")) { - rsnd_ssi_flags_set(ssi, RSND_SSI_HDMI1); + rsnd_flags_set(ssi, RSND_SSI_HDMI1); dev_dbg(dev, "%s[%d] connected to HDMI1\n", rsnd_mod_name(mod), rsnd_mod_id(mod)); } @@ -1042,7 +1039,7 @@ int __rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod) { struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); - return !!(rsnd_ssi_flags_has(ssi, RSND_SSI_CLK_PIN_SHARE)); + return !!(rsnd_flags_has(ssi, RSND_SSI_CLK_PIN_SHARE)); } static u32 *rsnd_ssi_get_status(struct rsnd_dai_stream *io, @@ -1128,10 +1125,10 @@ int rsnd_ssi_probe(struct rsnd_priv *priv) } if (of_get_property(np, "shared-pin", NULL)) - rsnd_ssi_flags_set(ssi, RSND_SSI_CLK_PIN_SHARE); + rsnd_flags_set(ssi, RSND_SSI_CLK_PIN_SHARE); if (of_get_property(np, "no-busif", NULL)) - rsnd_ssi_flags_set(ssi, RSND_SSI_NO_BUSIF); + rsnd_flags_set(ssi, RSND_SSI_NO_BUSIF); ssi->irq = irq_of_parse_and_map(np, 0); if (!ssi->irq) {