Message ID | 87d1kx1usq.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
---|---|
State | Accepted |
Commit | f4d70709c80d907a841e8ffc40995eca661817e6 |
Headers | show
Return-Path: <alsa-devel-bounces@alsa-project.org> 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 7637E60757 for <patchwork-alsa-devel@patchwork.kernel.org>; Thu, 25 Aug 2016 02:04:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6098827FA4 for <patchwork-alsa-devel@patchwork.kernel.org>; Thu, 25 Aug 2016 02:04:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 53DD32915A; Thu, 25 Aug 2016 02:04:56 +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 612F527FA4 for <patchwork-alsa-devel@patchwork.kernel.org>; Thu, 25 Aug 2016 02:04:55 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id A3D2A267252; Thu, 25 Aug 2016 04:04:54 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4929E266F02; Thu, 25 Aug 2016 04:01:18 +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 53B282666B7; Thu, 25 Aug 2016 04:01:15 +0200 (CEST) Received: from relmlie4.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa0.perex.cz (Postfix) with ESMTP id 8F2EE266621 for <alsa-devel@alsa-project.org>; Thu, 25 Aug 2016 03:58:37 +0200 (CEST) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie4.idc.renesas.com with ESMTP; 25 Aug 2016 10:58:36 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 4EE844B204; Thu, 25 Aug 2016 10:58:36 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 9A6472806E; Thu, 25 Aug 2016 10:58:35 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 4C03E2806D; Thu, 25 Aug 2016 10:58:35 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id LBC22378; Thu, 25 Aug 2016 10:58:35 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="218060792" Received: from mail-sg2apc01lp0246.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.246]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 25 Aug 2016 10:58:34 +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=daUZskKGeGfSLsBlm1dLG1vXA8itbZXP8dnFHfITRqg=; b=Il/HkuPNpVF3C2lqYRWLx7EbYYGESAt3WZOSPb9EWAtj3LV5ePLHBXy/mq9JgrM9SboqSdscMdxdJnzlzqg/YCH3La0041FxKw40R+Vvx4i60rMw3BDKvYIgZ1gl9BhnymDsStOKGXAOjhHvz/deJ0k3TjKlhGWiA2rsnNEnC4g= 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 HK2PR0601MB1442.apcprd06.prod.outlook.com (10.165.182.148) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.557.21; Thu, 25 Aug 2016 01:58:31 +0000 Message-ID: <87d1kx1usq.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 To: Mark Brown <broonie@kernel.org> In-Reply-To: <87mvk11uxo.wl%kuninori.morimoto.gx@renesas.com> References: <87mvk11uxo.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Thu, 25 Aug 2016 01:58:31 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0071.jpnprd01.prod.outlook.com (10.167.153.159) To HK2PR0601MB1442.apcprd06.prod.outlook.com (10.165.182.148) X-MS-Office365-Filtering-Correlation-Id: 8d7452e0-b5a0-4aeb-e1fd-08d3cc8b5128 X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1442; 2:kIqnnGG1AfiaVuIyEVbGNLtTAmw5mn/Q6DASIMxeIjuWrcT1MKN0LoItvd34+vjYajGvXPs6UlNjv6PeeqKfXIVTlDdaM7KH9+Wq/66N/vqvT8SmJR7qYMc6BWq2t3k6yNrUV+yEzVx+i8FlwvH9lO+CjmV7qy20GT3Xb3N0B3/Zqa8nFt17mO43IvgVGQnd; 3:QjbYHs138bNAdCyhciCBCga2qYXvk3pOHdW3wYA+sWLckfl/PcvhpNMje08WMzjgZZFrXhtdVMuzureF8Hl/ZqFhteRUzmXI3nJ8OI6HtW62Q1AZ2J9x2PfZ/zTf3qQs X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1442; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1442; 25:WF27bKYoUUOTYtkTTMC9kEZRwnRt3FyGW/DVeyC6YhOGo6oFJQXV7ZZXGZub4YLaVxTqkxr6tU55MXFPfwkGAdJU8t469D6fBL5poRY38nBqu20aDRgmiYrW2ubANKZm1YeCyPNzFGv1fWR0RPMT5bC6auPi8Ura+3KXK6KVtFm6WrVhjlZOFVmDmsnASnpr1yVz7l36ypNEJwkjoKF5tSYO5d1HREoVH2CLwG9UePWWmRb/rJ3QLFr424ps8bwNU/Uc7ju3cT3yEuJGFYAaXiZQ8Xcy7YY39hqN9X3k3mVhFiGY/3ey3U+RpRz8QmoRWQwCgAsCTWlQJ71nlu/egkQrwMRFuc/3SZ606o37X7W7/gUkTgcnOeATmS9scIGjQyUKwXV+W8HLjkVcDY/fKTtRQW0wFKlbAiJzAMNaPRhK9Zm40uMyUvR4YN8iqetgTMyVSFMBbMQRxgANDM864rkmDMRzJT6hXWHZ7kKULFHT59PW1RqX68poUHLGq4hmENHdDeusFQ2vQnjUe134Z+wcFFa2qBBNYvJCN8QXAlNDmGkfgTj4cWG6hgvNQB27wTvjCNcvnZiXOfzskgkRXjK7DqXlmuigKlGiRJ5+PHftlkxNffwRi75kPsc9Vcp+Ueq7KE3z0i/zlBHuzNOjFLqMQ8TLskaYHhJ5BM8qtMY2VR4nn6Oye2bmf5gyo42z5bHcP1O0ETz4Ci43JbO77g==; 31:Pp/cUkBrnPov9EY51e30o024ua+Jz2nWZhEcFN3M2YZ7R01wMbMIB/yFYvDoNnnBInvTb8/cxb4VeBCUNHVntWRUc7VE51aDbSzH2Fc+5JYGb21qoeuA5isMj1c+t4MmiuHSONbDDvpNF7mySCTw3ZBSAmzoc5gk0xjxk8FJ68WQOesNojiJArKVjeJZ86VIREtJMW7Rh6HXdSeR3Y8WYw1JPh3+8mhrum9BPDMnMXI= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1442; 20:/8WN74h1lZyL+ppGwxyMGsKoZvJjO+Y1VruRaX52CnDt/73WQ/i5eVnSbgOH+3xshfcYbE8iU2NkkCoL7myWMkF77JUSh1hsr+D7qam4RdxT/HQSkdzbu4qn6b8AcZz9DoIi+Y77EulavjQZZV/wDeaAca7ZwXIoF00g5HYv34mqTyAvZyT+yRopSYYjbcwYs/Fn+ZhPWO2hSiBMyeX9Poj4W59LzeN5whI0OCYR99sc76JlfKYwE61h/oDvFmJoY8XzR/hlTTkD24T8EfDSxtVa32H/qr/lD1lqBK/HL4llA9eZ//q/DkiIvR1IY+ocFq9TakRBvJ3BTQ2vUOqgmptxjElnQqXB8zI3dsxX1qo16fahJIHf3ksz8hSHSqkecYzLbS2jfRwDnCqmczlZugvm/r7kTda+VwrZGy13kyAyKbn7H0aO4ZlnOvQ5C39PTsk3UA9fBVcWZikY5lE9M8bojklg9JCYmA+CJ8laieiwa/rg4Zr6tRgyRq0ZzEWL; 4:FQCD/vvdgzoTVWkWWc5IMScFSHgPxmp9FYQEytiJC5mB0D1Tv1WFiZdr7h9fs1/KeRRFbg8CVL28xFNk7LZxw7srVreHiDm29gmmCiW/vZEN3bcecl0XhwCiGKwAQHsdyqVtKPQ65w3Hqff6hZrH9ICmXph/YyyZslbM58tlU+vq1RwmghTzDQjOGvwP4sR5wVGvxjt0aJsQyV0gFVtQWbiLeQPAp7wGxphrBI7FNuA6ILefsHF1KIeH2iZAzzvYUVv3EVkVYOP2V0hwbGKFLqJZXilHMGT+BstDmiA4QSODbuipsx/88BGTwVhdj0yVmN3PcjzvTJVmFhsb9q9H9gh03nUZESkSazH4JX6z7eRfBoCf6uvSk0aFCtgwP4+IMVJ8loRbBV3bIV/2u1jL/A== X-Microsoft-Antispam-PRVS: <HK2PR0601MB1442FC89128387DA2C42C4B1D4ED0@HK2PR0601MB1442.apcprd06.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:HK2PR0601MB1442; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1442; X-Forefront-PRVS: 0045236D47 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(979002)(6009001)(7916002)(199003)(189002)(54356999)(19580395003)(42186005)(19580405001)(7846002)(68736007)(86362001)(46406003)(305945005)(7736002)(105586002)(50466002)(92566002)(6116002)(586003)(8676002)(53416004)(101416001)(3846002)(81166006)(229853001)(50986999)(4326007)(230783001)(81156014)(23726003)(47776003)(66066001)(2950100001)(33646002)(189998001)(2906002)(106356001)(76176999)(69596002)(36756003)(4001350100001)(110136002)(97736004)(83506001)(77096005)(5660300001)(16060500001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1442; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1442; 23:aJ8tI6lViQRGSAjtvI7d4Ui00BI/6GXVmOnyxVJ?= =?us-ascii?Q?IX5goKqQ2yiiCk98Yfujg4kMxecOiUE8GLA2YXR8M8IWZFqdwDZV5ONLHSdx?= =?us-ascii?Q?SC70KO+I+r5y1OhbK82hBIZlK04ftzrOY18NQcMhfWyPC4qCoM5dDDoygsTg?= =?us-ascii?Q?IAqzZppxWRx8CrhaH4OrSwCYJIIPxUVcMZv1Emlx7cb0jWqtQDvY+R3wukV+?= =?us-ascii?Q?+fYblZCL9R58ZY159CxYZNvhUYT0nakgfKdXzjb7EkAkUiIjpw8/1Ksr7fLo?= =?us-ascii?Q?3iAH2OYbe6RVkwKNe4euYqPIf6Xwj+7VHGSOfwmOL/y79C/NwiEWaBDNrA1A?= =?us-ascii?Q?notwAdKOz/AKgE479m4Ja3gqR5GpW+9lOoM0JifUbqtQgSe8D0kVLMnvVB3d?= =?us-ascii?Q?5a2dORaZd72U4N/VXERhmvqSFMsbZCQF6CDxFNd3P0FKVSFXbVfTSIRh4aTq?= =?us-ascii?Q?By9iXxwSWGguy1cSa1IeVv+pBIBXUrAdhUa8hT2lI1u51atRUSFdZ4R/eLAM?= =?us-ascii?Q?gf8svlIokOXYcSy6tiADSva7k1pWZXgo6Gf82N0/jh8JmiZdgVm7YcCtXOlM?= =?us-ascii?Q?7MRg6MH2FAmcfo9uH1WkSPa6m7O2ApuOTJWbP9rPZpi8S4v99TXtOFiZ7fG2?= =?us-ascii?Q?jBGYQ3lkvW0E8lJOOg3BK1MOejIfIjFj4RthqP71AF4hq8GKlY+zZ2MNE9zb?= =?us-ascii?Q?PSaYENolc1RwPRZgRrAjjJro3oBtLeu+vbA+aPcq29q10XXAG4RhdIeUFoJL?= =?us-ascii?Q?pPl6jxDJ4sA/fr2qoLRT9LFMuEoumHpwYPIPPe/kIrFKKrERArAfKc8Tn38f?= =?us-ascii?Q?wXVUpQcZmPXkqB7cW+jC4u2IvhiZ7KkCIgXwWJy9AqfZ4bIKKA6MnuEq67c5?= =?us-ascii?Q?oPycwYgXaN55UqqCpjzbwIoOPWwv2IR5GhReP71bPpYAAT36LfvB7bKI/6Og?= =?us-ascii?Q?0mJXUqr0Y+/zXl6X14S68zP9ZV0fXcTnfW2GXOWcyYdo3wBys0rm/wONqzT/?= =?us-ascii?Q?PYuBJGOjasaEv73j1+qPoEfcd4aD5E2nMIWuLPBmKOrh77Oqyss+UFjzeddu?= =?us-ascii?Q?aXF7IbnKBgFNTh5/UwtAsjwXY/7DY5fv3cba4BKqZSBje6VtmyfhFRBEq/3G?= =?us-ascii?Q?vHiU7yZsJSMuWGmC5KiBqckpx657h7ggqdFj7+5e6PKEyfJrmif4S7+HhEZk?= =?us-ascii?Q?UPMuXxojr/AZxVhJuZqTBvUVQFaLtSE7bnJd6ZYwVNoSRBifN433drvrbs6X?= =?us-ascii?Q?H2BhXA/DZ/SXC2ZUS5otLbafU2efpS7MzIsYtmUfW6Sg67fDvJRepGmljY+f?= =?us-ascii?Q?NilGuKKkT7tbR7nBDPcwpLyw=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1442; 6:npYjfr67ROByeKV3gTeEc4Lu7vdhNB4Oz3Bjdso68xM+unDCy1qBRvmMmosHoLL3+AXP/PKAHFaP2UNPXj63WoVf8M+zvjJUJxKOdtLL0jBBax6VR/VzH3EJV0NMEUnFPS2pSS27S5Y31Xnub795HtFbBYNVXIQxYxxLa27byx4rJ4LTrOSujCnQH7x4mmVAqgAKN/+i8SgjYxZPQuEGI+gzjdeHYfiwGP34LE/0KTwrar4k046XyiEPwpAD2+muYkUhbVTB25rNyGn7q6nJTDwuKQd8QI1suM2FEf+775arFJu1DY/1i1u3t227gVpgfkVK1htufMqF+niD3dsI4Q==; 5:NDD4mzo2e2ty2Xfem2+tq885Cj0qG7ARGSzaKLYHr9YD5K8Sx4yPTSbFlU6eWW85GWXMqyazpStVrGUJ1TXMxhX+Ms4Z+6mHS0LH2n0smsgwJJaNaX74vZS/Ck+X4Dg2ti4INylbH54yxknDKs9aGA==; 24:OH6Ai6NoxHMoo4EKIOt5OexTP+1GNULg467xLBEy7voB0qN4nBH3e7inVa2Jl3+5AWJuRUGsahb1JfK3EjdTLh1OlcuKXmgjkjGHPeoyFK8=; 7:RZ1PxazJxMM1Du+FoqiQoUCQ93rDfE6HA0OY7ca7Y/O+KnwpXyIOJXRMx6TrsAaF+1ReqLQlnLe8qxaRUhNWa6vui1HHRH11KJH5teEnDYLNnaxLyOP7GhflnrFFxjclBlwK7S1J42J1Dun4Qm6BlUMQiAPbu0vQdTTTx1Y/khkgXohdvOD6YJYWwqV3ue5gOh79v+nw3RBfpGTI+Fak+QIhQGuk/CtKRI2u6YjZKF8CIz/vHDL6JiSKWf+MYTla SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1442; 20:lfGBK7w3UV/H9fqdSo93lXnMlCjzWaRjH4nrCFLk8mwr9PuzkCnVBJBXttjsxcg+9hkdq/7U3WENDdVMGkoW/9grr2gBjyzW3v3D5Dch8iJ0y3vFTfpfDgQQBbG5AwjTeyCD2jRbnF5Fv168lTLXS+IzP48q9H0z6QrEB33Bob8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2016 01:58:31.9932 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1442 Cc: Linux-ALSA <alsa-devel@alsa-project.org>, Simon <horms@verge.net.au>, Liam Girdwood <lgirdwood@gmail.com> Subject: [alsa-devel] [PATCH 7/8] ASoC: simple-scu-card: code sync: move asoc_simple_card_of_match 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/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c index 2f40f9c..abe31dc 100644 --- a/sound/soc/generic/simple-scu-card.c +++ b/sound/soc/generic/simple-scu-card.c @@ -22,13 +22,6 @@ #include <sound/soc-dai.h> #include <sound/simple_card_utils.h> -static const struct of_device_id asoc_simple_card_of_match[] = { - { .compatible = "renesas,rsrc-card", }, - { .compatible = "simple-scu-audio-card", }, - {}, -}; -MODULE_DEVICE_TABLE(of, asoc_simple_card_of_match); - struct asoc_simple_card_priv { struct snd_soc_card snd_card; struct snd_soc_codec_conf codec_conf; @@ -329,10 +322,17 @@ static int asoc_simple_card_remove(struct platform_device *pdev) return asoc_simple_card_clean_reference(card); } +static const struct of_device_id asoc_simple_of_match[] = { + { .compatible = "renesas,rsrc-card", }, + { .compatible = "simple-scu-audio-card", }, + {}, +}; +MODULE_DEVICE_TABLE(of, asoc_simple_of_match); + static struct platform_driver asoc_simple_card = { .driver = { .name = "simple-scu-audio-card", - .of_match_table = asoc_simple_card_of_match, + .of_match_table = asoc_simple_of_match, }, .probe = asoc_simple_card_probe, .remove = asoc_simple_card_remove,