Message ID | 87bn9piy5w.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 5e7b9edd928d22ffd4936fc61c80532ed6df5077 |
Headers | show
Return-Path: <alsa-devel-bounces@alsa-project.org> X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D17A79F387 for <patchwork-alsa-devel@patchwork.kernel.org>; Thu, 17 Dec 2015 02:57:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EEC81203EC for <patchwork-alsa-devel@patchwork.kernel.org>; Thu, 17 Dec 2015 02:57:00 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id B55E620253 for <patchwork-alsa-devel@patchwork.kernel.org>; Thu, 17 Dec 2015 02:56:59 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id B42002661B0; Thu, 17 Dec 2015 03:56:53 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_LOW, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 53D22265E1F; Thu, 17 Dec 2015 03:56:26 +0100 (CET) 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 461FE265E1F; Thu, 17 Dec 2015 03:56:25 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 328C02660EE for <alsa-devel@alsa-project.org>; Thu, 17 Dec 2015 03:55:55 +0100 (CET) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 17 Dec 2015 11:55:54 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id B5BD2413E5; Thu, 17 Dec 2015 11:55:54 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 976562806E; Thu, 17 Dec 2015 11:55:54 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 919442806D; Thu, 17 Dec 2015 11:55:54 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id MAK21785; Thu, 17 Dec 2015 11:55:54 +0900 X-IronPort-AV: E=Sophos;i="5.20,438,1444662000"; d="scan'";a="201978625" Received: from mail-hk2apc01lp0213.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.213]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 17 Dec 2015 11:55:53 +0900 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by SG2PR06MB1018.apcprd06.prod.outlook.com (10.161.9.26) with Microsoft SMTP Server (TLS) id 15.1.355.16; Thu, 17 Dec 2015 02:55:51 +0000 Message-ID: <87bn9piy5w.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> 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 <broonie@kernel.org> In-Reply-To: <87egeliyaz.wl%kuninori.morimoto.gx@renesas.com> References: <87egeliyaz.wl%kuninori.morimoto.gx@renesas.com> Date: Thu, 17 Dec 2015 02:55:51 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0021.jpnprd01.prod.outlook.com (25.161.225.159) To SG2PR06MB1018.apcprd06.prod.outlook.com (25.161.9.26) X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1018; 2:AdF2cJlfJHHYlpFEFwaSjLJFAZvLGesp2+pGm+ryrkJxT/qyHd5PLLTomLFvRhrnlYBJ18eYfeVA2yFFa8660a5H3ai/ZBAffC1R47T2ozYTfflZWnjlqYr/xM0EIxE/vGVOO4+zUUKm+TmTX0j78w==; 3:rImXtV9PGg6SLuQqtQ/bycR06sLcktiGPdj+cie9PnrhCQItoZ5rtwJOFFolAmQfilHnKybOMqk6HaaJCfiWV8mNxFQpikihYmBPnGFdTV6yDc64WvKdxczQXU1gQ6bL; 25:5BhENhXNGCTUupZlOol24f5HmjW5CiWIS2q2ag4S1pGpZBcBOonvffdYCkt0rrLfy9aZp0DqoGZN+GBN80p1uYBtdrXOlTvI1omIwVTnvRnM61v+fyBT/CxSxm0cVShS2+gXJ7IV8UJeOzdufcSnGcFe6Z0Ru6WK8oNg309EoXPxfuwdPz81FFLpDbjzjvO1V10mZ+f9vGEKteXhm+eWr8suySbvc2Ht16Dh+RA9sKCGklOoyAX5VopOZpZbDl8e X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB1018; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1018; 20:uJNEyseEG4VyV8kgBeCLZ6qHcNxzuyV2Fbf1DO2qpbCbD14EYBRpkMZv97rpU5QEFpx6BLwU08RF/gZJrLbnhMl1zvemt9BgzEDcI3ki0xdN1u/OzlPwnJ+6/6dZEhoKfDsIIV0pMwnWF/C+BPdwXSn7VkPC1HaudytRyNYUwVyO7YOreemiJYmhdevdqcYveyZ6vqDGPsB7m+1d2G7ok6I6dyRPayK/VLXTdGfGO8Scxf2dsvoCiHIIAEK8A2rOnm95wI0jejL9bh1VQ0LrRph51DVzgucsjBH0+Bhd4oqJbeBy9tpAnAxgs9WDA3N5K6373uIUHP041QXBr5jQO+kJM/Ho4QTa4NuKhpe80mNJxW50K9t++TO33rECQEtDxRLk3tj5xpFUGTXisGDReVcfDwX3UKD9LvdO3fvo4/mulpOj8oEmlcLaH1f4mFqpuPE45/1WnQA34Drail3Ipmkss3gc1JB6F7qdPJ+J6j0NjffoAQXa2N4ZWZK3Ebsn; 4:XxzDxYpn3DxfVGgtrFP8uUd/4S3vJvAle/DD7Lm7CiGv1PBv9oudueol1gY1WMGclZTTgVcMX98Og1KoJl1oSLrCGi4vXFMaV5RNBeiILigbijVrVHsh+RjmN5/hVdubGvOXKlDg7Pmyf+4ueFSfefx5UYwxa3Cg5rEmlG3TnNktQTiMD9fbBNmO83AWllhJu9Qb0DUveCeIDnSJ2v4h0fvmYUCll6JtZ5mcgBnjPFbSC5IjQ4dsuVk5dYGf/ndbeuPX4iYexQYkahgC6grqKSWzUymtytU2poZ9APV/vCMluljufKQciJB7B2a6GDb4dZdf8Aifxha+OkVnA7Fhc15EZGS/O6sWgij8aNBkBuIMCyoVsW9EScE5/ZlxEBzoQTpxvb37lNOMKKf1VCzPDn58yuoBnc1pADgZSO30ccM= X-Microsoft-Antispam-PRVS: <SG2PR06MB101870C03BDBA2C54BA518B1D4E00@SG2PR06MB1018.apcprd06.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(85106069007906); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(3002001)(10201501046); SRVR:SG2PR06MB1018; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB1018; X-Forefront-PRVS: 07935ACF08 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(586003)(2950100001)(106356001)(101416001)(105586002)(33646002)(77096005)(40100003)(229853001)(87976001)(47776003)(42186005)(83506001)(50986999)(54356999)(76176999)(53416004)(92566002)(66066001)(5004730100002)(122386002)(1096002)(81156007)(189998001)(4001350100001)(97736004)(46406003)(36756003)(5008740100001)(6116002)(23726003)(3846002)(86362001)(5001960100002)(19580395003)(110136002)(69596002)(19580405001)(50466002); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB1018; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB1018; 23:V0gWqoHbiSSdrzOt2+Qr7El4heJtuve1OfKlRq8Qy?= =?us-ascii?Q?k6DUM1ZwX6qcb1YmFzHTA27uu/wXjKSeItBhdaPjav8ymkSk8KyJFErnagwz?= =?us-ascii?Q?Iyjqyy7O8Fy5Y74cswNvigLwZP66YrIlfgkk1OimaYqSPT1yiUqWFgVNLtc+?= =?us-ascii?Q?1wpvE2ZT6uX65XevSh+rFX/prC3PGxlMYfrQgxH9eQj2eR/Mpc9rBZX7errS?= =?us-ascii?Q?F6oAnk+cgWIfgvU4KnycTsZAgRUEd3XKRyha6LtbWbrKfxUHNoJb3V4cobmi?= =?us-ascii?Q?U8d6kKra1mJOU4WNjeACyXdkWpGafDGj5ZQ9/QVZAnMIGJMsQsXUaP/DkztS?= =?us-ascii?Q?FPpN4csb5QQOn/uOJ29Z20wjWrjrZeVPwANIswmfTEQDA6ie8T4uOe2OJEFg?= =?us-ascii?Q?XtJQtFU8KpwUVps7CKUOI3AJRy9Et6iaOtnKv1IyPsdKE92EmjuwK3wvOfh9?= =?us-ascii?Q?e0bdslidec3DXRjiaeV1Q/Y6eonitbf1RZdBjLfDckejKRcQ3nW6Fjjk5k19?= =?us-ascii?Q?UELRFiKYg7JX5eWJo+pLuAjY0RQ9TK5n5FUuSrebHGLZIuubW6n7CPsWI/tz?= =?us-ascii?Q?C477IsRlp4+9xPudX5HU/WcndLniOla1n0xH72hvAV2BVCoY2cEcSt1LUuPu?= =?us-ascii?Q?RTxdh5EzI0gwDoQ8bJyigjncIEndFc8CmizX1AJWJWcTjJYbjMiz0f3KBSxT?= =?us-ascii?Q?aZ7/qq6x5m6FaAdInidTq2OPpModAaYKrAKwKms7xZUs3bOVZNwWo+VY7VCC?= =?us-ascii?Q?uv11RmblICD7M3ym1JGvg17PbVFByZrsslVzP/YXKC98S5XSexzWGmBnEbIy?= =?us-ascii?Q?uPmcc99DowF3IYzsDHIAdkznqFpaWDFidkyfhOmvM4cNXk6CNcfcl8hLveMt?= =?us-ascii?Q?hvftvsT5t3DBwD156I6IL7jszDbsTb8cr552SUsvnbn8hO/OlthykC6FOry2?= =?us-ascii?Q?bXC/WoQ4tw1dJ+SZGDa3HgFXeOFBo1Gc1vmOjjk3bk9U1aLiythby+HObPlt?= =?us-ascii?Q?27xWq8rGi2aGpfqRIvORVJMiHctHUH5LShyM4rG8OLJHTN+WGmW7c7wA9meF?= =?us-ascii?Q?U9FTXooPUZjgJHnZdpzbSo9ZrOlATS1CF2/6TPEn9cSVoFXSQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1018; 5:ecBY5fN5IvzqwWJKgMUVQxUnvqMQOHlNPYE4z034YuCLUOmqrD3AHuYt1gVqa1UY0hPw18iUht7ahsbhsytNEzBITlRGdCxJvtetiSGKc/gi++oZntp44vyVGEt80k7ve1T26FKj2lbt/+w+0RkT0g==; 24:y4jrSfK8l8gihTCVrDZ8EPe8zbECELKYg8PpHuWIKoRkTym9Hyf9wqsFb9U2WwgAJfv8IJWhesBB/OCQhphDZgtHRPgc2y/ch6qrU+XDNUc=; 20:TqfjvLVayTi907YnCpWYEJ8wcBLFbHwM2MmokGwdrbS1EIYLQLFj59Y1awXlAUmyEkvq7oj5VwErHBDp3JdFfw6AbMQ7UlHxqoF/SE9cNyazh7mHS8itq+7Eo3MvLX3YQY84CzI83+WW6b4j7kRp5XSNB2T3UD77h5FjFm0DvaE= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2015 02:55:51.3447 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB1018 Cc: Linux-ALSA <alsa-devel@alsa-project.org>, Simon <horms@verge.net.au>, Liam Girdwood <lgirdwood@gmail.com> Subject: [alsa-devel] [PATCH 02/12] ASoC: rsnd: tidyup return value of rsnd_get_adinr_bit() 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" <alsa-devel.alsa-project.org> List-Unsubscribe: <http://mailman.alsa-project.org/mailman/options/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel/> List-Post: <mailto:alsa-devel@alsa-project.org> List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 849c1ad..44f32c1 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -227,21 +227,17 @@ u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io) struct rsnd_priv *priv = rsnd_mod_to_priv(mod); struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); struct device *dev = rsnd_priv_to_dev(priv); - u32 adinr = runtime->channels; switch (runtime->sample_bits) { case 16: - adinr |= (8 << 16); - break; + return 8 << 16; case 32: - adinr |= (0 << 16); - break; - default: - dev_warn(dev, "not supported sample bits\n"); - return 0; + return 0 << 16; } - return adinr; + dev_warn(dev, "not supported sample bits\n"); + + return 0; } u32 rsnd_get_adinr_chan(struct rsnd_mod *mod, struct rsnd_dai_stream *io)