From patchwork Fri Jan 27 06:37:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9540671 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 96DF1604A0 for ; Fri, 27 Jan 2017 08:15:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 83522280F4 for ; Fri, 27 Jan 2017 08:15:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7835F28306; Fri, 27 Jan 2017 08:15:16 +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 7D2972824F for ; Fri, 27 Jan 2017 08:15:14 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id A0FAD26796D; Fri, 27 Jan 2017 09:15:12 +0100 (CET) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 14B18267958; Fri, 27 Jan 2017 09:12:54 +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 4A0F5267931; Fri, 27 Jan 2017 07:37:43 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id A1A1F26790B for ; Fri, 27 Jan 2017 07:37:39 +0100 (CET) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie3.idc.renesas.com with ESMTP; 27 Jan 2017 15:37:37 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id DC0E36DACC; Fri, 27 Jan 2017 15:37:37 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id C54EC480A5; Fri, 27 Jan 2017 15:37:37 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id BDE3748014; Fri, 27 Jan 2017 15:37:37 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id RBA15124; Fri, 27 Jan 2017 15:37:37 +0900 X-IronPort-AV: E=Sophos;i="5.33,293,1477926000"; d="scan'208";a="231997368" Received: from mail-pu1apc01lp0018.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.18]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 27 Jan 2017 15:37:36 +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=3hoEoTPdV8KMBpcFVm5ABE6PszbTo3WgyM5NVxtjwng=; b=VdUwoIvhqG3PdCwrWc4PgIEC7z3R5rumdGb1l9aVNnfwnmWC3pKJs9KQ77J4i9GoxLzVZs4zYlYKmlBRYDKjFP8q4J9Nt9hz6qFsTdjl/rJ0ihgUuZ5pptBwolZDrQ03IrqWQ/Y5yQZlmGKPwlb3QuLZJEexXmRfGmaoz5r0Q20= 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 PS1PR0601MB1931.apcprd06.prod.outlook.com (10.170.181.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.874.12; Fri, 27 Jan 2017 06:37:34 +0000 Message-ID: <87a8adqacm.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown , Rob Herring In-Reply-To: <87efzpqaf5.wl%kuninori.morimoto.gx@renesas.com> References: <87efzpqaf5.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 27 Jan 2017 06:37:34 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0033.jpnprd01.prod.outlook.com (10.164.162.15) To PS1PR0601MB1931.apcprd06.prod.outlook.com (10.170.181.17) X-MS-Office365-Filtering-Correlation-Id: 814a3efa-ecf0-4924-cf3d-08d4467efad9 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401076); SRVR:PS1PR0601MB1931; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1931; 3:inGyRecx67UcQ9x12ee54F+0v9yIo3dUMhgvJuhmX00PsVzqAxwSZkNrlQzlIuFsCRDLNy3K1B0tR40dZ3TAZ5QHU9sOpysY9phRtIG5uG0ZJseXwtTZYttUd5CoM+MAo2GAxg+yw74EVXcu7wTKjaHDlLxS8HNFhtLfcXSIFLZgDDpxe8k6HJ5nYLa/z7nG51N3Lj9yJJFp8pE2cxJOelclmYynjPr8Ujqm9hLWmI8PFJqsHgJ3k79yf/RkfHUpmnNlIyFdyniRL46KxxuOS1PkmzG240pqffbgj25v8Dg=; 25:YqeBBuNObEuYZR52wWRR5kPcMA18eax9fAdi63YnCeruz5NBDXW2zQPkbzCV4wP8t/vLX9S2cdvK9L0CdXDrkAJXZHstNoTxc30TF76Ih209qYFbwXhP5x7cPIbpZctx0rVowPKxCMnn23wgMoFE7MEscFVQL+0msGAMXd91f6LBO5wauMlG0jjhZ6wz1aLlOJ14jswmg4Y9DoG+w6aJUCsyutr1Y60C+zgOZs7Olg9W97aSVlbfvrZA5ZY0BaCJEPTQUkSRb+VDXTNyrsuUQOKXdEnI1mU2+S6aju4ePcWkP+FELjDlh2dDn1Dla+R8A4e7wgRqsdG7wjznM7a8UMekWeNn9cbrnY1PC9mU/ATTvMNOQ9oCjnDRYo5Iv8DcviUET0N9RqQYKrM8hFBjY/g1ohnLy7rcEb/g8cnhEODHmDOWM8Yba0MFFAFkgT901lJ/H2I6oHwmpHdSWbxyGQ== X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1931; 31:ljXfCklw7EuulqmcBDlKfvn5jNf0kKO7ZUkAHpxg4Z4198KnC79cn9Dz70Z0RJt2CjNObBO75vUCtQBTV0Q0SqYqTXloLGfJ/EMp1faCV+mhilO6mFDd1kgBdVqvPGKJem9IS09S9Lsc1g6MPKSJUQYgysVZLx/YobAf/YnwPhdVx7s5HX+zldlDBQKxe5B083/B1mPO3Bje/Wvs/zVLxY8monF9P/aduwDm7alCSPD22Ef9WhhvBoCjfkkOuVYzdRGWw18NpDD3kvddK+9yDw==; 20:BAx5adznqOt7zYTRfQEu7ZiNXRoxXRpK20s//J4FXu3BVet57Bd3hwRPW5i8TmnT6filhCzkBSdH63beZzxYpO9jDrQcoFbf39rRJMd4El1bQUiavrkpqGS2yisI/p9fXcrCNsbjUJVs0KuuQXRpk2nkMk/jnrBnsv1VYBoe8r8Ab7nLhDqYUBwqgVkbpHuYl25Hp7zxikHX0HoixglrSrXZC4gDEPlGFh6E2sNDt65oxxhU22w0b3ZhImojjgwr4+RQLNX8nU5BjFGtMddG2WuOEJLW/hoWWIJ2nJ1F0aK90MxkNDJAoyYj8vYX1CCQ/iISeff1EQYdOze54DIthKvWmiBbUTsWbc91G4hY4nJsJoVvUBBqK/1zE0qhTDdVt/unWYHPkghJDGITiTExjrJKRiTnxNswcdQ44YnmMNKBXTxmQK04vQGF1vbQZz9noS1sXzQy88LhsqEXG5yhGLmteq1KuG6I8xRhcXNuMKl/uDdPfqbFRHTs8C02xw26 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6041248)(20161123564025)(20161123560025)(20161123562025)(20161123555025)(6072148); SRVR:PS1PR0601MB1931; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1931; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1931; 4:oR/s3D8RnO1YCehh6HvJvJWkFLTImnIXqNwEKBmTYTpg9gLdgt0Nx4KfMAiz5axqguRS+Dfd4oIuvChRKA3WabxmJISD9yWvlRiD9lQcOiK/ORgzKazqzHM7e1YzrPWJRA7ci9xHPv0NLwPQzoXIzuYuOc+rUhBUKzK9+APrV7Cq4yA1kH8niyIm7lGXrIwuD10bsnpXlGjHtBTKEBxSyhdQvdXCRn0rs10V7CUOm1F4SPbQWS49lWFD6H5tBIOEhBvw+knk7R0Ddt9PzHaIexPBZd/2hnRy2kLy1Uo6ArdonWw2xvtx9NRGp0qWxql5z2W432p5Fd33LHpoK7vo13KQe3ivUj9C51J44FhkwSySZeLOkOU6VjBs/wWCkF4J4KJxuBrRhVEG0J6gRAvrgI+j8pWKoTHpGD+rNI4ClynJl70BVAPwCdaItWRU9lXXNYrgJm7QQ7LgS4+Aq2Ja0x0eBeqWOXpTU4Auc8i52LYGYIMOBG+DyyQ6jUMrWaWBdguzRmLS8pGp+FHuMSMUrV7JqsrnnowkKG9wOjXXbPS3w5u8u+Q1m/DyW+GKyWr1dDLDUe5gOo3BOjIoEUcSfw== X-Forefront-PRVS: 0200DDA8BE X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(39860400002)(39850400002)(39410400002)(39450400003)(39840400002)(189002)(199003)(36756003)(23726003)(8676002)(305945005)(83506001)(2906002)(47776003)(46406003)(189998001)(6116002)(81166006)(7736002)(81156014)(3846002)(4326007)(68736007)(86362001)(5660300001)(53936002)(2950100002)(66066001)(105586002)(42186005)(53416004)(54906002)(101416001)(76176999)(6486002)(5001770100001)(69596002)(33646002)(54356999)(97736004)(50466002)(92566002)(25786008)(50986999)(106356001)(38730400001)(4001350100001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1931; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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; PS1PR0601MB1931; 23:aGFypIIw2LZUPinWLKVt2M0OHcotb4DpLwd43IF?= =?us-ascii?Q?g6FsY5oxsjqSTowRtyChOt/hKWT0OdGiaOkAMPYUo21FEz4t6VOTE4TiBOzT?= =?us-ascii?Q?1svQTlXS9zumsJH6HFa3zp6Gl7dUOQvI0Ecc9jHmlQ/fEkrOlZcuoXFz8o/i?= =?us-ascii?Q?10N1GSByMizGlT3dzDniENmLdLF0MxJ9WKfqnF9+7iE/jpFEcFKknQl0ryKp?= =?us-ascii?Q?a8fpYhqOhzdZgu/55czhjoqfweOuqiCXhgbIVneXGj/AJu0NOXVlTUBdLc7S?= =?us-ascii?Q?56HIQfUWgdUnMyj7PjRDlcV5h3AV/8mqgt863H0Zbrmt8rRkjNDt97yISy0H?= =?us-ascii?Q?1b+ulAwIcUVeF7ch1rbQVm6vMTu9rfH0KN9ZpSxNoungqYqCGQAmbQ+bp34V?= =?us-ascii?Q?Ga93Cv7eJudqtYd7DPL6PeYT2GQ16IBQdsD//FehCPQ0J92heH8LKYivMKDi?= =?us-ascii?Q?lY9bT/Lp5+Yv0ZMHUlK86S1MHlaET9Z0FatPYyThLovZ5oaNwmtLyhD/D3QC?= =?us-ascii?Q?mRXSzzIehKvV50UrgPJ7fYLtgByi+Q2RUDnvkdrYLTcK1CVl2j+xQNtyl/T+?= =?us-ascii?Q?H0W2tsYQbx9nFmuFQj6p2caSuPcUlXBzwrPWxxmBwqsnxZp1TN9LvtpXogLy?= =?us-ascii?Q?RF5UmPepxY7GJHl67k5Ti+TYO0975mt8F5eclyLyLH0tAYQ1qeHif41+wqLE?= =?us-ascii?Q?VimT68YJHbb4Y2gwBGpGLM28vBqZnsIjOXmGmkLiX0/txaTaLp0Bs7MaFV+w?= =?us-ascii?Q?tECGajorxfeoLXv8wXrUzJMMsl3ocf1WRVRHf3ikwoerN5/S4XSgJ988b6H0?= =?us-ascii?Q?0sqQroFYBpn/ojE0ch8GCRJbQSOF0WFul6P6Hzl0INTv2kT5rkXggb0IJ//O?= =?us-ascii?Q?L569M89xtbjeC1oX2qGc/r9fhVZqpbnFWYvIhN7lwzcJPEcvTRSiG6LyeVHA?= =?us-ascii?Q?o5kPjGAs1NOZGgh5l6WnnGwIqABSPNbRyU9wYlKEnc1VSaRLhYIB8P+oF7Yc?= =?us-ascii?Q?YzKQYGslw/HHFYA+gvsBoycczfRC6GxX5tq7pNqsUfxW2pLCeeFwRi3GZT5a?= =?us-ascii?Q?nO1Id16XRoH6BWgw+1C5qT5/zvS2PmGAQaMCoiG9Ai0RNkEhllKrKWpUKS1H?= =?us-ascii?Q?soCt65ktqoYDWQzq42JpUfqBvtJZXleIrFkbFuQ/lYSB6Wu/HIJULhY1i2lZ?= =?us-ascii?Q?SSDypO8JQfrZscbBh8fxcsgFIgtBduRfEE1LEvf40dHPhUgUaX4c8Ff9qdkn?= =?us-ascii?Q?BlSt+AdW6TDQpBiUhX1tY234QnqvIrVmcDeVOYMQ7?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1931; 6:ZJfo+soZIKoQYAjiFR5NRwW8zjCCLvWAnBuMYBOi3J++ogO0a1AxAm1gTcTDRQzJmom7r85x7RBQNlO+JezOoQhed1WWJXPPe08eSzmZrTTmcvhQ4x3L7bITr5QZGRSy03OxeGjLSe8jnEMMB2AAR5GMpd1FGJA40fM/n9inobthO0xUWvLS7QO6efEM6YXgg4sjSQuNUg9DsU7rjy1uOFLS0BRFg8ywBQTHNt27sdydU85p8ODtLq6JgPUCN4L2d8AIHKvH+hlpwzlILNpUcw7h2fybcfrIiLfEBUfrWOPv/fbO2z6T92edDGoW4ZhHYLI08YnuPbpwzWF4qGvp+c53Y36PgAyAbjX10KIkUktje469gvl8FWe/Mygv1agRS1ClWkfay6PcafvDnc50q5IxEt/cDrnwDfKcCaW84RHckIIHWspvY3+rhePJQyUkL7poCaFXqhvfHhLDW1bACg==; 5:RUwmR+lC2dpTE7dgGsgJT7JZ51nkaF5/U3jh61/ncACf5OIukArLegoZ+cBJOXuryf0mi1KXkF8cr6r2cu/hLK4qYbsD4JZIyfTm75QhiH+6Tu/omTel4bXCArg8XCDHafoSI5JMUQxEHBULVCYXyQ==; 24:Tro+Ki0K/467xvJT6vOYrGE9z1rO2vNwBhg7mlzbxEN9vC+IZoLJZXtp/crTXUu6lE08Qj693DQ46VHnoP86lr+H9kdp1g3L7c3rB0ele3g= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1931; 7:Psp97NRxEKnBnLu+MDhvfkKT4yuEiQqu3Q54bVOyr2+B9rMmGcnuTtB/XlzDZgk9HKTbUXSTgZHYMJgyPCqJ5Z6v3xGiqvxluRRmo4qPjF7vxhaZd2zmfnh/B8Hkw4l3nulKE3h4kyBC+3ygv3gPd3HgDK+hxZpDE39b7QApbF8mWiksUx4S+MLYun6Ud+t6+aJEtzSVYs1/N1zoeNROcHg2IuZEd6upxIK2s+6+apWM7C/QYDh2FBLuul8bdha4XMkUZJOHLHpm1+aO/RmgTJ8RANliBrGvxI+B919t0tYFaE2eJBbG3rKlFWpNSaRHq9fJzg9Y7vkMyPQAksgHdJH8gxtKQjmuCTQynuEFStap42tOH9Bpa9QVq66W4CLl3cp/1yePqeC1shHdvI842HuDiC8p2y82jrQf6bOlK9UUMzzwW/tSs+VE34ygKmodLdVZ6frTx50nZbEIR1WMDQ==; 20:INp2iEqblpDI9N6aaoyn/023atcLrua9Iu4muRcosrAmvLsyhyt+Jw/QWycoCBXND1vbbWKKwAeuOXiAkyH+eTg6GzjHXl6TzrblqmfEzPx/A/7PvxW9jJzTwv6lnsHiEHEZ80GIi0+bQUGu8cQGqDFelO8kRfNwQKfOjgZ/hH4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2017 06:37:34.9480 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1931 Cc: Linux-DT , Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 03/10] ASoC: soc-core: remove OF adjusting for snd_soc_of_parse_audio_simple_widgets 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 Because prototype of OF-graph sound card support didn't have Sound Card node, commit 1ef5bcd57be5c8b31286b7b47828064be25f266b ("ASoC: soc-core: adjust for graph on snd_soc_of_parse_audio_simple_widgets") adjusted to it on each functions. But final discussion result of ALSA SoC / OF-graph ML, OF-graph sound card has node. Thus, this commit became no longer needed. This reverts commit 1ef5bcd57be5c8b31286b7b47828064be25f266b. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 8 ++------ sound/soc/soc-core.c | 9 +++------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index b544206..eb9fc7a 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1652,12 +1652,8 @@ static inline struct snd_soc_platform *snd_soc_kcontrol_platform( int snd_soc_of_parse_card_name_from_node(struct snd_soc_card *card, struct device_node *np, const char *propname); -#define snd_soc_of_parse_audio_simple_widgets(card, propname)\ - snd_soc_of_parse_audio_simple_widgets_from_node(card, NULL, propname) -int snd_soc_of_parse_audio_simple_widgets_from_node(struct snd_soc_card *card, - struct device_node *np, - const char *propname); - +int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card, + const char *propname); int snd_soc_of_parse_tdm_slot(struct device_node *np, unsigned int *tx_mask, unsigned int *rx_mask, diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index acc52c6..921bc9b 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3530,17 +3530,14 @@ int snd_soc_of_parse_card_name_from_node(struct snd_soc_card *card, SND_SOC_DAPM_SPK("Speaker", NULL), }; -int snd_soc_of_parse_audio_simple_widgets_from_node(struct snd_soc_card *card, - struct device_node *np, +int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card, const char *propname) { + struct device_node *np = card->dev->of_node; struct snd_soc_dapm_widget *widgets; const char *template, *wname; int i, j, num_widgets, ret; - if (!np) - np = card->dev->of_node; - num_widgets = of_property_count_strings(np, propname); if (num_widgets < 0) { dev_err(card->dev, @@ -3611,7 +3608,7 @@ int snd_soc_of_parse_audio_simple_widgets_from_node(struct snd_soc_card *card, return 0; } -EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_simple_widgets_from_node); +EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_simple_widgets); static int snd_soc_of_get_slot_mask(struct device_node *np, const char *prop_name,