From patchwork Tue Mar 24 05:05:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 6077191 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 7B365BF90F for ; Tue, 24 Mar 2015 05:06:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 623522025B for ; Tue, 24 Mar 2015 05:06:48 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 0F6F0201FA for ; Tue, 24 Mar 2015 05:06:47 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 2B513265057; Tue, 24 Mar 2015 06:06:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id C47DA2625D7; Tue, 24 Mar 2015 06:05:59 +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 6CAA6264F0F; Tue, 24 Mar 2015 06:05:58 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id C3B25261A06 for ; Tue, 24 Mar 2015 06:05:27 +0100 (CET) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 24 Mar 2015 14:05:25 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id D5BB34D84A; Tue, 24 Mar 2015 14:05:25 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id D58262806D; Tue, 24 Mar 2015 14:05:25 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 980EA2808A; Tue, 24 Mar 2015 14:05:25 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id QAB27683; Tue, 24 Mar 2015 14:05:25 +0900 X-IronPort-AV: E=Sophos;i="5.11,456,1422889200"; d="scan'208";a="182614063" Received: from mail-sg1lp0089.outbound.protection.outlook.com (HELO APAC01-SG1-obe.outbound.protection.outlook.com) ([207.46.51.89]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 24 Mar 2015 14:05:24 +0900 Received: from morimoto-PC.renesas.com (211.11.155.132) by HKXPR06MB312.apcprd06.prod.outlook.com (10.141.135.155) with Microsoft SMTP Server (TLS) id 15.1.118.21; Tue, 24 Mar 2015 05:05:21 +0000 Message-ID: <87384v3s0h.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown In-Reply-To: <878uen3s5m.wl%kuninori.morimoto.gx@renesas.com> References: <878uen3s5m.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 24 Mar 2015 05:05:21 +0000 X-Originating-IP: [211.11.155.132] X-ClientProxiedBy: KAWPR01CA0020.jpnprd01.prod.outlook.com (25.161.24.30) To HKXPR06MB312.apcprd06.prod.outlook.com (10.141.135.155) Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB312; X-Microsoft-Antispam-PRVS: X-Forefront-Antispam-Report: BMV:1; SFV:NSPM; SFS:(10019020)(6009001)(36756003)(50466002)(66066001)(47776003)(23726002)(87976001)(83506001)(19580395003)(19580405001)(77156002)(122386002)(46406003)(54356999)(40100003)(50986999)(76176999)(62966003)(2950100001)(33646002)(53416004)(229853001)(92566002)(110136001)(42186005)(86362001)(575784001)(77096005)(46102003); DIR:OUT; SFP:1102; SCL:1; SRVR:HKXPR06MB312; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(5002010); SRVR:HKXPR06MB312; BCL:0; PCL:0; RULEID:; SRVR:HKXPR06MB312; X-Forefront-PRVS: 0525BB0ADF X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2015 05:05:21.6754 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HKXPR06MB312 Cc: Linux-DT , Linux-ALSA , Simon , Liam Girdwood , Das Biju Subject: [alsa-devel] [PATCH 4/5] ASoC: rsnd: remove useless debug message 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 This patch removes useless debug message. especially some kind of "probed" message will be printed from core.c if it has #define DEBUG Signed-off-by: Kuninori Morimoto --- - cleanup patch sound/soc/sh/rcar/adg.c | 2 -- sound/soc/sh/rcar/dma.c | 4 ---- sound/soc/sh/rcar/dvc.c | 20 +------------------- sound/soc/sh/rcar/gen.c | 4 ---- sound/soc/sh/rcar/src.c | 39 ++++----------------------------------- sound/soc/sh/rcar/ssi.c | 28 ++++------------------------ 6 files changed, 9 insertions(+), 88 deletions(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 7af374b..fefc881 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -434,7 +434,5 @@ int rsnd_adg_probe(struct platform_device *pdev, priv->adg = adg; - dev_dbg(dev, "adg probed\n"); - return 0; } diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index cd7b79a..ac3756f 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -144,8 +144,6 @@ static int rsnd_dmaen_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id, return -EIO; } - dev_dbg(dev, "Audio DMAC init\n"); - if (dev->of_node) { dmaen->chan = rsnd_dmaen_request_channel(mod_from, mod_to); } else { @@ -329,8 +327,6 @@ static int rsnd_dmapp_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id, struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv); struct device *dev = rsnd_priv_to_dev(priv); - dev_dbg(dev, "Audio DMAC peri peri init\n"); - dmapp->dmapp_id = dmac->dmapp_num; dmapp->chcr = rsnd_dmapp_get_chcr(mod_from, mod_to) | PDMACHCR_DE; diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c index 8f7558c..8351a617 100644 --- a/sound/soc/sh/rcar/dvc.c +++ b/sound/soc/sh/rcar/dvc.c @@ -119,22 +119,6 @@ static void rsnd_dvc_volume_update(struct rsnd_mod *mod) rsnd_mod_write(mod, DVC_DVUER, 1); } -static int rsnd_dvc_probe_gen2(struct rsnd_mod *mod, - struct rsnd_priv *priv) -{ - struct device *dev = rsnd_priv_to_dev(priv); - int ret; - - ret = rsnd_mod_probe(mod, priv); - if (ret) - return ret; - - dev_dbg(dev, "%s[%d] (Gen2) is probed\n", - rsnd_mod_name(mod), rsnd_mod_id(mod)); - - return ret; -} - static int rsnd_dvc_remove_gen2(struct rsnd_mod *mod, struct rsnd_priv *priv) { @@ -278,7 +262,7 @@ static struct dma_chan *rsnd_dvc_dma_req(struct rsnd_mod *mod) static struct rsnd_mod_ops rsnd_dvc_ops = { .name = DVC_NAME, .dma_req = rsnd_dvc_dma_req, - .probe = rsnd_dvc_probe_gen2, + .probe = rsnd_mod_probe, .remove = rsnd_dvc_remove_gen2, .init = rsnd_dvc_init, .start = rsnd_dvc_start, @@ -374,8 +358,6 @@ int rsnd_dvc_probe(struct platform_device *pdev, rsnd_mod_init(&dvc->mod, &rsnd_dvc_ops, clk, RSND_MOD_DVC, i); - - dev_dbg(dev, "CMD%d probed\n", i); } return 0; diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index a17a504..20b0ccd 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c @@ -278,8 +278,6 @@ static int rsnd_gen2_probe(struct platform_device *pdev, ret_ssi < 0) return ret_ssiu | ret_scu | ret_adg | ret_ssi; - dev_dbg(dev, "Gen2 is probed\n"); - return 0; } @@ -348,8 +346,6 @@ static int rsnd_gen1_probe(struct platform_device *pdev, ret_ssi < 0) return ret_sru | ret_adg | ret_ssi; - dev_dbg(dev, "Gen1 is probed\n"); - return 0; } diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c index 327771a..8d752b5 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c @@ -456,22 +456,6 @@ static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod) return 0; } -static int rsnd_src_probe_gen1(struct rsnd_mod *mod, - struct rsnd_priv *priv) -{ - struct device *dev = rsnd_priv_to_dev(priv); - int ret; - - ret = rsnd_mod_probe(mod, priv); - if (ret) - return ret; - - dev_dbg(dev, "%s[%d] (Gen1) is probed\n", - rsnd_mod_name(mod), rsnd_mod_id(mod)); - - return ret; -} - static int rsnd_src_init_gen1(struct rsnd_mod *mod, struct rsnd_priv *priv) { @@ -519,7 +503,7 @@ static int rsnd_src_stop_gen1(struct rsnd_mod *mod, static struct rsnd_mod_ops rsnd_src_gen1_ops = { .name = SRC_NAME, .dma_req = rsnd_src_dma_req, - .probe = rsnd_src_probe_gen1, + .probe = rsnd_mod_probe, .remove = rsnd_mod_remove, .init = rsnd_src_init_gen1, .quit = rsnd_src_quit, @@ -727,29 +711,16 @@ static int rsnd_src_probe_gen2(struct rsnd_mod *mod, IRQF_SHARED, dev_name(dev), mod); if (ret) - goto rsnd_src_probe_gen2_fail; + return ret; } ret = rsnd_dma_init(priv, rsnd_mod_to_dma(mod), src->info->dma_id); if (ret) - goto rsnd_src_probe_gen2_fail; - - ret = rsnd_mod_probe(mod, priv); - if (ret) - goto rsnd_src_probe_gen2_fail; - - dev_dbg(dev, "%s[%d] (Gen2) is probed\n", - rsnd_mod_name(mod), rsnd_mod_id(mod)); - - return ret; - -rsnd_src_probe_gen2_fail: - dev_err(dev, "%s[%d] (Gen2) failed\n", - rsnd_mod_name(mod), rsnd_mod_id(mod)); + return ret; - return ret; + return rsnd_mod_probe(mod, priv); } static int rsnd_src_remove_gen2(struct rsnd_mod *mod, @@ -914,8 +885,6 @@ int rsnd_src_probe(struct platform_device *pdev, src->info = &info->src_info[i]; rsnd_mod_init(&src->mod, ops, clk, RSND_MOD_SRC, i); - - dev_dbg(dev, "SRC%d probed\n", i); } return 0; diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index dd49559..c9b60a8 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -447,14 +447,7 @@ static int rsnd_ssi_pio_probe(struct rsnd_mod *mod, return ret; } - ret = rsnd_mod_probe(mod, priv); - if (ret) - return ret; - - dev_dbg(dev, "%s[%d] (PIO) is probed\n", - rsnd_mod_name(mod), rsnd_mod_id(mod)); - - return ret; + return rsnd_mod_probe(mod, priv); } static struct rsnd_mod_ops rsnd_ssi_pio_ops = { @@ -480,28 +473,15 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod, IRQF_SHARED, dev_name(dev), ssi); if (ret) - goto rsnd_ssi_dma_probe_fail; + return ret; ret = rsnd_dma_init( priv, rsnd_mod_to_dma(mod), dma_id); if (ret) - goto rsnd_ssi_dma_probe_fail; - - ret = rsnd_mod_probe(mod, priv); - if (ret) - goto rsnd_ssi_dma_probe_fail; - - dev_dbg(dev, "%s[%d] (DMA) is probed\n", - rsnd_mod_name(mod), rsnd_mod_id(mod)); - - return ret; - -rsnd_ssi_dma_probe_fail: - dev_err(dev, "%s[%d] (DMA) is failed\n", - rsnd_mod_name(mod), rsnd_mod_id(mod)); + return ret; - return ret; + return rsnd_mod_probe(mod, priv); } static int rsnd_ssi_dma_remove(struct rsnd_mod *mod,