From patchwork Tue Sep 15 02:42:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 7179681 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0D6B5BEEC1 for ; Tue, 15 Sep 2015 02:43:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3873D206E5 for ; Tue, 15 Sep 2015 02:43:00 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 01726205CD for ; Tue, 15 Sep 2015 02:42:59 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 0369C2606E9; Tue, 15 Sep 2015 04:42:57 +0200 (CEST) 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, NO_DNS_FOR_FROM, RCVD_IN_DNSWL_LOW, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id E60EB2606D2; Tue, 15 Sep 2015 04:42:55 +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 E96642606D6; Tue, 15 Sep 2015 04:42:54 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id A8E962606CF for ; Tue, 15 Sep 2015 04:42:46 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 15 Sep 2015 11:42:45 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 391A24D49F; Tue, 15 Sep 2015 11:42:45 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 235D81806F; Tue, 15 Sep 2015 11:42:45 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 1E1491800A; Tue, 15 Sep 2015 11:42:45 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id MAE12403; Tue, 15 Sep 2015 11:42:45 +0900 X-IronPort-AV: E=Sophos;i="5.17,532,1437404400"; d="scan'";a="194414910" Received: from mail-sg2apc01lp0240.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.240]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 15 Sep 2015 11:42:44 +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 HK2PR06MB0594.apcprd06.prod.outlook.com (10.161.187.145) with Microsoft SMTP Server (TLS) id 15.1.268.17; Tue, 15 Sep 2015 02:42:42 +0000 Message-ID: <87613c4day.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 In-Reply-To: <201509150300.3UM8KvBD%fengguang.wu@intel.com> References: <201509150300.3UM8KvBD%fengguang.wu@intel.com> To: Mark Brown MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 15 Sep 2015 02:42:42 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0022.jpnprd01.prod.outlook.com (25.161.74.160) To HK2PR06MB0594.apcprd06.prod.outlook.com (25.161.187.145) X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0594; 2:DFVtZ22b1Iy1SrGxj/72sQwol9rwoShL8gFTpzsf3CBz/NV2BVH57FmrBcS4LP/QmjGaxX4mqco+nGm2RVpG231IZps6/dnogxiwMx1RxPWvoFMNngoyca+OU95Hq5WQ5/3xgEBnjA3id6v4w9ec23k003bUQc/iLcQtPk6fQvs=; 3:lGr1FGa4VrTtHqrv4SXKLcHqyvOyUNpyOTlqSZ4nDoHxATvVsJlXnaN3p0dCIAr5w4fV4L0ooY5PGNe0rQ5t6NC0Yv+nGEMxbKRk45uDC4NeMSr3lzoJqfZ34ZHBFQHpg4z1QbI09ifiOSq9u//7/Q==; 25:oJnU0KxUFvrHBPOS2FEIZ27cm+frPvDjIJg3X+Ld79jKcfXu0z6w5CTYz6UIBRQVhOzCrySOLAzz/6QA6ZnrKKtvmU7XwF4OWSJDdJC1sBq1gMFeilIDw6mpEtFLWm8GfHigq3UeCzX/MTZAW1f71Uyc9EHIOIvsBno1YcPYc8sXVOJovawzEYi+n4svI+T9NYjIPRMw225Zb1oTqgyZjm1K5kZw6o6kMcHcAgewfNz2UZSaJ+biJTqSan/GWwAv7ul9fCjUsMeAWCcAwz45Uw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR06MB0594; X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0594; 20:VDlRWjTKoz0wcIlxW437YMkoqZcgVz6Kf15S4Qj0Z9Xq88cpgxzn2apcF7fr/FWU6Eyjic9Gp9bDE8nbCONmBkyOh/olpoZRuiwKllPZP1S1lyuaDowlFbfzKjmDVIp7iKr3knF26y9ZatjVnwipqaN2dO2LwJmy05h+IuYxhoqRrr/zBt1fTnVTZSGnU/d5XU7oEIjTnFc7rLGNo5QCSLE9pc1qRgcw1cLeg+zGvEpwPqWqowQ/WRrX0m2xbw7eQPwjAQpbVin7EJ2TGW/vVvQfbDOrNUJcrwU7ai6Mm5eRvyMglErxhezamYn80DyfXpMajrHPd6QKGDt1zRBNHIqNgphALvCup79IJRnxTeJTuzOfic9MlFj3Tb+r0qCLgBueNGwCSfoB3YtbyKqmpRDe9aaHoFmsYQddCT0wnhfduFMC4HKwVgrkOfv47jl5zXLMP9CCA9K1jYr33r41vs6O1dpsmdKbQhHSUi2Mj09szPBawi35JUxrYwZR3gIx; 4:p/bzla2ze3lgPEMUej1SULchAVMOQp5Wbp3n0VtkvcFn4wLorRfHx4PWnn7YbEugIfS1mnB2qrlBoAO+JQYvUKgfzP1t2DdcOrNtUnavMvU/gtx3hF0wu1LATZHfINW2cxvwSK1WxeOpLmz3VsKd0lVVx8DW3xqNQ6OfXfWg5NpARnZxRQ7xcqUetNKh60fbv0Y3Ex+ZYt9HGuyj8XM5ygSW5nz6QHvAYn+FFxy41P61AD9oiJsS9YUEGRbu82uB8jz1oUBbc6qBd6sZY9iAfUZaBup6eJCwC5l/FeyJTyjQoHlR6x+7ChnftmLN5E+2bYVcpQWL3RSK6P+zMHM63rS4+y8Sv0tQiWcUg9Rh5oE= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(8121501046)(520075)(5005006)(520078)(3002001); SRVR:HK2PR06MB0594; BCL:0; PCL:0; RULEID:; SRVR:HK2PR06MB0594; X-Forefront-PRVS: 070092A9D3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(5001830100001)(50466002)(46406003)(33646002)(4001350100001)(5004730100002)(69596002)(5007970100001)(19580405001)(19580395003)(46102003)(86362001)(64706001)(66066001)(23726002)(106356001)(47776003)(42186005)(40100003)(77156002)(62966003)(5001960100002)(77096005)(105586002)(36756003)(110136002)(5001920100001)(5001860100001)(87976001)(53416004)(97736004)(189998001)(81156007)(76176999)(54356999)(4001540100001)(92566002)(83506001)(229853001)(2950100001)(101416001)(122386002)(68736005)(50986999); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR06MB0594; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR06MB0594; 23:QV+swp6epRvyk6hgj7nsXjp6tTp14G0fmPhX1DUR2?= =?us-ascii?Q?QVkCH/9gLdjbDlWrJ3YL6ArJIO7kMzrsxo/Xfdid7qaCeTPGk0MsyFOC3Ho+?= =?us-ascii?Q?BVEtDe2T1hIBbtU04oYAACZG/WGOpXb+57hccBzAU6whjWdJg2eJjhJCgUSb?= =?us-ascii?Q?byu1te25g9wkHifq3PeiGIk+xjpv7Z1SIytEETQkZ2Gqm6IFbAqwKfVyr9/+?= =?us-ascii?Q?Emfa8Bor+RgWTJdXJMlwwDa6nvNkxHu1ySOBjMFp+6BexM1GyVMdBQ0zDUQ0?= =?us-ascii?Q?xPLvLGSXy3HfEZP/a0hOjivTU6o5rh33ehOn2pjMMwLTrKc9TeL721d3VXeN?= =?us-ascii?Q?9WdVo6b1lpVf11b8ampRXDg8LmGOD6y4PXmdyns9uZtJeWXzce6UhU/KxtDR?= =?us-ascii?Q?7ttg5BIy5YwprkkrKBeozEBynU54c8MNcjZ4CnQ/iLoNNPS1P5L9edu5klBs?= =?us-ascii?Q?NfyiJyzOlqDBLDtTyLsSQ5iKReM5Rv/znt49FvZykudFi0sBCCi3hcUhf2gk?= =?us-ascii?Q?P/j0jkKo/TTa86tIHclbwkvTndQowjEYRZRzNDECQhyfgluvUkwqzWh1q1C+?= =?us-ascii?Q?0JC51X3/om3w6XT+rXU6lZtnALY5J/oBZ/GPg7yq2soxjROEvY/JxfbMCxPy?= =?us-ascii?Q?2U3TLJnnBK9lprLX1I5t75TBSS2Xw6AKnXzngGZEfPhd6u92PH1IURiqaZ1l?= =?us-ascii?Q?jWui20L1ibejNdkV5Ft8XIEMkMVrcUVZ3T/abSuOkoxWrAVqaHLoEa8qF1UA?= =?us-ascii?Q?3yNkR4NYA9J46NKa0yOO3P0mohJ4qXd3V9rTIiGohTOpRfdz+p5k4nwXP1b2?= =?us-ascii?Q?qDWOJmr6A/OiHf83UUEgPDoF1tB9XmLCnZbltptj+ZVI2eQvmt9z/hx009aI?= =?us-ascii?Q?IBQ38xuiHMyXS5BoVHbZVNpRdVOIf0gOg9KRllKtwlQX8XeJmUfro0XfYaqH?= =?us-ascii?Q?1CZwmo4fSh5ig+8xzYqK/DeaWFqqTSFQABNc/Ym/6HrQtTUlqkS7o222GnWN?= =?us-ascii?Q?1sS173Q6nt8AS9bV4uDym3/mYykWKAoSPEZYo/vk1JQlynOP9WhXPhPpyHxQ?= =?us-ascii?Q?e9P9X2isvECM2UsdGC+Sv3e5V2XduIqVEuYvUHsLTeqG4XAixUtQPmxbDsS8?= =?us-ascii?Q?ioM5GCiZUni/tvQutdUMhk5r4lwg55hm16QclSDnwfaQAf3yrEkyRwb3tWih?= =?us-ascii?Q?0Jxbq6sy+MNncAZzmqRlqQIaL3e4/avO3vVyaMnePdK3p4pR56ikdED6gD5j?= =?us-ascii?Q?67nBi6u7eP03hFLSnT3vsbWPP0dQmwlZWNKvQl0?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0594; 5:CM6J74+VHThgBtTpvuOoNbm39YY1XB/2WsfZfXYXy8q/AD5LHUyUbWJCoIUpvJc3VvA6gxxeFAPvISPdJlp8LaWtbBo3I3ZGLQeroA5uRHCJjwEuv/NnO3tm0jNb8ZIcYZMa2qt+3fiA8DOUJ+l9Cg==; 24:ubyOKxpl7eMLr8bX4MXRd4YruBWukZbHlKyR6JlnDkH2xMexBhE4mla9quImsSbra/otAcHErrtNOsXlPPwvwCj9bsE0rIh/Dc0d9DYPtVo=; 20:RsTn179YtIDSPD1VUk5yXkH/pIq/Nc98Mq/Q8khE/R4EH69LA2H3HkaS3akpF5Wz/rno69Mo88Te3O4eqAWrlJfCI4Ems0vr+qoJlXTFrRt5/F/VdMWVJQdAM7B4B0HNV/b6jEY4lryazyslxWTRMQ9wQO4lWRsYBGI7nN5R4R4= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2015 02:42:42.1005 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR06MB0594 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH] ASoC: ak4642: exchange macro name to avoid redefinition 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 71a0138ab("ASoC: ak4642: enable to use MCKO as fixed rate output pin on DT") added new FS() macro, but x86 already has it in arch/x86/include/uapi/asm/ptrace-abi.h This patch exchange FS() to FSs() to avoid redefinition warning Reported-by: kbuild test robot Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/ak4642.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index b5c4981..cda27c2 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -130,8 +130,8 @@ #define I2S (3 << 0) /* MD_CTL2 */ -#define FS(val) (((val & 0x7) << 0) | ((val & 0x8) << 2)) -#define PS(val) ((val & 0x3) << 6) +#define FSs(val) (((val & 0x7) << 0) | ((val & 0x8) << 2)) +#define PSs(val) ((val & 0x3) << 6) /* MD_CTL3 */ #define BST1 (1 << 3) @@ -458,7 +458,8 @@ static int ak4642_set_mcko(struct snd_soc_codec *codec, for (ps = 0; ps < ARRAY_SIZE(ps_list); ps++) { for (fs = 0; fs < ARRAY_SIZE(fs_list); fs++) { if (frequency == ps_list[ps] * fs_list[fs]) { - snd_soc_write(codec, MD_CTL2, PS(ps) | FS(fs)); + snd_soc_write(codec, MD_CTL2, + PSs(ps) | FSs(fs)); return 0; } }