p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ASoC: rsnd: remove struct platform_device from probe/remove parameter 

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 <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2015-11-10 05:14:12 +00:00 committed by Mark Brown
parent 2ea2cc86db
commit 2ea6b0749c
12 changed files with 47 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/sh/rcar/adg.c
View File

@ -515,8 +515,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
ckr, rbga, rbgb); ckr, rbga, rbgb);
} }
int rsnd_adg_probe(struct platform_device *pdev, int rsnd_adg_probe(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct rsnd_adg *adg; struct rsnd_adg *adg;
struct device *dev = rsnd_priv_to_dev(priv); struct device *dev = rsnd_priv_to_dev(priv);
@ -543,8 +542,7 @@ int rsnd_adg_probe(struct platform_device *pdev,
return 0; return 0;
} }
void rsnd_adg_remove(struct platform_device *pdev, void rsnd_adg_remove(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct rsnd_adg *adg = rsnd_priv_to_adg(priv); struct rsnd_adg *adg = rsnd_priv_to_adg(priv);
struct clk *clk; struct clk *clk;

6
sound/soc/sh/rcar/cmd.c
View File

@ -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); return rsnd_mod_get((struct rsnd_cmd *)(priv->cmd) + id);
} }
int rsnd_cmd_probe(struct platform_device *pdev, int rsnd_cmd_probe(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct device *dev = rsnd_priv_to_dev(priv); struct device *dev = rsnd_priv_to_dev(priv);
struct rsnd_cmd *cmd; struct rsnd_cmd *cmd;
@ -160,8 +159,7 @@ int rsnd_cmd_probe(struct platform_device *pdev,
return 0; return 0;
} }
void rsnd_cmd_remove(struct platform_device *pdev, void rsnd_cmd_remove(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct rsnd_cmd *cmd; struct rsnd_cmd *cmd;
int i; int i;

15
sound/soc/sh/rcar/core.c
View File

@ -546,8 +546,7 @@ static const struct snd_soc_dai_ops rsnd_soc_dai_ops = {
.set_fmt = rsnd_soc_dai_set_fmt, .set_fmt = rsnd_soc_dai_set_fmt,
}; };
static int rsnd_dai_probe(struct platform_device *pdev, static int rsnd_dai_probe(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct device_node *dai_node; struct device_node *dai_node;
struct device_node *dai_np, *np, *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 rsnd_dai_stream *io_capture;
struct snd_soc_dai_driver *drv; struct snd_soc_dai_driver *drv;
struct rsnd_dai *rdai; 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 nr, dai_i, io_i, np_i;
int ret; int ret;
@ -975,8 +974,7 @@ static int rsnd_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct rsnd_dai *rdai; struct rsnd_dai *rdai;
const struct of_device_id *of_id = of_match_device(rsnd_of_match, dev); const struct of_device_id *of_id = of_match_device(rsnd_of_match, dev);
int (*probe_func[])(struct platform_device *pdev, int (*probe_func[])(struct rsnd_priv *priv) = {
struct rsnd_priv *priv) = {
rsnd_gen_probe, rsnd_gen_probe,
rsnd_dma_probe, rsnd_dma_probe,
rsnd_ssi_probe, rsnd_ssi_probe,
@ -1008,7 +1006,7 @@ static int rsnd_probe(struct platform_device *pdev)
* init each module * init each module
*/ */
for (i = 0; i < ARRAY_SIZE(probe_func); i++) { for (i = 0; i < ARRAY_SIZE(probe_func); i++) {
ret = probe_func[i](pdev, priv); ret = probe_func[i](priv);
if (ret) if (ret)
return 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_priv *priv = dev_get_drvdata(&pdev->dev);
struct rsnd_dai *rdai; struct rsnd_dai *rdai;
void (*remove_func[])(struct platform_device *pdev, void (*remove_func[])(struct rsnd_priv *priv) = {
struct rsnd_priv *priv) = {
rsnd_ssi_remove, rsnd_ssi_remove,
rsnd_ssiu_remove, rsnd_ssiu_remove,
rsnd_src_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++) 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_component(&pdev->dev);
snd_soc_unregister_platform(&pdev->dev); snd_soc_unregister_platform(&pdev->dev);

6
sound/soc/sh/rcar/ctu.c
View File

@ -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)); return rsnd_mod_get(rsnd_ctu_get(priv, id));
} }
int rsnd_ctu_probe(struct platform_device *pdev, int rsnd_ctu_probe(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct device_node *node; struct device_node *node;
struct device_node *np; struct device_node *np;
@ -143,8 +142,7 @@ int rsnd_ctu_probe(struct platform_device *pdev,
return ret; return ret;
} }
void rsnd_ctu_remove(struct platform_device *pdev, void rsnd_ctu_remove(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct rsnd_ctu *ctu; struct rsnd_ctu *ctu;
int i; int i;

4
sound/soc/sh/rcar/dma.c
View File

@ -701,9 +701,9 @@ struct rsnd_mod *rsnd_dma_attach(struct rsnd_dai_stream *io,
return rsnd_mod_get(dma); return rsnd_mod_get(dma);
} }
int rsnd_dma_probe(struct platform_device *pdev, int rsnd_dma_probe(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct platform_device *pdev = rsnd_priv_to_pdev(priv);
struct device *dev = rsnd_priv_to_dev(priv); struct device *dev = rsnd_priv_to_dev(priv);
struct rsnd_dma_ctrl *dmac; struct rsnd_dma_ctrl *dmac;
struct resource *res; struct resource *res;

6
sound/soc/sh/rcar/dvc.c
View File

@ -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)); return rsnd_mod_get(rsnd_dvc_get(priv, id));
} }
int rsnd_dvc_probe(struct platform_device *pdev, int rsnd_dvc_probe(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct device_node *node; struct device_node *node;
struct device_node *np; struct device_node *np;
@ -365,8 +364,7 @@ int rsnd_dvc_probe(struct platform_device *pdev,
return ret; return ret;
} }
void rsnd_dvc_remove(struct platform_device *pdev, void rsnd_dvc_remove(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct rsnd_dvc *dvc; struct rsnd_dvc *dvc;
int i; int i;

13
sound/soc/sh/rcar/gen.c
View File

@ -211,8 +211,7 @@ static int _rsnd_gen_regmap_init(struct rsnd_priv *priv,
/* /*
* Gen2 * Gen2
*/ */
static int rsnd_gen2_probe(struct platform_device *pdev, static int rsnd_gen2_probe(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct rsnd_regmap_field_conf conf_ssiu[] = { struct rsnd_regmap_field_conf conf_ssiu[] = {
RSND_GEN_S_REG(SSI_MODE0, 0x800), RSND_GEN_S_REG(SSI_MODE0, 0x800),
@ -317,8 +316,7 @@ static int rsnd_gen2_probe(struct platform_device *pdev,
* Gen1 * Gen1
*/ */
static int rsnd_gen1_probe(struct platform_device *pdev, static int rsnd_gen1_probe(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct rsnd_regmap_field_conf conf_adg[] = { struct rsnd_regmap_field_conf conf_adg[] = {
RSND_GEN_S_REG(BRRA, 0x00), RSND_GEN_S_REG(BRRA, 0x00),
@ -349,8 +347,7 @@ static int rsnd_gen1_probe(struct platform_device *pdev,
/* /*
* Gen * Gen
*/ */
int rsnd_gen_probe(struct platform_device *pdev, int rsnd_gen_probe(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct device *dev = rsnd_priv_to_dev(priv); struct device *dev = rsnd_priv_to_dev(priv);
struct rsnd_gen *gen; struct rsnd_gen *gen;
@ -366,9 +363,9 @@ int rsnd_gen_probe(struct platform_device *pdev,
ret = -ENODEV; ret = -ENODEV;
if (rsnd_is_gen1(priv)) if (rsnd_is_gen1(priv))
ret = rsnd_gen1_probe(pdev, priv); ret = rsnd_gen1_probe(priv);
else if (rsnd_is_gen2(priv)) else if (rsnd_is_gen2(priv))
ret = rsnd_gen2_probe(pdev, priv); ret = rsnd_gen2_probe(priv);
if (ret < 0) if (ret < 0)
dev_err(dev, "unknown generation R-Car sound device\n"); dev_err(dev, "unknown generation R-Car sound device\n");

6
sound/soc/sh/rcar/mix.c
View File

@ -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)); return rsnd_mod_get(rsnd_mix_get(priv, id));
} }
int rsnd_mix_probe(struct platform_device *pdev, int rsnd_mix_probe(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct device_node *node; struct device_node *node;
struct device_node *np; struct device_node *np;
@ -177,8 +176,7 @@ int rsnd_mix_probe(struct platform_device *pdev,
return ret; return ret;
} }
void rsnd_mix_remove(struct platform_device *pdev, void rsnd_mix_remove(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct rsnd_mix *mix; struct rsnd_mix *mix;
int i; int i;

56
sound/soc/sh/rcar/rsnd.h
View File

@ -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 *rsnd_dma_attach(struct rsnd_dai_stream *io,
struct rsnd_mod *mod, int id); struct rsnd_mod *mod, int id);
int rsnd_dma_probe(struct platform_device *pdev, int rsnd_dma_probe(struct rsnd_priv *priv);
struct rsnd_priv *priv);
struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node, struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node,
struct rsnd_mod *mod, char *name); struct rsnd_mod *mod, char *name);
@ -351,8 +350,7 @@ int rsnd_dai_connect(struct rsnd_mod *mod,
/* /*
* R-Car Gen1/Gen2 * R-Car Gen1/Gen2
*/ */
int rsnd_gen_probe(struct platform_device *pdev, int rsnd_gen_probe(struct rsnd_priv *priv);
struct rsnd_priv *priv);
void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv, void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv,
struct rsnd_mod *mod, struct rsnd_mod *mod,
enum rsnd_reg reg); 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_stop(struct rsnd_mod *mod);
int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *mod, unsigned int rate); int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *mod, unsigned int rate);
int rsnd_adg_probe(struct platform_device *pdev, int rsnd_adg_probe(struct rsnd_priv *priv);
struct rsnd_priv *priv); void rsnd_adg_remove(struct rsnd_priv *priv);
void rsnd_adg_remove(struct platform_device *pdev,
struct rsnd_priv *priv);
int rsnd_adg_set_convert_clk_gen2(struct rsnd_mod *mod, int rsnd_adg_set_convert_clk_gen2(struct rsnd_mod *mod,
struct rsnd_dai_stream *io, struct rsnd_dai_stream *io,
unsigned int src_rate, unsigned int src_rate,
@ -516,10 +512,8 @@ int rsnd_kctrl_new_e(struct rsnd_mod *mod,
/* /*
* R-Car SSI * R-Car SSI
*/ */
int rsnd_ssi_probe(struct platform_device *pdev, int rsnd_ssi_probe(struct rsnd_priv *priv);
struct rsnd_priv *priv); void rsnd_ssi_remove(struct rsnd_priv *priv);
void rsnd_ssi_remove(struct platform_device *pdev,
struct rsnd_priv *priv);
struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id); 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_is_dma_mode(struct rsnd_mod *mod);
int rsnd_ssi_use_busif(struct rsnd_dai_stream *io); 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, int rsnd_ssiu_attach(struct rsnd_dai_stream *io,
struct rsnd_mod *mod); struct rsnd_mod *mod);
int rsnd_ssiu_probe(struct platform_device *pdev, int rsnd_ssiu_probe(struct rsnd_priv *priv);
struct rsnd_priv *priv); void rsnd_ssiu_remove(struct rsnd_priv *priv);
void rsnd_ssiu_remove(struct platform_device *pdev,
struct rsnd_priv *priv);
/* /*
* R-Car SRC * R-Car SRC
*/ */
int rsnd_src_probe(struct platform_device *pdev, int rsnd_src_probe(struct rsnd_priv *priv);
struct rsnd_priv *priv); void rsnd_src_remove(struct rsnd_priv *priv);
void rsnd_src_remove(struct platform_device *pdev,
struct rsnd_priv *priv);
struct rsnd_mod *rsnd_src_mod_get(struct rsnd_priv *priv, int id); struct rsnd_mod *rsnd_src_mod_get(struct rsnd_priv *priv, int id);
unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv, unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv,
struct rsnd_dai_stream *io, struct rsnd_dai_stream *io,
@ -558,11 +548,8 @@ unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv,
/* /*
* R-Car CTU * R-Car CTU
*/ */
int rsnd_ctu_probe(struct platform_device *pdev, int rsnd_ctu_probe(struct rsnd_priv *priv);
struct rsnd_priv *priv); void rsnd_ctu_remove(struct rsnd_priv *priv);
void rsnd_ctu_remove(struct platform_device *pdev,
struct rsnd_priv *priv);
struct rsnd_mod *rsnd_ctu_mod_get(struct rsnd_priv *priv, int id); struct rsnd_mod *rsnd_ctu_mod_get(struct rsnd_priv *priv, int id);
#define rsnd_ctu_of_node(priv) \ #define rsnd_ctu_of_node(priv) \
of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, "rcar_sound,ctu") 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 * R-Car MIX
*/ */
int rsnd_mix_probe(struct platform_device *pdev, int rsnd_mix_probe(struct rsnd_priv *priv);
struct rsnd_priv *priv); void rsnd_mix_remove(struct rsnd_priv *priv);
void rsnd_mix_remove(struct platform_device *pdev,
struct rsnd_priv *priv);
struct rsnd_mod *rsnd_mix_mod_get(struct rsnd_priv *priv, int id); struct rsnd_mod *rsnd_mix_mod_get(struct rsnd_priv *priv, int id);
#define rsnd_mix_of_node(priv) \ #define rsnd_mix_of_node(priv) \
of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, "rcar_sound,mix") 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 * R-Car DVC
*/ */
int rsnd_dvc_probe(struct platform_device *pdev, int rsnd_dvc_probe(struct rsnd_priv *priv);
struct rsnd_priv *priv); void rsnd_dvc_remove(struct rsnd_priv *priv);
void rsnd_dvc_remove(struct platform_device *pdev,
struct rsnd_priv *priv);
struct rsnd_mod *rsnd_dvc_mod_get(struct rsnd_priv *priv, int id); struct rsnd_mod *rsnd_dvc_mod_get(struct rsnd_priv *priv, int id);
#define rsnd_dvc_of_node(priv) \ #define rsnd_dvc_of_node(priv) \
of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, "rcar_sound,dvc") 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 * R-Car CMD
*/ */
int rsnd_cmd_probe(struct platform_device *pdev, int rsnd_cmd_probe(struct rsnd_priv *priv);
struct rsnd_priv *priv); void rsnd_cmd_remove(struct rsnd_priv *priv);
void rsnd_cmd_remove(struct platform_device *pdev,
struct rsnd_priv *priv);
int rsnd_cmd_attach(struct rsnd_dai_stream *io, int id); int rsnd_cmd_attach(struct rsnd_dai_stream *io, int id);
struct rsnd_mod *rsnd_cmd_mod_get(struct rsnd_priv *priv, int id); struct rsnd_mod *rsnd_cmd_mod_get(struct rsnd_priv *priv, int id);

6
sound/soc/sh/rcar/src.c
View File

@ -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)); return rsnd_mod_get(rsnd_src_get(priv, id));
} }
int rsnd_src_probe(struct platform_device *pdev, int rsnd_src_probe(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct device_node *node; struct device_node *node;
struct device_node *np; struct device_node *np;
@ -622,8 +621,7 @@ int rsnd_src_probe(struct platform_device *pdev,
return ret; return ret;
} }
void rsnd_src_remove(struct platform_device *pdev, void rsnd_src_remove(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct rsnd_src *src; struct rsnd_src *src;
int i; int i;

6
sound/soc/sh/rcar/ssi.c
View File

@ -723,8 +723,7 @@ int __rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod)
return !!(rsnd_ssi_mode_flags(ssi) & RSND_SSI_CLK_PIN_SHARE); return !!(rsnd_ssi_mode_flags(ssi) & RSND_SSI_CLK_PIN_SHARE);
} }
int rsnd_ssi_probe(struct platform_device *pdev, int rsnd_ssi_probe(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct device_node *node; struct device_node *node;
struct device_node *np; struct device_node *np;
@ -801,8 +800,7 @@ int rsnd_ssi_probe(struct platform_device *pdev,
return ret; return ret;
} }
void rsnd_ssi_remove(struct platform_device *pdev, void rsnd_ssi_remove(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct rsnd_ssi *ssi; struct rsnd_ssi *ssi;
int i; int i;

6
sound/soc/sh/rcar/ssiu.c
View File

@ -136,8 +136,7 @@ int rsnd_ssiu_attach(struct rsnd_dai_stream *io,
return rsnd_dai_connect(mod, io, mod->type); return rsnd_dai_connect(mod, io, mod->type);
} }
int rsnd_ssiu_probe(struct platform_device *pdev, int rsnd_ssiu_probe(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct device *dev = rsnd_priv_to_dev(priv); struct device *dev = rsnd_priv_to_dev(priv);
struct rsnd_ssiu *ssiu; struct rsnd_ssiu *ssiu;
@ -168,8 +167,7 @@ int rsnd_ssiu_probe(struct platform_device *pdev,
return 0; return 0;
} }
void rsnd_ssiu_remove(struct platform_device *pdev, void rsnd_ssiu_remove(struct rsnd_priv *priv)
struct rsnd_priv *priv)
{ {
struct rsnd_ssiu *ssiu; struct rsnd_ssiu *ssiu;
int i; int i;