From patchwork Tue Nov 10 05:14:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 7588091 Return-Path: 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 03E089F2F7 for ; Tue, 10 Nov 2015 05:20:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 77115204A9 for ; Tue, 10 Nov 2015 05:20:10 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 6AB0620601 for ; Tue, 10 Nov 2015 05:20:08 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 9A5E82652E1; Tue, 10 Nov 2015 06:20:07 +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 490492606FE; Tue, 10 Nov 2015 06:16:42 +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 559642608BC; Tue, 10 Nov 2015 06:16:41 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 13928260606 for ; Tue, 10 Nov 2015 06:14:15 +0100 (CET) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 10 Nov 2015 14:14:14 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id B698D52449; Tue, 10 Nov 2015 14:14:14 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id B37998002E; Tue, 10 Nov 2015 14:14:14 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id AC8BC8002D; Tue, 10 Nov 2015 14:14:14 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id QAD08082; Tue, 10 Nov 2015 14:14:14 +0900 X-IronPort-AV: E=Sophos;i="5.20,268,1444662000"; d="scan'";a="199433961" Received: from mail-sg2apc01lp0242.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.242]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 10 Nov 2015 14:14:14 +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 SG2PR06MB1020.apcprd06.prod.outlook.com (10.161.9.28) with Microsoft SMTP Server (TLS) id 15.1.318.15; Tue, 10 Nov 2015 05:14:12 +0000 Message-ID: <87pozijva5.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: <878u66la47.wl%kuninori.morimoto.gx@renesas.com> References: <878u66la47.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 10 Nov 2015 05:14:12 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR06CA0023.apcprd06.prod.outlook.com (25.164.91.33) To SG2PR06MB1020.apcprd06.prod.outlook.com (25.161.9.28) X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1020; 2:md1nKHcXE7OxDbBr6RkHs0Uuvtn8nMGDcNV+qlEU5ZPtyuisXOX7XPrQQOli/h2YVq0LovZlxWZc0e3vH2pBq1twVTCs24jRScosaUrJMGTy/jUT0XVsWr/907bNS2FU11NXEu7UfIc4p2vKDGw11nfwqP6GpguQjDjAQf58NnU=; 3:kCP/+AP+Rzaiz8TSO0ZACDwhIgYrK1DG2BVjOfjpGNeLrcj0PSN/yGkP1Mh8ftFAT26f+NhtiY5N2hWxoczmmzkqEDZA7WGM7zrJW3NY9UPIOR5toeJfVGCfR1AHsqdoEHI5fUmlm6NZpL7Qm0jy4A==; 25:rEK2Sl10lWSd1Kw98LWyAlZa/3HMMBy19hr4+E6xj8LkBiknEV9RraEBtgW2EeMz/FT8EtYSlku0SEf+MBcpnuA3QwxeGS8TOHhqpKodjNp+c3rsawjT4aO9dxRT+2n2eigrN9u4ddT4scFBUn5kImLRiLkTOaYgt7xHFATDOS+OQypwu+BpVF11kZUzYNMZ/J7xvzI/MMqTgv1ZYb2MTQHoLoL94YYyOt1EKg28tB/nal9H2xoeUACoL3FkAsET X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB1020; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1020; 20:rLP+6NTv+bgNqBR5VZt4+j/qZiWRD6FTp1FENoEON6g0xAIOW9MxFsEIbqjUD7oGx1rl0DS12NtV7HIeJmeGFoyg+hA/wVwYC39MgAIPgAw/YyPcCM2y9O4F3sBh00rWMJNgxzgy8/EcU6yUEY+ql+/4QaV3yI/U5c4fsTfh3iHGQQ4D2g8l7BRrWnPKOQcVbbuZOPzFkn2g9KbrYxWh58CGTPmEa7gxYhQYV5qXtUn+ffzt95NER6lfdbGcmZ6HGiMXndYH5hvpdDx9KDQMjZCfl4VpEJPDSeGpUA9vYT8hkr6BhSVYYkNnDmoNQILlPOYXmtamZS7vsMTm0Nx+1eahE4fPgC1GlYf44klaE9/XoNqJg3yNj9hw72MNuH9WFevMolvQarT6UArDFVgB3qw5O3Ur784dwzQm4dk/QLKNQu+cf4t0n7NK+qL65W8ymSiCKkg+4dlJ+UfmbSj2VUePhSGX0NvtycySA54DvryElQaSkVAfcqG3GJUYZNeA; 4:cNKipiwil5t4FdzeVIW/cSmjQ5QVAqOmHoSHnT143DFtYLeld8WT0mSv2vFAcAeOdQ8Mw8MO7oxmE2VBvwh93LLiB4SygesuhK9fJbGE+OMfAX4vS5QkbpoD/AlpT7JTLohjC8KS/TomNuv3BHHukQ/1jR13WiMAl6Dy/D2PhJvqn0q2UuJyM6zP6CHNwNA62JkKZs3YDpHsF9TwiHgE0X82BgMDxRry8nNiF97zlG/16k0IsmcLO0WICbImrvI61DWwKk7tFTu+YySdKCfryMwsj6pQI4pXP8PoyS55FMqv7EF8mKpgqSXZbmAkaHvoGevgFITwF3ESYZee7XQrw+Vw4LGEb3O6Ugr4MV0jbjUM0oE6B0wRxW8jI6BOnsq2 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85106069007906); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(10201501046)(3002001); SRVR:SG2PR06MB1020; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB1020; X-Forefront-PRVS: 07562C22DA X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(47776003)(19580395003)(19580405001)(69596002)(66066001)(23726002)(86362001)(575784001)(46406003)(105586002)(33646002)(76176999)(54356999)(36756003)(50986999)(106356001)(53416004)(92566002)(5001960100002)(5001920100001)(97736004)(4001350100001)(81156007)(101416001)(5890100001)(110136002)(5008740100001)(50466002)(5004730100002)(5007970100001)(189998001)(87976001)(77096005)(122386002)(83506001)(2950100001)(229853001)(40100003)(42186005); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB1020; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB1020; 23:yfwiUIQsdJlYcIkMELx6ZKHnAP5VZc7E9w68y9Vvg?= =?us-ascii?Q?RjWQiqEcwIRiMVu4CS9Bn2rWO+9Y6IavM0xa1wqHE58jhgg9j+WDixxzHgNv?= =?us-ascii?Q?WoR8N3uBtpN9CcPM6CPYT+7cfKKJM0AmbSDzBZJb6DedE/US2tviQ1KW8+yX?= =?us-ascii?Q?ZM4LUe/NKO3KEMk7g3lOV3XgYMJ89BcM7Ieg6VNRYpWAzQlIptyvKcjJr2+a?= =?us-ascii?Q?LO0CXV8+cDon/LcWKJmlwEhWCicATPGmaLtDbyhvvI66tr1CUjR/ZFSxY0/L?= =?us-ascii?Q?Sg5H/f2SNDraRA8mZ37lpEfh+Cfbtz01CUsiT09cQZ1JODnIEtC+UjllErW3?= =?us-ascii?Q?3ZIB78N21P7MCqrR5Jx+tHw8qFozf2YyoiEhg3R94bEscBNiCkBDyro134wM?= =?us-ascii?Q?Ucx7/dQJaSxl0OpYhpITLSIjMFrdLdR2FUC1lmb/ch2zH5AsfO7qYEQDLjvd?= =?us-ascii?Q?PDsyfEiDaTiygaZV79f5XjQcN8SFO4Q0jQBDm0ocZ9eVFtxjdPruopgpXBA+?= =?us-ascii?Q?OVITJH1griVAkIoqJYL8Y2oqipnmcSHdk5+JikYOLNKTNOkZxYO6EMWPy0L1?= =?us-ascii?Q?v+pSgtZAiDWcBGNcVcOpoXzoqVgxbjQGeVy5rKUnWY756QhULgcuKKa2i9w2?= =?us-ascii?Q?bPT1kMx6DI5R8kXU8pkMPk9tSm28OW1uyhCxukzgOe71EP7lnWM8bhocnD+Z?= =?us-ascii?Q?NBdCodHcCpEcLjILp0UU5OveskpPoXR13dx4XWrVMyEn693AwYISNInFRAp/?= =?us-ascii?Q?F3LQ8inmzWN0TVx/hoISs8ufwLIRrl6Pa0hASaJkBzR07s8T+J6WM5A5iFdr?= =?us-ascii?Q?Ld+JzFZXxw10/1r1lIakESctp+Yv21Pu1y20akAcA9Apypl37DLXkgav/9go?= =?us-ascii?Q?Qt30PPNdIDQjIhCRZS1vs8Kqtcnrxs3j4/mNMhXsdWsZ3/uGKJyLXUSVqP4b?= =?us-ascii?Q?cI6EzD4i65EQWH1WpGukTEEdskg63XNWM1wM/qSUxpk4y9gmUAhFWoiqGTCU?= =?us-ascii?Q?3WyMwuRT63ostDyjjW7ia5PNKIru15r2f2bA1aDheeZByj1SWSTdUZPTYdf8?= =?us-ascii?Q?iO+aZNAZuJPqRaJTYPN9MLDIrZa4G9v2AStN4du1+YcfFzmgtYi+n3Z8UbSH?= =?us-ascii?Q?ODDE6B3BfgznK03GEI6Xork4uLbe7Qv?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1020; 5:0/sKniDjhqnFGuc9OzKxNOGvRdk9h1LPMe/YvALx22WhTuxkbb8vjm76OUxhKGocYaLr6NDx4lWGdb7FUeGUoaE4Q3zcpTZJ3yaGcVC1ny32tQ/IYxn7F2nG5VyhyMMoBcohEodQcOeZ5Temg4Afsg==; 24:4n1czgP9rdAzANHpYSR7bNUVXwo/UxUq3vQVLytML1K7BljnVAfyuT1j0jyrmkJWJWH4bgmvXlOcUFFCQGqtRpvHCBlJIGuEZ+2FsEK/llI=; 20:HSIYMqb1K7qHnOpQvzke2Cc9PVPmLrTSnDxytIB4cpLeEJIp8H760/B5VlqWwENitJvi2xxmY7mkxCLw5gcbn5TMvzPTQasOjzsq566TISQDF9Le4zx++kcNvfSv5o+iVWa6RZxNpxP2fXeOrTwIzMsEQMH55odNfOVzKWZjIVU= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2015 05:14:12.0167 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB1020 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 13/13] ASoC: rsnd: remove struct platform_device from probe/remove parameter 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 Current Renesas sound driver requests struct platform_device on probe/remove for each modules. But driver can get it by rsnd_priv_to_pdev(). This patch removes unnecessary parameter Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/adg.c | 6 ++---- sound/soc/sh/rcar/cmd.c | 6 ++---- sound/soc/sh/rcar/core.c | 15 ++++++------- sound/soc/sh/rcar/ctu.c | 6 ++---- sound/soc/sh/rcar/dma.c | 4 ++-- sound/soc/sh/rcar/dvc.c | 6 ++---- sound/soc/sh/rcar/gen.c | 13 +++++------ sound/soc/sh/rcar/mix.c | 6 ++---- sound/soc/sh/rcar/rsnd.h | 56 ++++++++++++++++-------------------------------- sound/soc/sh/rcar/src.c | 6 ++---- sound/soc/sh/rcar/ssi.c | 6 ++---- sound/soc/sh/rcar/ssiu.c | 6 ++---- 12 files changed, 47 insertions(+), 89 deletions(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index ba80961..448f082 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -515,8 +515,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, ckr, rbga, rbgb); } -int rsnd_adg_probe(struct platform_device *pdev, - struct rsnd_priv *priv) +int rsnd_adg_probe(struct rsnd_priv *priv) { struct rsnd_adg *adg; struct device *dev = rsnd_priv_to_dev(priv); @@ -543,8 +542,7 @@ int rsnd_adg_probe(struct platform_device *pdev, return 0; } -void rsnd_adg_remove(struct platform_device *pdev, - struct rsnd_priv *priv) +void rsnd_adg_remove(struct rsnd_priv *priv) { struct rsnd_adg *adg = rsnd_priv_to_adg(priv); struct clk *clk; diff --git a/sound/soc/sh/rcar/cmd.c b/sound/soc/sh/rcar/cmd.c index 2294c5c..ab904c3 100644 --- a/sound/soc/sh/rcar/cmd.c +++ b/sound/soc/sh/rcar/cmd.c @@ -127,8 +127,7 @@ struct rsnd_mod *rsnd_cmd_mod_get(struct rsnd_priv *priv, int id) return rsnd_mod_get((struct rsnd_cmd *)(priv->cmd) + id); } -int rsnd_cmd_probe(struct platform_device *pdev, - struct rsnd_priv *priv) +int rsnd_cmd_probe(struct rsnd_priv *priv) { struct device *dev = rsnd_priv_to_dev(priv); struct rsnd_cmd *cmd; @@ -160,8 +159,7 @@ int rsnd_cmd_probe(struct platform_device *pdev, return 0; } -void rsnd_cmd_remove(struct platform_device *pdev, - struct rsnd_priv *priv) +void rsnd_cmd_remove(struct rsnd_priv *priv) { struct rsnd_cmd *cmd; int i; diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 8af1668..8dceae4 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -546,8 +546,7 @@ static const struct snd_soc_dai_ops rsnd_soc_dai_ops = { .set_fmt = rsnd_soc_dai_set_fmt, }; -static int rsnd_dai_probe(struct platform_device *pdev, - struct rsnd_priv *priv) +static int rsnd_dai_probe(struct rsnd_priv *priv) { struct device_node *dai_node; struct device_node *dai_np, *np, *node; @@ -556,7 +555,7 @@ static int rsnd_dai_probe(struct platform_device *pdev, struct rsnd_dai_stream *io_capture; struct snd_soc_dai_driver *drv; struct rsnd_dai *rdai; - struct device *dev = &pdev->dev; + struct device *dev = rsnd_priv_to_dev(priv); int nr, dai_i, io_i, np_i; int ret; @@ -975,8 +974,7 @@ static int rsnd_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct rsnd_dai *rdai; const struct of_device_id *of_id = of_match_device(rsnd_of_match, dev); - int (*probe_func[])(struct platform_device *pdev, - struct rsnd_priv *priv) = { + int (*probe_func[])(struct rsnd_priv *priv) = { rsnd_gen_probe, rsnd_dma_probe, rsnd_ssi_probe, @@ -1008,7 +1006,7 @@ static int rsnd_probe(struct platform_device *pdev) * init each module */ for (i = 0; i < ARRAY_SIZE(probe_func); i++) { - ret = probe_func[i](pdev, priv); + ret = probe_func[i](priv); if (ret) return ret; } @@ -1061,8 +1059,7 @@ static int rsnd_remove(struct platform_device *pdev) { struct rsnd_priv *priv = dev_get_drvdata(&pdev->dev); struct rsnd_dai *rdai; - void (*remove_func[])(struct platform_device *pdev, - struct rsnd_priv *priv) = { + void (*remove_func[])(struct rsnd_priv *priv) = { rsnd_ssi_remove, rsnd_ssiu_remove, rsnd_src_remove, @@ -1082,7 +1079,7 @@ static int rsnd_remove(struct platform_device *pdev) } for (i = 0; i < ARRAY_SIZE(remove_func); i++) - remove_func[i](pdev, priv); + remove_func[i](priv); snd_soc_unregister_component(&pdev->dev); snd_soc_unregister_platform(&pdev->dev); diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c index 3e36a53..7c1e190 100644 --- a/sound/soc/sh/rcar/ctu.c +++ b/sound/soc/sh/rcar/ctu.c @@ -77,8 +77,7 @@ struct rsnd_mod *rsnd_ctu_mod_get(struct rsnd_priv *priv, int id) return rsnd_mod_get(rsnd_ctu_get(priv, id)); } -int rsnd_ctu_probe(struct platform_device *pdev, - struct rsnd_priv *priv) +int rsnd_ctu_probe(struct rsnd_priv *priv) { struct device_node *node; struct device_node *np; @@ -143,8 +142,7 @@ rsnd_ctu_probe_done: return ret; } -void rsnd_ctu_remove(struct platform_device *pdev, - struct rsnd_priv *priv) +void rsnd_ctu_remove(struct rsnd_priv *priv) { struct rsnd_ctu *ctu; int i; diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index e5f4353..33eb373 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -701,9 +701,9 @@ struct rsnd_mod *rsnd_dma_attach(struct rsnd_dai_stream *io, return rsnd_mod_get(dma); } -int rsnd_dma_probe(struct platform_device *pdev, - struct rsnd_priv *priv) +int rsnd_dma_probe(struct rsnd_priv *priv) { + struct platform_device *pdev = rsnd_priv_to_pdev(priv); struct device *dev = rsnd_priv_to_dev(priv); struct rsnd_dma_ctrl *dmac; struct resource *res; diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c index d2c03bd..0f61e13 100644 --- a/sound/soc/sh/rcar/dvc.c +++ b/sound/soc/sh/rcar/dvc.c @@ -304,8 +304,7 @@ struct rsnd_mod *rsnd_dvc_mod_get(struct rsnd_priv *priv, int id) return rsnd_mod_get(rsnd_dvc_get(priv, id)); } -int rsnd_dvc_probe(struct platform_device *pdev, - struct rsnd_priv *priv) +int rsnd_dvc_probe(struct rsnd_priv *priv) { struct device_node *node; struct device_node *np; @@ -365,8 +364,7 @@ rsnd_dvc_probe_done: return ret; } -void rsnd_dvc_remove(struct platform_device *pdev, - struct rsnd_priv *priv) +void rsnd_dvc_remove(struct rsnd_priv *priv) { struct rsnd_dvc *dvc; int i; diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index ced8acb..84f8bb2 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c @@ -211,8 +211,7 @@ static int _rsnd_gen_regmap_init(struct rsnd_priv *priv, /* * Gen2 */ -static int rsnd_gen2_probe(struct platform_device *pdev, - struct rsnd_priv *priv) +static int rsnd_gen2_probe(struct rsnd_priv *priv) { struct rsnd_regmap_field_conf conf_ssiu[] = { RSND_GEN_S_REG(SSI_MODE0, 0x800), @@ -317,8 +316,7 @@ static int rsnd_gen2_probe(struct platform_device *pdev, * Gen1 */ -static int rsnd_gen1_probe(struct platform_device *pdev, - struct rsnd_priv *priv) +static int rsnd_gen1_probe(struct rsnd_priv *priv) { struct rsnd_regmap_field_conf conf_adg[] = { RSND_GEN_S_REG(BRRA, 0x00), @@ -349,8 +347,7 @@ static int rsnd_gen1_probe(struct platform_device *pdev, /* * Gen */ -int rsnd_gen_probe(struct platform_device *pdev, - struct rsnd_priv *priv) +int rsnd_gen_probe(struct rsnd_priv *priv) { struct device *dev = rsnd_priv_to_dev(priv); struct rsnd_gen *gen; @@ -366,9 +363,9 @@ int rsnd_gen_probe(struct platform_device *pdev, ret = -ENODEV; if (rsnd_is_gen1(priv)) - ret = rsnd_gen1_probe(pdev, priv); + ret = rsnd_gen1_probe(priv); else if (rsnd_is_gen2(priv)) - ret = rsnd_gen2_probe(pdev, priv); + ret = rsnd_gen2_probe(priv); if (ret < 0) dev_err(dev, "unknown generation R-Car sound device\n"); diff --git a/sound/soc/sh/rcar/mix.c b/sound/soc/sh/rcar/mix.c index 897e4f3..57ac453 100644 --- a/sound/soc/sh/rcar/mix.c +++ b/sound/soc/sh/rcar/mix.c @@ -116,8 +116,7 @@ struct rsnd_mod *rsnd_mix_mod_get(struct rsnd_priv *priv, int id) return rsnd_mod_get(rsnd_mix_get(priv, id)); } -int rsnd_mix_probe(struct platform_device *pdev, - struct rsnd_priv *priv) +int rsnd_mix_probe(struct rsnd_priv *priv) { struct device_node *node; struct device_node *np; @@ -177,8 +176,7 @@ rsnd_mix_probe_done: return ret; } -void rsnd_mix_remove(struct platform_device *pdev, - struct rsnd_priv *priv) +void rsnd_mix_remove(struct rsnd_priv *priv) { struct rsnd_mix *mix; int i; diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index e6efac29..ae69670 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -157,8 +157,7 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io); */ struct rsnd_mod *rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, int id); -int rsnd_dma_probe(struct platform_device *pdev, - struct rsnd_priv *priv); +int rsnd_dma_probe(struct rsnd_priv *priv); struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node, struct rsnd_mod *mod, char *name); @@ -351,8 +350,7 @@ int rsnd_dai_connect(struct rsnd_mod *mod, /* * R-Car Gen1/Gen2 */ -int rsnd_gen_probe(struct platform_device *pdev, - struct rsnd_priv *priv); +int rsnd_gen_probe(struct rsnd_priv *priv); void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv, struct rsnd_mod *mod, enum rsnd_reg reg); @@ -363,10 +361,8 @@ phys_addr_t rsnd_gen_get_phy_addr(struct rsnd_priv *priv, int reg_id); */ int rsnd_adg_ssi_clk_stop(struct rsnd_mod *mod); int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *mod, unsigned int rate); -int rsnd_adg_probe(struct platform_device *pdev, - struct rsnd_priv *priv); -void rsnd_adg_remove(struct platform_device *pdev, - struct rsnd_priv *priv); +int rsnd_adg_probe(struct rsnd_priv *priv); +void rsnd_adg_remove(struct rsnd_priv *priv); int rsnd_adg_set_convert_clk_gen2(struct rsnd_mod *mod, struct rsnd_dai_stream *io, unsigned int src_rate, @@ -516,10 +512,8 @@ int rsnd_kctrl_new_e(struct rsnd_mod *mod, /* * R-Car SSI */ -int rsnd_ssi_probe(struct platform_device *pdev, - struct rsnd_priv *priv); -void rsnd_ssi_remove(struct platform_device *pdev, - struct rsnd_priv *priv); +int rsnd_ssi_probe(struct rsnd_priv *priv); +void rsnd_ssi_remove(struct rsnd_priv *priv); struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id); int rsnd_ssi_is_dma_mode(struct rsnd_mod *mod); int rsnd_ssi_use_busif(struct rsnd_dai_stream *io); @@ -536,18 +530,14 @@ int __rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod); */ int rsnd_ssiu_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod); -int rsnd_ssiu_probe(struct platform_device *pdev, - struct rsnd_priv *priv); -void rsnd_ssiu_remove(struct platform_device *pdev, - struct rsnd_priv *priv); +int rsnd_ssiu_probe(struct rsnd_priv *priv); +void rsnd_ssiu_remove(struct rsnd_priv *priv); /* * R-Car SRC */ -int rsnd_src_probe(struct platform_device *pdev, - struct rsnd_priv *priv); -void rsnd_src_remove(struct platform_device *pdev, - struct rsnd_priv *priv); +int rsnd_src_probe(struct rsnd_priv *priv); +void rsnd_src_remove(struct rsnd_priv *priv); struct rsnd_mod *rsnd_src_mod_get(struct rsnd_priv *priv, int id); unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv, struct rsnd_dai_stream *io, @@ -558,11 +548,8 @@ unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv, /* * R-Car CTU */ -int rsnd_ctu_probe(struct platform_device *pdev, - struct rsnd_priv *priv); - -void rsnd_ctu_remove(struct platform_device *pdev, - struct rsnd_priv *priv); +int rsnd_ctu_probe(struct rsnd_priv *priv); +void rsnd_ctu_remove(struct rsnd_priv *priv); struct rsnd_mod *rsnd_ctu_mod_get(struct rsnd_priv *priv, int id); #define rsnd_ctu_of_node(priv) \ of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, "rcar_sound,ctu") @@ -570,11 +557,8 @@ struct rsnd_mod *rsnd_ctu_mod_get(struct rsnd_priv *priv, int id); /* * R-Car MIX */ -int rsnd_mix_probe(struct platform_device *pdev, - struct rsnd_priv *priv); - -void rsnd_mix_remove(struct platform_device *pdev, - struct rsnd_priv *priv); +int rsnd_mix_probe(struct rsnd_priv *priv); +void rsnd_mix_remove(struct rsnd_priv *priv); struct rsnd_mod *rsnd_mix_mod_get(struct rsnd_priv *priv, int id); #define rsnd_mix_of_node(priv) \ of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, "rcar_sound,mix") @@ -582,10 +566,8 @@ struct rsnd_mod *rsnd_mix_mod_get(struct rsnd_priv *priv, int id); /* * R-Car DVC */ -int rsnd_dvc_probe(struct platform_device *pdev, - struct rsnd_priv *priv); -void rsnd_dvc_remove(struct platform_device *pdev, - struct rsnd_priv *priv); +int rsnd_dvc_probe(struct rsnd_priv *priv); +void rsnd_dvc_remove(struct rsnd_priv *priv); struct rsnd_mod *rsnd_dvc_mod_get(struct rsnd_priv *priv, int id); #define rsnd_dvc_of_node(priv) \ of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, "rcar_sound,dvc") @@ -593,10 +575,8 @@ struct rsnd_mod *rsnd_dvc_mod_get(struct rsnd_priv *priv, int id); /* * R-Car CMD */ -int rsnd_cmd_probe(struct platform_device *pdev, - struct rsnd_priv *priv); -void rsnd_cmd_remove(struct platform_device *pdev, - struct rsnd_priv *priv); +int rsnd_cmd_probe(struct rsnd_priv *priv); +void rsnd_cmd_remove(struct rsnd_priv *priv); int rsnd_cmd_attach(struct rsnd_dai_stream *io, int id); struct rsnd_mod *rsnd_cmd_mod_get(struct rsnd_priv *priv, int id); diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c index c0f7e2a..c103aa7 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c @@ -553,8 +553,7 @@ struct rsnd_mod *rsnd_src_mod_get(struct rsnd_priv *priv, int id) return rsnd_mod_get(rsnd_src_get(priv, id)); } -int rsnd_src_probe(struct platform_device *pdev, - struct rsnd_priv *priv) +int rsnd_src_probe(struct rsnd_priv *priv) { struct device_node *node; struct device_node *np; @@ -622,8 +621,7 @@ rsnd_src_probe_done: return ret; } -void rsnd_src_remove(struct platform_device *pdev, - struct rsnd_priv *priv) +void rsnd_src_remove(struct rsnd_priv *priv) { struct rsnd_src *src; int i; diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index b736ee9..dd693c0 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -722,8 +722,7 @@ int __rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod) return !!(rsnd_ssi_mode_flags(ssi) & RSND_SSI_CLK_PIN_SHARE); } -int rsnd_ssi_probe(struct platform_device *pdev, - struct rsnd_priv *priv) +int rsnd_ssi_probe(struct rsnd_priv *priv) { struct device_node *node; struct device_node *np; @@ -800,8 +799,7 @@ rsnd_ssi_probe_done: return ret; } -void rsnd_ssi_remove(struct platform_device *pdev, - struct rsnd_priv *priv) +void rsnd_ssi_remove(struct rsnd_priv *priv) { struct rsnd_ssi *ssi; int i; diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c index 89b1bc7..bc24504 100644 --- a/sound/soc/sh/rcar/ssiu.c +++ b/sound/soc/sh/rcar/ssiu.c @@ -136,8 +136,7 @@ int rsnd_ssiu_attach(struct rsnd_dai_stream *io, return rsnd_dai_connect(mod, io, mod->type); } -int rsnd_ssiu_probe(struct platform_device *pdev, - struct rsnd_priv *priv) +int rsnd_ssiu_probe(struct rsnd_priv *priv) { struct device *dev = rsnd_priv_to_dev(priv); struct rsnd_ssiu *ssiu; @@ -168,8 +167,7 @@ int rsnd_ssiu_probe(struct platform_device *pdev, return 0; } -void rsnd_ssiu_remove(struct platform_device *pdev, - struct rsnd_priv *priv) +void rsnd_ssiu_remove(struct rsnd_priv *priv) { struct rsnd_ssiu *ssiu; int i;