From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/img/pistachio-internal-dac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/img/pistachio-internal-dac.c b/sound/soc/img/pistachio-internal-dac.c index 53e11c6..ae26274 100644 --- a/sound/soc/img/pistachio-internal-dac.c +++ b/sound/soc/img/pistachio-internal-dac.c @@ -122,8 +122,9 @@ static struct snd_soc_dai_driver pistachio_internal_dac_dais[] = { }, };

-static int pistachio_internal_dac_codec_probe(struct snd_soc_codec *codec) +static int pistachio_internal_dac_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct pistachio_internal_dac *dac = snd_soc_codec_get_drvdata(codec);

snd_soc_codec_init_regmap(codec, dac->regmap); @@ -132,9 +133,9 @@ static int pistachio_internal_dac_codec_probe(struct snd_soc_codec *codec) }

static const struct snd_soc_codec_driver pistachio_internal_dac_driver = { - .probe = pistachio_internal_dac_codec_probe, .idle_bias_off = true, .component_driver = { + .probe = pistachio_internal_dac_codec_probe, .controls = pistachio_internal_dac_snd_controls, .num_controls = ARRAY_SIZE(pistachio_internal_dac_snd_controls), .dapm_widgets = pistachio_internal_dac_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8978.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index 910b36f..3c057b2 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c @@ -971,8 +971,9 @@ static const int update_reg[] = { WM8978_ROUT2_SPK_CONTROL, };

-static int wm8978_probe(struct snd_soc_codec *codec) +static int wm8978_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8978_priv *wm8978 = snd_soc_codec_get_drvdata(codec); int i;

@@ -994,12 +995,12 @@ static int wm8978_probe(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver soc_codec_dev_wm8978 = { - .probe = wm8978_probe, .suspend = wm8978_suspend, .resume = wm8978_resume, .set_bias_level = wm8978_set_bias_level,

.component_driver = { + .probe = wm8978_probe, .controls = wm8978_snd_controls, .num_controls = ARRAY_SIZE(wm8978_snd_controls), .dapm_widgets = wm8978_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8962.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index f3109da..71b37f3 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3402,8 +3402,9 @@ static void wm8962_free_gpio(struct snd_soc_codec *codec) } #endif

-static int wm8962_probe(struct snd_soc_codec *codec) +static int wm8962_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); int ret; struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); @@ -3463,8 +3464,9 @@ static int wm8962_probe(struct snd_soc_codec *codec) return 0; }

-static int wm8962_remove(struct snd_soc_codec *codec) +static void wm8962_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); int i;

@@ -3475,16 +3477,16 @@ static int wm8962_remove(struct snd_soc_codec *codec) for (i = 0; i < ARRAY_SIZE(wm8962->supplies); i++) regulator_unregister_notifier(wm8962->supplies[i].consumer, &wm8962->disable_nb[i]); - - return 0; }

static struct snd_soc_codec_driver soc_codec_dev_wm8962 = { - .probe = wm8962_probe, - .remove = wm8962_remove, .set_bias_level = wm8962_set_bias_level, .set_pll = wm8962_set_fll, .idle_bias_off = true, + .component_driver = { + .probe = wm8962_probe, + .remove = wm8962_remove, + }, };

/* Improve power consumption for IN4 DC measurement mode */

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8960.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index d7f444f..185cff0 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -1247,8 +1247,9 @@ static struct snd_soc_dai_driver wm8960_dai = { .symmetric_rates = 1, };

-static int wm8960_probe(struct snd_soc_codec *codec) +static int wm8960_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); struct wm8960_data *pdata = &wm8960->pdata;

@@ -1265,9 +1266,11 @@ static int wm8960_probe(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver soc_codec_dev_wm8960 = { - .probe = wm8960_probe, .set_bias_level = wm8960_set_bias_level, .suspend_bias_off = true, + .component_driver = { + .probe = wm8960_probe, + }, };

static const struct regmap_config wm8960_regmap = {

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8770.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c index 8783a5f..c522c95 100644 --- a/sound/soc/codecs/wm8770.c +++ b/sound/soc/codecs/wm8770.c @@ -567,8 +567,9 @@ static struct snd_soc_dai_driver wm8770_dai = { .symmetric_rates = 1 };

-static int wm8770_probe(struct snd_soc_codec *codec) +static int wm8770_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8770_priv *wm8770; int ret;

@@ -609,11 +610,11 @@ err_reg_enable: }

static struct snd_soc_codec_driver soc_codec_dev_wm8770 = { - .probe = wm8770_probe, .set_bias_level = wm8770_set_bias_level, .idle_bias_off = true,

.component_driver = { + .probe = wm8770_probe, .controls = wm8770_snd_controls, .num_controls = ARRAY_SIZE(wm8770_snd_controls), .dapm_widgets = wm8770_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8750.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index a96a145..88fc2b5 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c @@ -685,8 +685,9 @@ static struct snd_soc_dai_driver wm8750_dai = { .ops = &wm8750_dai_ops, };

-static int wm8750_probe(struct snd_soc_codec *codec) +static int wm8750_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); int ret;

ret = wm8750_reset(codec); @@ -709,11 +710,11 @@ static int wm8750_probe(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver soc_codec_dev_wm8750 = { - .probe = wm8750_probe, .set_bias_level = wm8750_set_bias_level, .suspend_bias_off = true,

.component_driver = { + .probe = wm8750_probe, .controls = wm8750_snd_controls, .num_controls = ARRAY_SIZE(wm8750_snd_controls), .dapm_widgets = wm8750_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8737.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/wm8737.c b/sound/soc/codecs/wm8737.c index 728c42c..9670959 100644 --- a/sound/soc/codecs/wm8737.c +++ b/sound/soc/codecs/wm8737.c @@ -537,8 +537,9 @@ static struct snd_soc_dai_driver wm8737_dai = { .ops = &wm8737_dai_ops, };

-static int wm8737_probe(struct snd_soc_codec *codec) +static int wm8737_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8737_priv *wm8737 = snd_soc_codec_get_drvdata(codec); int ret;

@@ -574,11 +575,11 @@ err_get: }

static struct snd_soc_codec_driver soc_codec_dev_wm8737 = { - .probe = wm8737_probe, .set_bias_level = wm8737_set_bias_level, .suspend_bias_off = true,

.component_driver = { + .probe = wm8737_probe, .controls = wm8737_snd_controls, .num_controls = ARRAY_SIZE(wm8737_snd_controls), .dapm_widgets = wm8737_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8580.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index 2e69270..2a812a9 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c @@ -862,8 +862,9 @@ static struct snd_soc_dai_driver wm8580_dai[] = { }, };

-static int wm8580_probe(struct snd_soc_codec *codec) +static int wm8580_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec); int ret = 0;

@@ -890,21 +891,20 @@ err_regulator_get: }

/* power down chip */ -static int wm8580_remove(struct snd_soc_codec *codec) +static void wm8580_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec);

regulator_bulk_disable(ARRAY_SIZE(wm8580->supplies), wm8580->supplies); - - return 0; }

static struct snd_soc_codec_driver soc_codec_dev_wm8580 = { - .probe = wm8580_probe, - .remove = wm8580_remove, .set_bias_level = wm8580_set_bias_level,

.component_driver = { + .probe = wm8580_probe, + .remove = wm8580_remove, .controls = wm8580_snd_controls, .num_controls = ARRAY_SIZE(wm8580_snd_controls), .dapm_widgets = wm8580_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8510.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c index 7f93adf..c7a07c0 100644 --- a/sound/soc/codecs/wm8510.c +++ b/sound/soc/codecs/wm8510.c @@ -574,19 +574,21 @@ static struct snd_soc_dai_driver wm8510_dai = { .symmetric_rates = 1, };

-static int wm8510_probe(struct snd_soc_codec *codec) +static int wm8510_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); + wm8510_reset(codec);

return 0; }

static struct snd_soc_codec_driver soc_codec_dev_wm8510 = { - .probe = wm8510_probe, .set_bias_level = wm8510_set_bias_level, .suspend_bias_off = true,

.component_driver = { + .probe = wm8510_probe, .controls = wm8510_snd_controls, .num_controls = ARRAY_SIZE(wm8510_snd_controls), .dapm_widgets = wm8510_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/tlv320aic31xx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index e46fb47..ea2f986 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -1058,9 +1058,10 @@ static int aic31xx_set_bias_level(struct snd_soc_codec *codec, return 0; }

-static int aic31xx_codec_probe(struct snd_soc_codec *codec) +static int aic31xx_codec_probe(struct snd_soc_component *component) { int ret = 0; + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct aic31xx_priv *aic31xx = snd_soc_codec_get_drvdata(codec); int i;

@@ -1096,25 +1097,24 @@ static int aic31xx_codec_probe(struct snd_soc_codec *codec) return ret; }

-static int aic31xx_codec_remove(struct snd_soc_codec *codec) +static void aic31xx_codec_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct aic31xx_priv *aic31xx = snd_soc_codec_get_drvdata(codec); int i;

for (i = 0; i < ARRAY_SIZE(aic31xx->supplies); i++) regulator_unregister_notifier(aic31xx->supplies[i].consumer, &aic31xx->disable_nb[i].nb); - - return 0; }

static struct snd_soc_codec_driver soc_codec_driver_aic31xx = { - .probe = aic31xx_codec_probe, - .remove = aic31xx_codec_remove, .set_bias_level = aic31xx_set_bias_level, .suspend_bias_off = true,

.component_driver = { + .probe = aic31xx_codec_probe, + .remove = aic31xx_codec_remove, .controls = aic31xx_snd_controls, .num_controls = ARRAY_SIZE(aic31xx_snd_controls), .dapm_widgets = aic31xx_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/tas5720.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/tas5720.c b/sound/soc/codecs/tas5720.c index c65b917..d531ffd 100644 --- a/sound/soc/codecs/tas5720.c +++ b/sound/soc/codecs/tas5720.c @@ -261,8 +261,9 @@ out: msecs_to_jiffies(TAS5720_FAULT_CHECK_INTERVAL)); }

-static int tas5720_codec_probe(struct snd_soc_codec *codec) +static int tas5720_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct tas5720_data *tas5720 = snd_soc_codec_get_drvdata(codec); unsigned int device_id; int ret; @@ -320,8 +321,9 @@ probe_fail: return ret; }

-static int tas5720_codec_remove(struct snd_soc_codec *codec) +static void tas5720_codec_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct tas5720_data *tas5720 = snd_soc_codec_get_drvdata(codec); int ret;

@@ -331,8 +333,6 @@ static int tas5720_codec_remove(struct snd_soc_codec *codec) tas5720->supplies); if (ret < 0) dev_err(codec->dev, "failed to disable supplies: %d\n", ret); - - return ret; };

static int tas5720_dac_event(struct snd_soc_dapm_widget *w, @@ -484,12 +484,12 @@ static const struct snd_soc_dapm_route tas5720_audio_map[] = { };

static struct snd_soc_codec_driver soc_codec_dev_tas5720 = { - .probe = tas5720_codec_probe, - .remove = tas5720_codec_remove, .suspend = tas5720_suspend, .resume = tas5720_resume,

.component_driver = { + .probe = tas5720_codec_probe, + .remove = tas5720_codec_remove, .controls = tas5720_snd_controls, .num_controls = ARRAY_SIZE(tas5720_snd_controls), .dapm_widgets = tas5720_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/sti-sas.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/sti-sas.c b/sound/soc/codecs/sti-sas.c index 7b31ee9..81b8ade 100644 --- a/sound/soc/codecs/sti-sas.c +++ b/sound/soc/codecs/sti-sas.c @@ -516,8 +516,9 @@ static int sti_sas_resume(struct snd_soc_codec *codec) #define sti_sas_resume NULL #endif

-static int sti_sas_codec_probe(struct snd_soc_codec *codec) +static int sti_sas_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct sti_sas_data *drvdata = dev_get_drvdata(codec->dev); int ret;

@@ -527,8 +528,10 @@ static int sti_sas_codec_probe(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver sti_sas_driver = { - .probe = sti_sas_codec_probe, .resume = sti_sas_resume, + .component_driver = { + .probe = sti_sas_codec_probe, + }, };

static const struct of_device_id sti_sas_dev_match[] = {

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/ssm2602.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 993bde2..2b898e4 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -559,8 +559,9 @@ static int ssm2604_codec_probe(struct snd_soc_codec *codec) ARRAY_SIZE(ssm2604_routes)); }

-static int ssm260x_codec_probe(struct snd_soc_codec *codec) +static int ssm260x_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec); int ret;

@@ -592,12 +593,12 @@ static int ssm260x_codec_probe(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver soc_codec_dev_ssm2602 = { - .probe = ssm260x_codec_probe, .resume = ssm2602_resume, .set_bias_level = ssm2602_set_bias_level, .suspend_bias_off = true,

.component_driver = { + .probe = ssm260x_codec_probe, .controls = ssm260x_snd_controls, .num_controls = ARRAY_SIZE(ssm260x_snd_controls), .dapm_widgets = ssm260x_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/rt5631.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c index 0e41808..f3a3c4e 100644 --- a/sound/soc/codecs/rt5631.c +++ b/sound/soc/codecs/rt5631.c @@ -1572,8 +1572,9 @@ static int rt5631_set_bias_level(struct snd_soc_codec *codec, return 0; }

-static int rt5631_probe(struct snd_soc_codec *codec) +static int rt5631_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct rt5631_priv *rt5631 = snd_soc_codec_get_drvdata(codec); unsigned int val;

@@ -1654,10 +1655,10 @@ static struct snd_soc_dai_driver rt5631_dai[] = { };

static struct snd_soc_codec_driver soc_codec_dev_rt5631 = { - .probe = rt5631_probe, .set_bias_level = rt5631_set_bias_level, .suspend_bias_off = true, .component_driver = { + .probe = rt5631_probe, .controls = rt5631_snd_controls, .num_controls = ARRAY_SIZE(rt5631_snd_controls), .dapm_widgets = rt5631_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/inno_rk3036.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/sound/soc/codecs/inno_rk3036.c b/sound/soc/codecs/inno_rk3036.c index b918ba5..6890581 100644 --- a/sound/soc/codecs/inno_rk3036.c +++ b/sound/soc/codecs/inno_rk3036.c @@ -338,16 +338,20 @@ static void rk3036_codec_reset(struct snd_soc_codec *codec) INNO_R00_CSR_WORK | INNO_R00_CDCR_WORK); }

-static int rk3036_codec_probe(struct snd_soc_codec *codec) +static int rk3036_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); + rk3036_codec_reset(codec); + return 0; }

-static int rk3036_codec_remove(struct snd_soc_codec *codec) +static void rk3036_codec_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); + rk3036_codec_reset(codec); - return 0; }

static int rk3036_codec_set_bias_level(struct snd_soc_codec *codec, @@ -377,10 +381,10 @@ static int rk3036_codec_set_bias_level(struct snd_soc_codec *codec, }

static struct snd_soc_codec_driver rk3036_codec_driver = { - .probe = rk3036_codec_probe, - .remove = rk3036_codec_remove, .set_bias_level = rk3036_codec_set_bias_level, .component_driver = { + .probe = rk3036_codec_probe, + .remove = rk3036_codec_remove, .controls = rk3036_codec_dapm_controls, .num_controls = ARRAY_SIZE(rk3036_codec_dapm_controls), .dapm_routes = rk3036_codec_dapm_routes,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/cs53l30.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c index e244e08..c87f92a 100644 --- a/sound/soc/codecs/cs53l30.c +++ b/sound/soc/codecs/cs53l30.c @@ -877,8 +877,9 @@ static struct snd_soc_dai_driver cs53l30_dai = { .symmetric_rates = 1, };

-static int cs53l30_codec_probe(struct snd_soc_codec *codec) +static int cs53l30_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct cs53l30_private *priv = snd_soc_codec_get_drvdata(codec); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

@@ -893,11 +894,11 @@ static int cs53l30_codec_probe(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver cs53l30_driver = { - .probe = cs53l30_codec_probe, .set_bias_level = cs53l30_set_bias_level, .idle_bias_off = true,

.component_driver = { + .probe = cs53l30_codec_probe, .controls = cs53l30_snd_controls, .num_controls = ARRAY_SIZE(cs53l30_snd_controls), .dapm_widgets = cs53l30_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/cs42l73.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c index 01b573a..53788f4 100644 --- a/sound/soc/codecs/cs42l73.c +++ b/sound/soc/codecs/cs42l73.c @@ -1235,8 +1235,9 @@ static struct snd_soc_dai_driver cs42l73_dai[] = { } };

-static int cs42l73_probe(struct snd_soc_codec *codec) +static int cs42l73_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct cs42l73_private *cs42l73 = snd_soc_codec_get_drvdata(codec);

/* Set Charge Pump Frequency */ @@ -1253,11 +1254,11 @@ static int cs42l73_probe(struct snd_soc_codec *codec) }

static const struct snd_soc_codec_driver soc_codec_dev_cs42l73 = { - .probe = cs42l73_probe, .set_bias_level = cs42l73_set_bias_level, .suspend_bias_off = true,

.component_driver = { + .probe = cs42l73_probe, .controls = cs42l73_snd_controls, .num_controls = ARRAY_SIZE(cs42l73_snd_controls), .dapm_widgets = cs42l73_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/cs42l52.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c index 0d9c4a5..067948b 100644 --- a/sound/soc/codecs/cs42l52.c +++ b/sound/soc/codecs/cs42l52.c @@ -1027,8 +1027,9 @@ static void cs42l52_free_beep(struct snd_soc_codec *codec) CS42L52_BEEP_EN_MASK, 0); }

-static int cs42l52_probe(struct snd_soc_codec *codec) +static int cs42l52_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct cs42l52_private *cs42l52 = snd_soc_codec_get_drvdata(codec);

regcache_cache_only(cs42l52->regmap, true); @@ -1043,20 +1044,20 @@ static int cs42l52_probe(struct snd_soc_codec *codec) return 0; }

-static int cs42l52_remove(struct snd_soc_codec *codec) +static void cs42l52_remove(struct snd_soc_component *component) { - cs42l52_free_beep(codec); + struct snd_soc_codec *codec = snd_soc_component_to_codec(component);

- return 0; + cs42l52_free_beep(codec); }

static const struct snd_soc_codec_driver soc_codec_dev_cs42l52 = { - .probe = cs42l52_probe, - .remove = cs42l52_remove, .set_bias_level = cs42l52_set_bias_level, .suspend_bias_off = true,

.component_driver = { + .probe = cs42l52_probe, + .remove = cs42l52_remove, .controls = cs42l52_snd_controls, .num_controls = ARRAY_SIZE(cs42l52_snd_controls), .dapm_widgets = cs42l52_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/cs4271.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c index 8c0f3b8..5f2673b 100644 --- a/sound/soc/codecs/cs4271.c +++ b/sound/soc/codecs/cs4271.c @@ -567,8 +567,9 @@ MODULE_DEVICE_TABLE(of, cs4271_dt_ids); EXPORT_SYMBOL_GPL(cs4271_dt_ids); #endif

-static int cs4271_codec_probe(struct snd_soc_codec *codec) +static int cs4271_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); struct cs4271_platform_data *cs4271plat = codec->dev->platform_data; int ret; @@ -625,8 +626,9 @@ static int cs4271_codec_probe(struct snd_soc_codec *codec) return 0; }

-static int cs4271_codec_remove(struct snd_soc_codec *codec) +static void cs4271_codec_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);

if (gpio_is_valid(cs4271->gpio_nreset)) @@ -635,17 +637,15 @@ static int cs4271_codec_remove(struct snd_soc_codec *codec)

regcache_mark_dirty(cs4271->regmap); regulator_bulk_disable(ARRAY_SIZE(cs4271->supplies), cs4271->supplies); - - return 0; };

static struct snd_soc_codec_driver soc_codec_dev_cs4271 = { - .probe = cs4271_codec_probe, - .remove = cs4271_codec_remove, .suspend = cs4271_soc_suspend, .resume = cs4271_soc_resume,

.component_driver = { + .probe = cs4271_codec_probe, + .remove = cs4271_codec_remove, .controls = cs4271_snd_controls, .num_controls = ARRAY_SIZE(cs4271_snd_controls), .dapm_widgets = cs4271_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/cs35l33.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/codecs/cs35l33.c b/sound/soc/codecs/cs35l33.c index 6df29fa..b6574f1 100644 --- a/sound/soc/codecs/cs35l33.c +++ b/sound/soc/codecs/cs35l33.c @@ -778,8 +778,9 @@ err: return ret; }

-static int cs35l33_probe(struct snd_soc_codec *codec) +static int cs35l33_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct cs35l33_private *cs35l33 = snd_soc_codec_get_drvdata(codec);

cs35l33->codec = codec; @@ -832,12 +833,11 @@ static int cs35l33_probe(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver soc_codec_dev_cs35l33 = { - .probe = cs35l33_probe, - .set_bias_level = cs35l33_set_bias_level, .set_sysclk = cs35l33_codec_set_sysclk,

.component_driver = { + .probe = cs35l33_probe, .controls = cs35l33_snd_controls, .num_controls = ARRAY_SIZE(cs35l33_snd_controls), .dapm_widgets = cs35l33_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/ak5386.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sound/soc/codecs/ak5386.c b/sound/soc/codecs/ak5386.c index 0ef2df2..2c9caf7 100644 --- a/sound/soc/codecs/ak5386.c +++ b/sound/soc/codecs/ak5386.c @@ -38,17 +38,18 @@ static const struct snd_soc_dapm_route ak5386_dapm_routes[] = { { "Capture", NULL, "AINR" }, };

-static int ak5386_soc_probe(struct snd_soc_codec *codec) +static int ak5386_soc_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct ak5386_priv *priv = snd_soc_codec_get_drvdata(codec); return regulator_bulk_enable(ARRAY_SIZE(priv->supplies), priv->supplies); }

-static int ak5386_soc_remove(struct snd_soc_codec *codec) +static void ak5386_soc_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct ak5386_priv *priv = snd_soc_codec_get_drvdata(codec); regulator_bulk_disable(ARRAY_SIZE(priv->supplies), priv->supplies); - return 0; }

#ifdef CONFIG_PM @@ -70,11 +71,11 @@ static int ak5386_soc_resume(struct snd_soc_codec *codec) #endif /* CONFIG_PM */

static struct snd_soc_codec_driver soc_codec_ak5386 = { - .probe = ak5386_soc_probe, - .remove = ak5386_soc_remove, .suspend = ak5386_soc_suspend, .resume = ak5386_soc_resume, .component_driver = { + .probe = ak5386_soc_probe, + .remove = ak5386_soc_remove, .dapm_widgets = ak5386_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(ak5386_dapm_widgets), .dapm_routes = ak5386_dapm_routes,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/ak4104.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c index bdca879..f4c915c 100644 --- a/sound/soc/codecs/ak4104.c +++ b/sound/soc/codecs/ak4104.c @@ -171,8 +171,9 @@ static struct snd_soc_dai_driver ak4104_dai = { .ops = &ak4101_dai_ops, };

-static int ak4104_probe(struct snd_soc_codec *codec) +static int ak4104_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct ak4104_private *ak4104 = snd_soc_codec_get_drvdata(codec); int ret;

@@ -202,15 +203,14 @@ exit_disable_regulator: return ret; }

-static int ak4104_remove(struct snd_soc_codec *codec) +static void ak4104_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct ak4104_private *ak4104 = snd_soc_codec_get_drvdata(codec);

regmap_update_bits(ak4104->regmap, AK4104_REG_CONTROL1, AK4104_CONTROL1_PW | AK4104_CONTROL1_RSTN, 0); regulator_disable(ak4104->regulator); - - return 0; }

#ifdef CONFIG_PM @@ -240,12 +240,12 @@ static int ak4104_soc_resume(struct snd_soc_codec *codec) #endif /* CONFIG_PM */

static struct snd_soc_codec_driver soc_codec_device_ak4104 = { - .probe = ak4104_probe, - .remove = ak4104_remove, .suspend = ak4104_soc_suspend, .resume = ak4104_soc_resume,

.component_driver = { + .probe = ak4104_probe, + .remove = ak4104_remove, .dapm_widgets = ak4104_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(ak4104_dapm_widgets), .dapm_routes = ak4104_dapm_routes,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/ac97.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c index f7f04c6..a541c85 100644 --- a/sound/soc/codecs/ac97.c +++ b/sound/soc/codecs/ac97.c @@ -65,8 +65,9 @@ static struct snd_soc_dai_driver ac97_dai = { .ops = &ac97_dai_ops, };

-static int ac97_soc_probe(struct snd_soc_codec *codec) +static int ac97_soc_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct snd_ac97 *ac97; struct snd_ac97_bus *ac97_bus; struct snd_ac97_template ac97_template; @@ -113,11 +114,11 @@ static int ac97_soc_resume(struct snd_soc_codec *codec) #endif

static struct snd_soc_codec_driver soc_codec_dev_ac97 = { - .probe = ac97_soc_probe, .suspend = ac97_soc_suspend, .resume = ac97_soc_resume,

.component_driver = { + .probe = ac97_soc_probe, .dapm_widgets = ac97_widgets, .num_dapm_widgets = ARRAY_SIZE(ac97_widgets), .dapm_routes = ac97_routes,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/atmel/atmel-pdmic.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/atmel/atmel-pdmic.c b/sound/soc/atmel/atmel-pdmic.c index 2a3a41f..60cb267 100644 --- a/sound/soc/atmel/atmel-pdmic.c +++ b/sound/soc/atmel/atmel-pdmic.c @@ -344,8 +344,9 @@ SOC_SINGLE("High Pass Filter Switch", PDMIC_DSPR0, SOC_SINGLE("SINCC Filter Switch", PDMIC_DSPR0, PDMIC_DSPR0_SINBYP_SHIFT, 1, 1), };

-static int atmel_pdmic_codec_probe(struct snd_soc_codec *codec) +static int atmel_pdmic_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct snd_soc_card *card = snd_soc_codec_get_drvdata(codec); struct atmel_pdmic *dd = snd_soc_card_get_drvdata(card);

@@ -356,8 +357,8 @@ static int atmel_pdmic_codec_probe(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver soc_codec_dev_pdmic = { - .probe = atmel_pdmic_codec_probe, .component_driver = { + .probe = atmel_pdmic_codec_probe, .controls = atmel_pdmic_snd_controls, .num_controls = ARRAY_SIZE(atmel_pdmic_snd_controls), },

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/ab8500-codec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index 3056487..4e4ede3 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c @@ -2458,8 +2458,9 @@ static void ab8500_codec_of_probe(struct device *dev, struct device_node *np, } }

-static int ab8500_codec_probe(struct snd_soc_codec *codec) +static int ab8500_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct device *dev = codec->dev; struct device_node *np = dev->of_node; @@ -2524,8 +2525,8 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver ab8500_codec_driver = { - .probe = ab8500_codec_probe, .component_driver = { + .probe = ab8500_codec_probe, .controls = ab8500_ctrls, .num_controls = ARRAY_SIZE(ab8500_ctrls), .dapm_widgets = ab8500_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/ad193x.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c index d643557..62eae2f 100644 --- a/sound/soc/codecs/ad193x.c +++ b/sound/soc/codecs/ad193x.c @@ -351,8 +351,9 @@ static struct snd_soc_dai_driver ad193x_dai = { .ops = &ad193x_dai_ops, };

-static int ad193x_codec_probe(struct snd_soc_codec *codec) +static int ad193x_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct ad193x_priv *ad193x = snd_soc_codec_get_drvdata(codec); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); int num, ret; @@ -409,8 +410,8 @@ static int ad193x_codec_probe(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver soc_codec_dev_ad193x = { - .probe = ad193x_codec_probe, .component_driver = { + .probe = ad193x_codec_probe, .controls = ad193x_snd_controls, .num_controls = ARRAY_SIZE(ad193x_snd_controls), .dapm_widgets = ad193x_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/adau1373.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/adau1373.c b/sound/soc/codecs/adau1373.c index 8fa9045..6056948 100644 --- a/sound/soc/codecs/adau1373.c +++ b/sound/soc/codecs/adau1373.c @@ -1348,8 +1348,9 @@ static bool adau1373_valid_micbias(enum adau1373_micbias_voltage micbias) return false; }

-static int adau1373_probe(struct snd_soc_codec *codec) +static int adau1373_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec); struct adau1373_platform_data *pdata = codec->dev->platform_data; bool lineout_differential = false; @@ -1459,7 +1460,6 @@ static const struct regmap_config adau1373_regmap_config = { };

static struct snd_soc_codec_driver adau1373_codec_driver = { - .probe = adau1373_probe, .resume = adau1373_resume, .set_bias_level = adau1373_set_bias_level, .idle_bias_off = true, @@ -1467,6 +1467,7 @@ static struct snd_soc_codec_driver adau1373_codec_driver = { .set_pll = adau1373_set_pll,

.component_driver = { + .probe = adau1373_probe, .controls = adau1373_controls, .num_controls = ARRAY_SIZE(adau1373_controls), .dapm_widgets = adau1373_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/adau1781.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/adau1781.c b/sound/soc/codecs/adau1781.c index 546071c..89c3c3e 100644 --- a/sound/soc/codecs/adau1781.c +++ b/sound/soc/codecs/adau1781.c @@ -380,8 +380,9 @@ static int adau1781_set_input_mode(struct adau *adau, unsigned int reg, ADAU1781_INPUT_DIFFERNTIAL, val); }

-static int adau1781_codec_probe(struct snd_soc_codec *codec) +static int adau1781_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct adau1781_platform_data *pdata = dev_get_platdata(codec->dev); struct adau *adau = snd_soc_codec_get_drvdata(codec); @@ -427,12 +428,12 @@ static int adau1781_codec_probe(struct snd_soc_codec *codec) }

static const struct snd_soc_codec_driver adau1781_codec_driver = { - .probe = adau1781_codec_probe, .resume = adau17x1_resume, .set_bias_level = adau1781_set_bias_level, .suspend_bias_off = true,

.component_driver = { + .probe = adau1781_codec_probe, .controls = adau1781_controls, .num_controls = ARRAY_SIZE(adau1781_controls), .dapm_widgets = adau1781_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/adav80x.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c index 6e793eb..42a5589 100644 --- a/sound/soc/codecs/adav80x.c +++ b/sound/soc/codecs/adav80x.c @@ -799,8 +799,9 @@ static struct snd_soc_dai_driver adav80x_dais[] = { }, };

-static int adav80x_probe(struct snd_soc_codec *codec) +static int adav80x_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);

@@ -826,7 +827,6 @@ static int adav80x_resume(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver adav80x_codec_driver = { - .probe = adav80x_probe, .resume = adav80x_resume, .set_bias_level = adav80x_set_bias_level, .suspend_bias_off = true, @@ -835,6 +835,7 @@ static struct snd_soc_codec_driver adav80x_codec_driver = { .set_sysclk = adav80x_set_sysclk,

.component_driver = { + .probe = adav80x_probe, .controls = adav80x_controls, .num_controls = ARRAY_SIZE(adav80x_controls), .dapm_widgets = adav80x_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/cs47l24.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/cs47l24.c b/sound/soc/codecs/cs47l24.c index 779a7bf..8eeb746 100644 --- a/sound/soc/codecs/cs47l24.c +++ b/sound/soc/codecs/cs47l24.c @@ -1102,8 +1102,9 @@ static irqreturn_t cs47l24_adsp2_irq(int irq, void *data) return IRQ_HANDLED; }

-static int cs47l24_codec_probe(struct snd_soc_codec *codec) +static int cs47l24_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct cs47l24_priv *priv = snd_soc_codec_get_drvdata(codec); struct arizona *arizona = priv->core.arizona; @@ -1148,8 +1149,9 @@ err_adsp2_codec_probe: return ret; }

-static int cs47l24_codec_remove(struct snd_soc_codec *codec) +static void cs47l24_codec_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct cs47l24_priv *priv = snd_soc_codec_get_drvdata(codec); struct arizona *arizona = priv->core.arizona;

@@ -1161,8 +1163,6 @@ static int cs47l24_codec_remove(struct snd_soc_codec *codec) arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, priv);

arizona_free_spk(codec); - - return 0; }

#define CS47L24_DIG_VU 0x0200 @@ -1181,8 +1181,6 @@ static struct regmap *cs47l24_get_regmap(struct device *dev) }

static struct snd_soc_codec_driver soc_codec_dev_cs47l24 = { - .probe = cs47l24_codec_probe, - .remove = cs47l24_codec_remove, .get_regmap = cs47l24_get_regmap,

.idle_bias_off = true, @@ -1191,6 +1189,8 @@ static struct snd_soc_codec_driver soc_codec_dev_cs47l24 = { .set_pll = cs47l24_set_fll,

.component_driver = { + .probe = cs47l24_codec_probe, + .remove = cs47l24_codec_remove, .controls = cs47l24_snd_controls, .num_controls = ARRAY_SIZE(cs47l24_snd_controls), .dapm_widgets = cs47l24_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/da7210.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c index 17053df..e8bc0d6 100644 --- a/sound/soc/codecs/da7210.c +++ b/sound/soc/codecs/da7210.c @@ -1064,8 +1064,9 @@ static struct snd_soc_dai_driver da7210_dai = { .symmetric_rates = 1, };

-static int da7210_probe(struct snd_soc_codec *codec) +static int da7210_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec);

dev_info(codec->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION); @@ -1165,9 +1166,8 @@ static int da7210_probe(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver soc_codec_dev_da7210 = { - .probe = da7210_probe, - .component_driver = { + .probe = da7210_probe, .controls = da7210_snd_controls, .num_controls = ARRAY_SIZE(da7210_snd_controls), .dapm_widgets = da7210_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm9713.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 255a7c2..50b1156 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -1202,8 +1202,9 @@ static int wm9713_soc_resume(struct snd_soc_codec *codec) return ret; }

-static int wm9713_soc_probe(struct snd_soc_codec *codec) +static int wm9713_soc_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); struct regmap *regmap;

@@ -1226,23 +1227,23 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec) return 0; }

-static int wm9713_soc_remove(struct snd_soc_codec *codec) +static void wm9713_soc_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec);

snd_soc_codec_exit_regmap(codec); snd_soc_free_ac97_codec(wm9713->ac97); - return 0; }

static struct snd_soc_codec_driver soc_codec_dev_wm9713 = { - .probe = wm9713_soc_probe, - .remove = wm9713_soc_remove, .suspend = wm9713_soc_suspend, .resume = wm9713_soc_resume, .set_bias_level = wm9713_set_bias_level,

.component_driver = { + .probe = wm9713_soc_probe, + .remove = wm9713_soc_remove, .controls = wm9713_snd_ac97_controls, .num_controls = ARRAY_SIZE(wm9713_snd_ac97_controls), .dapm_widgets = wm9713_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm9705.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index c88492d..928b51d 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c @@ -328,8 +328,9 @@ static int wm9705_soc_resume(struct snd_soc_codec *codec) #define wm9705_soc_resume NULL #endif

-static int wm9705_soc_probe(struct snd_soc_codec *codec) +static int wm9705_soc_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct snd_ac97 *ac97;

ac97 = snd_soc_new_ac97_codec(codec, WM9705_VENDOR_ID, @@ -344,17 +345,15 @@ static int wm9705_soc_probe(struct snd_soc_codec *codec) return 0; }

-static int wm9705_soc_remove(struct snd_soc_codec *codec) +static void wm9705_soc_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);

snd_soc_free_ac97_codec(ac97); - return 0; }

static struct snd_soc_codec_driver soc_codec_dev_wm9705 = { - .probe = wm9705_soc_probe, - .remove = wm9705_soc_remove, .suspend = wm9705_soc_suspend, .resume = wm9705_soc_resume, .read = ac97_read, @@ -365,6 +364,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9705 = { .reg_cache_default = wm9705_reg,

.component_driver = { + .probe = wm9705_soc_probe, + .remove = wm9705_soc_remove, .controls = wm9705_snd_ac97_controls, .num_controls = ARRAY_SIZE(wm9705_snd_ac97_controls), .dapm_widgets = wm9705_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm9081.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c index 30eaf4c..a532012 100644 --- a/sound/soc/codecs/wm9081.c +++ b/sound/soc/codecs/wm9081.c @@ -1254,8 +1254,9 @@ static struct snd_soc_dai_driver wm9081_dai = { .ops = &wm9081_dai_ops, };

-static int wm9081_probe(struct snd_soc_codec *codec) +static int wm9081_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm9081_priv *wm9081 = snd_soc_codec_get_drvdata(codec);

/* Enable zero cross by default */ @@ -1275,14 +1276,13 @@ static int wm9081_probe(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver soc_codec_dev_wm9081 = { - .probe = wm9081_probe, - .set_sysclk = wm9081_set_sysclk, .set_bias_level = wm9081_set_bias_level,

.idle_bias_off = true,

.component_driver = { + .probe = wm9081_probe, .controls = wm9081_snd_controls, .num_controls = ARRAY_SIZE(wm9081_snd_controls), .dapm_widgets = wm9081_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8997.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c index cf23a6b..acdb6e2 100644 --- a/sound/soc/codecs/wm8997.c +++ b/sound/soc/codecs/wm8997.c @@ -1052,8 +1052,9 @@ static struct snd_soc_dai_driver wm8997_dai[] = { }, };

-static int wm8997_codec_probe(struct snd_soc_codec *codec) +static int wm8997_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct wm8997_priv *priv = snd_soc_codec_get_drvdata(codec);

@@ -1066,15 +1067,14 @@ static int wm8997_codec_probe(struct snd_soc_codec *codec) return 0; }

-static int wm8997_codec_remove(struct snd_soc_codec *codec) +static void wm8997_codec_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8997_priv *priv = snd_soc_codec_get_drvdata(codec);

priv->core.arizona->dapm = NULL;

arizona_free_spk(codec); - - return 0; }

#define WM8997_DIG_VU 0x0200 @@ -1096,8 +1096,6 @@ static struct regmap *wm8997_get_regmap(struct device *dev) }

static struct snd_soc_codec_driver soc_codec_dev_wm8997 = { - .probe = wm8997_codec_probe, - .remove = wm8997_codec_remove, .get_regmap = wm8997_get_regmap,

.idle_bias_off = true, @@ -1106,6 +1104,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8997 = { .set_pll = wm8997_set_fll,

.component_driver = { + .probe = wm8997_codec_probe, + .remove = wm8997_codec_remove, .controls = wm8997_snd_controls, .num_controls = ARRAY_SIZE(wm8997_snd_controls), .dapm_widgets = wm8997_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8995.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c index 19b08a5..15be86c 100644 --- a/sound/soc/codecs/wm8995.c +++ b/sound/soc/codecs/wm8995.c @@ -1994,8 +1994,9 @@ static int wm8995_set_bias_level(struct snd_soc_codec *codec, return 0; }

-static int wm8995_remove(struct snd_soc_codec *codec) +static void wm8995_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8995_priv *wm8995; int i;

@@ -2006,11 +2007,11 @@ static int wm8995_remove(struct snd_soc_codec *codec) &wm8995->disable_nb[i]);

regulator_bulk_free(ARRAY_SIZE(wm8995->supplies), wm8995->supplies); - return 0; }

-static int wm8995_probe(struct snd_soc_codec *codec) +static int wm8995_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8995_priv *wm8995; int i; int ret; @@ -2187,12 +2188,12 @@ static struct snd_soc_dai_driver wm8995_dai[] = { };

static const struct snd_soc_codec_driver soc_codec_dev_wm8995 = { - .probe = wm8995_probe, - .remove = wm8995_remove, .set_bias_level = wm8995_set_bias_level, .idle_bias_off = true,

.component_driver = { + .probe = wm8995_probe, + .remove = wm8995_remove, .controls = wm8995_snd_controls, .num_controls = ARRAY_SIZE(wm8995_snd_controls), .dapm_widgets = wm8995_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8993.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c index 8668c4c..6da4fb7 100644 --- a/sound/soc/codecs/wm8993.c +++ b/sound/soc/codecs/wm8993.c @@ -1479,8 +1479,9 @@ static struct snd_soc_dai_driver wm8993_dai = { .symmetric_rates = 1, };

-static int wm8993_probe(struct snd_soc_codec *codec) +static int wm8993_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

@@ -1614,10 +1615,12 @@ static const struct regmap_config wm8993_regmap = { };

static struct snd_soc_codec_driver soc_codec_dev_wm8993 = { - .probe = wm8993_probe, .suspend = wm8993_suspend, .resume = wm8993_resume, .set_bias_level = wm8993_set_bias_level, + .component_driver = { + .probe = wm8993_probe, + }, };

static int wm8993_i2c_probe(struct i2c_client *i2c,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8988.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c index b0d0219..2203930 100644 --- a/sound/soc/codecs/wm8988.c +++ b/sound/soc/codecs/wm8988.c @@ -792,8 +792,9 @@ static struct snd_soc_dai_driver wm8988_dai = { .symmetric_rates = 1, };

-static int wm8988_probe(struct snd_soc_codec *codec) +static int wm8988_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); int ret = 0;

ret = wm8988_reset(codec); @@ -813,11 +814,11 @@ static int wm8988_probe(struct snd_soc_codec *codec) }

static const struct snd_soc_codec_driver soc_codec_dev_wm8988 = { - .probe = wm8988_probe, .set_bias_level = wm8988_set_bias_level, .suspend_bias_off = true,

.component_driver = { + .probe = wm8988_probe, .controls = wm8988_snd_controls, .num_controls = ARRAY_SIZE(wm8988_snd_controls), .dapm_widgets = wm8988_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8971.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c index 214fa13..1419628 100644 --- a/sound/soc/codecs/wm8971.c +++ b/sound/soc/codecs/wm8971.c @@ -628,8 +628,9 @@ static struct snd_soc_dai_driver wm8971_dai = { .ops = &wm8971_dai_ops, };

-static int wm8971_probe(struct snd_soc_codec *codec) +static int wm8971_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8971_priv *wm8971 = snd_soc_codec_get_drvdata(codec);

INIT_DELAYED_WORK(&wm8971->charge_work, wm8971_charge_work); @@ -650,11 +651,11 @@ static int wm8971_probe(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver soc_codec_dev_wm8971 = { - .probe = wm8971_probe, .set_bias_level = wm8971_set_bias_level, .suspend_bias_off = true,

.component_driver = { + .probe = wm8971_probe, .controls = wm8971_snd_controls, .num_controls = ARRAY_SIZE(wm8971_snd_controls), .dapm_widgets = wm8971_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8955.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c index 575075d..e659e89 100644 --- a/sound/soc/codecs/wm8955.c +++ b/sound/soc/codecs/wm8955.c @@ -865,8 +865,9 @@ static struct snd_soc_dai_driver wm8955_dai = { .ops = &wm8955_dai_ops, };

-static int wm8955_probe(struct snd_soc_codec *codec) +static int wm8955_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec); struct wm8955_pdata *pdata = dev_get_platdata(codec->dev); int ret, i; @@ -941,11 +942,11 @@ err_enable: }

static struct snd_soc_codec_driver soc_codec_dev_wm8955 = { - .probe = wm8955_probe, .set_bias_level = wm8955_set_bias_level, .suspend_bias_off = true,

.component_driver = { + .probe = wm8955_probe, .controls = wm8955_snd_controls, .num_controls = ARRAY_SIZE(wm8955_snd_controls), .dapm_widgets = wm8955_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8904.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index edd7a77..01ec4ca 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -2053,8 +2053,9 @@ static void wm8904_handle_pdata(struct snd_soc_codec *codec) }

-static int wm8904_probe(struct snd_soc_codec *codec) +static int wm8904_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);

switch (wm8904->devtype) { @@ -2076,21 +2077,22 @@ static int wm8904_probe(struct snd_soc_codec *codec) return 0; }

-static int wm8904_remove(struct snd_soc_codec *codec) +static void wm8904_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);

kfree(wm8904->retune_mobile_texts); kfree(wm8904->drc_texts); - - return 0; }

static struct snd_soc_codec_driver soc_codec_dev_wm8904 = { - .probe = wm8904_probe, - .remove = wm8904_remove, .set_bias_level = wm8904_set_bias_level, .idle_bias_off = true, + .component_driver = { + .probe = wm8904_probe, + .remove = wm8904_remove, + }, };

static const struct regmap_config wm8904_regmap = {

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8400.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index 4551e54..67e0730 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c @@ -1273,8 +1273,9 @@ static struct snd_soc_dai_driver wm8400_dai = { .ops = &wm8400_dai_ops, };

-static int wm8400_codec_probe(struct snd_soc_codec *codec) +static int wm8400_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8400 *wm8400 = dev_get_platdata(codec->dev); struct wm8400_priv *priv; int ret; @@ -1314,15 +1315,14 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec) return 0; }

-static int wm8400_codec_remove(struct snd_soc_codec *codec) +static void wm8400_codec_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); u16 reg;

reg = snd_soc_read(codec, WM8400_POWER_MANAGEMENT_1); snd_soc_write(codec, WM8400_POWER_MANAGEMENT_1, reg & (~WM8400_CODEC_ENA)); - - return 0; }

static struct regmap *wm8400_get_regmap(struct device *dev) @@ -1333,13 +1333,13 @@ static struct regmap *wm8400_get_regmap(struct device *dev) }

static struct snd_soc_codec_driver soc_codec_dev_wm8400 = { - .probe = wm8400_codec_probe, - .remove = wm8400_codec_remove, .get_regmap = wm8400_get_regmap, .set_bias_level = wm8400_set_bias_level, .suspend_bias_off = true,

.component_driver = { + .probe = wm8400_codec_probe, + .remove = wm8400_codec_remove, .controls = wm8400_snd_controls, .num_controls = ARRAY_SIZE(wm8400_snd_controls), .dapm_widgets = wm8400_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm5110.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index 3e7f873..cec5f4d 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -2258,8 +2258,9 @@ static irqreturn_t wm5110_adsp2_irq(int irq, void *data) return IRQ_HANDLED; }

-static int wm5110_codec_probe(struct snd_soc_codec *codec) +static int wm5110_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct wm5110_priv *priv = snd_soc_codec_get_drvdata(codec); struct arizona *arizona = priv->core.arizona; @@ -2305,8 +2306,9 @@ err_adsp2_codec_probe: return ret; }

-static int wm5110_codec_remove(struct snd_soc_codec *codec) +static void wm5110_codec_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm5110_priv *priv = snd_soc_codec_get_drvdata(codec); struct arizona *arizona = priv->core.arizona; int i; @@ -2319,8 +2321,6 @@ static int wm5110_codec_remove(struct snd_soc_codec *codec) arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, priv);

arizona_free_spk(codec); - - return 0; }

#define WM5110_DIG_VU 0x0200 @@ -2348,8 +2348,6 @@ static struct regmap *wm5110_get_regmap(struct device *dev) }

static struct snd_soc_codec_driver soc_codec_dev_wm5110 = { - .probe = wm5110_codec_probe, - .remove = wm5110_codec_remove, .get_regmap = wm5110_get_regmap,

.idle_bias_off = true, @@ -2358,6 +2356,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm5110 = { .set_pll = wm5110_set_fll,

.component_driver = { + .probe = wm5110_codec_probe, + .remove = wm5110_codec_remove, .controls = wm5110_snd_controls, .num_controls = ARRAY_SIZE(wm5110_snd_controls), .dapm_widgets = wm5110_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm2200.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index d913d0e..1bc35dc 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -1548,8 +1548,9 @@ static const struct snd_soc_dapm_route wm2200_dapm_routes[] = { WM2200_MIXER_ROUTES("LHPF2", "LHPF2"), };

-static int wm2200_probe(struct snd_soc_codec *codec) +static int wm2200_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm2200_priv *wm2200 = dev_get_drvdata(codec->dev); int ret;

@@ -2104,14 +2105,13 @@ static struct snd_soc_dai_driver wm2200_dai = { };

static struct snd_soc_codec_driver soc_codec_wm2200 = { - .probe = wm2200_probe, - .idle_bias_off = true, .ignore_pmdown_time = true, .set_sysclk = wm2200_set_sysclk, .set_pll = wm2200_set_fll,

.component_driver = { + .probe = wm2200_probe, .controls = wm2200_snd_controls, .num_controls = ARRAY_SIZE(wm2200_snd_controls), .dapm_widgets = wm2200_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm0010.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index 4ef6919..2687b13 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -787,15 +787,24 @@ static int wm0010_set_sysclk(struct snd_soc_codec *codec, int source, return 0; }

-static int wm0010_probe(struct snd_soc_codec *codec); + +static int wm0010_probe(struct snd_soc_component *component) +{ + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); + struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec); + + wm0010->codec = codec; + + return 0; +}

static struct snd_soc_codec_driver soc_codec_dev_wm0010 = { - .probe = wm0010_probe, .set_bias_level = wm0010_set_bias_level, .set_sysclk = wm0010_set_sysclk, .idle_bias_off = true,

.component_driver = { + .probe = wm0010_probe, .dapm_widgets = wm0010_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(wm0010_dapm_widgets), .dapm_routes = wm0010_dapm_routes, @@ -864,15 +873,6 @@ static irqreturn_t wm0010_irq(int irq, void *data) return IRQ_NONE; }

-static int wm0010_probe(struct snd_soc_codec *codec) -{ - struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec); - - wm0010->codec = codec; - - return 0; -} - static int wm0010_spi_probe(struct spi_device *spi) { unsigned long gpio_flags;

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/uda1380.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c index 533e3bb..2e2ebc9 100644 --- a/sound/soc/codecs/uda1380.c +++ b/sound/soc/codecs/uda1380.c @@ -687,8 +687,9 @@ static struct snd_soc_dai_driver uda1380_dai[] = { }, };

-static int uda1380_probe(struct snd_soc_codec *codec) +static int uda1380_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct uda1380_platform_data *pdata =codec->dev->platform_data; struct uda1380_priv *uda1380 = snd_soc_codec_get_drvdata(codec); int ret; @@ -742,19 +743,16 @@ err_out: }

/* power down chip */ -static int uda1380_remove(struct snd_soc_codec *codec) +static void uda1380_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct uda1380_platform_data *pdata =codec->dev->platform_data;

gpio_free(pdata->gpio_reset); gpio_free(pdata->gpio_power); - - return 0; }

static struct snd_soc_codec_driver soc_codec_dev_uda1380 = { - .probe = uda1380_probe, - .remove = uda1380_remove, .read = uda1380_read_reg_cache, .write = uda1380_write, .set_bias_level = uda1380_set_bias_level, @@ -766,6 +764,8 @@ static struct snd_soc_codec_driver soc_codec_dev_uda1380 = { .reg_cache_step = 1,

.component_driver = { + .probe = uda1380_probe, + .remove = uda1380_remove, .controls = uda1380_snd_controls, .num_controls = ARRAY_SIZE(uda1380_snd_controls), .dapm_widgets = uda1380_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/twl6040.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index 748036e..38e702f 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -1097,8 +1097,9 @@ static struct snd_soc_dai_driver twl6040_dai[] = { }, };

-static int twl6040_probe(struct snd_soc_codec *codec) +static int twl6040_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct twl6040_data *priv; struct twl6040 *twl6040 = dev_get_drvdata(codec->dev->parent); struct platform_device *pdev = to_platform_device(codec->dev); @@ -1138,18 +1139,15 @@ static int twl6040_probe(struct snd_soc_codec *codec) return 0; }

-static int twl6040_remove(struct snd_soc_codec *codec) +static void twl6040_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);

free_irq(priv->plug_irq, codec); - - return 0; }

static struct snd_soc_codec_driver soc_codec_dev_twl6040 = { - .probe = twl6040_probe, - .remove = twl6040_remove, .read = twl6040_read, .write = twl6040_write, .set_bias_level = twl6040_set_bias_level, @@ -1157,6 +1155,8 @@ static struct snd_soc_codec_driver soc_codec_dev_twl6040 = { .ignore_pmdown_time = true,

.component_driver = { + .probe = twl6040_probe, + .remove = twl6040_remove, .controls = twl6040_snd_controls, .num_controls = ARRAY_SIZE(twl6040_snd_controls), .dapm_widgets = twl6040_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/tlv320dac33.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c index d64eac7..d5be1bc 100644 --- a/sound/soc/codecs/tlv320dac33.c +++ b/sound/soc/codecs/tlv320dac33.c @@ -1375,8 +1375,9 @@ static int dac33_set_dai_fmt(struct snd_soc_dai *codec_dai, return 0; }

-static int dac33_soc_probe(struct snd_soc_codec *codec) +static int dac33_soc_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct tlv320dac33_priv *dac33 = snd_soc_codec_get_drvdata(codec); int ret = 0;

@@ -1431,15 +1432,15 @@ err_power: return ret; }

-static int dac33_soc_remove(struct snd_soc_codec *codec) +static void dac33_soc_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct tlv320dac33_priv *dac33 = snd_soc_codec_get_drvdata(codec);

if (dac33->irq >= 0) { free_irq(dac33->irq, dac33->codec); destroy_workqueue(dac33->dac33_wq); } - return 0; }

static struct snd_soc_codec_driver soc_codec_dev_tlv320dac33 = { @@ -1450,10 +1451,10 @@ static struct snd_soc_codec_driver soc_codec_dev_tlv320dac33 = { .reg_cache_size = ARRAY_SIZE(dac33_reg), .reg_word_size = sizeof(u8), .reg_cache_default = dac33_reg, - .probe = dac33_soc_probe, - .remove = dac33_soc_remove,

.component_driver = { + .probe = dac33_soc_probe, + .remove = dac33_soc_remove, .controls = dac33_snd_controls, .num_controls = ARRAY_SIZE(dac33_snd_controls), .dapm_widgets = dac33_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/tlv320aic26.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index 14aa96d..da5cc5f 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c @@ -291,8 +291,9 @@ static DEVICE_ATTR(keyclick, 0644, aic26_keyclick_show, aic26_keyclick_set); /* --------------------------------------------------------------------- * SoC CODEC portion of driver: probe and release routines */ -static int aic26_probe(struct snd_soc_codec *codec) +static int aic26_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct aic26 *aic26 = dev_get_drvdata(codec->dev); int ret, reg;

@@ -320,8 +321,8 @@ static int aic26_probe(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver aic26_soc_codec_dev = { - .probe = aic26_probe, .component_driver = { + .probe = aic26_probe, .controls = aic26_snd_controls, .num_controls = ARRAY_SIZE(aic26_snd_controls), .dapm_widgets = tlv320aic26_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/sn95031.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c index eae54c3..d212967 100644 --- a/sound/soc/codecs/sn95031.c +++ b/sound/soc/codecs/sn95031.c @@ -834,8 +834,10 @@ void sn95031_jack_detection(struct snd_soc_codec *codec, EXPORT_SYMBOL_GPL(sn95031_jack_detection);

/* codec registration */ -static int sn95031_codec_probe(struct snd_soc_codec *codec) +static int sn95031_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); + pr_debug("codec_probe called\n");

/* PCM interface config @@ -884,11 +886,11 @@ static int sn95031_codec_probe(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver sn95031_codec = { - .probe = sn95031_codec_probe, .set_bias_level = sn95031_set_vaud_bias, .idle_bias_off = true,

.component_driver = { + .probe = sn95031_codec_probe, .controls = sn95031_snd_controls, .num_controls = ARRAY_SIZE(sn95031_snd_controls), .dapm_widgets = sn95031_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/rt5670.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c index 49caf13..850f4ea 100644 --- a/sound/soc/codecs/rt5670.c +++ b/sound/soc/codecs/rt5670.c @@ -2651,8 +2651,9 @@ static int rt5670_set_bias_level(struct snd_soc_codec *codec, return 0; }

-static int rt5670_probe(struct snd_soc_codec *codec) +static int rt5670_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);

@@ -2684,13 +2685,13 @@ static int rt5670_probe(struct snd_soc_codec *codec) return 0; }

-static int rt5670_remove(struct snd_soc_codec *codec) +static void rt5670_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);

regmap_write(rt5670->regmap, RT5670_RESET, 0); snd_soc_jack_free_gpios(rt5670->jack, 1, &rt5670->hp_gpio); - return 0; }

#ifdef CONFIG_PM @@ -2771,13 +2772,13 @@ static struct snd_soc_dai_driver rt5670_dai[] = { };

static struct snd_soc_codec_driver soc_codec_dev_rt5670 = { - .probe = rt5670_probe, - .remove = rt5670_remove, .suspend = rt5670_suspend, .resume = rt5670_resume, .set_bias_level = rt5670_set_bias_level, .idle_bias_off = true, .component_driver = { + .probe = rt5670_probe, + .remove = rt5670_remove, .controls = rt5670_snd_controls, .num_controls = ARRAY_SIZE(rt5670_snd_controls), .dapm_widgets = rt5670_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/rt5651.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c index f5d3415..5c0b1b6 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -1609,8 +1609,9 @@ static int rt5651_set_bias_level(struct snd_soc_codec *codec, return 0; }

-static int rt5651_probe(struct snd_soc_codec *codec) +static int rt5651_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);

rt5651->codec = codec; @@ -1707,12 +1708,12 @@ static struct snd_soc_dai_driver rt5651_dai[] = { };

static struct snd_soc_codec_driver soc_codec_dev_rt5651 = { - .probe = rt5651_probe, .suspend = rt5651_suspend, .resume = rt5651_resume, .set_bias_level = rt5651_set_bias_level, .idle_bias_off = true, .component_driver = { + .probe = rt5651_probe, .controls = rt5651_snd_controls, .num_controls = ARRAY_SIZE(rt5651_snd_controls), .dapm_widgets = rt5651_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/rt5640.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index fbe3af1..24aa8a0 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -2109,8 +2109,9 @@ int rt5640_sel_asrc_clk_src(struct snd_soc_codec *codec, } EXPORT_SYMBOL_GPL(rt5640_sel_asrc_clk_src);

-static int rt5640_probe(struct snd_soc_codec *codec) +static int rt5640_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec);

@@ -2161,11 +2162,11 @@ static int rt5640_probe(struct snd_soc_codec *codec) return 0; }

-static int rt5640_remove(struct snd_soc_codec *codec) +static void rt5640_remove(struct snd_soc_component *component) { - rt5640_reset(codec); + struct snd_soc_codec *codec = snd_soc_component_to_codec(component);

- return 0; + rt5640_reset(codec); }

#ifdef CONFIG_PM @@ -2255,13 +2256,13 @@ static struct snd_soc_dai_driver rt5640_dai[] = { };

static struct snd_soc_codec_driver soc_codec_dev_rt5640 = { - .probe = rt5640_probe, - .remove = rt5640_remove, .suspend = rt5640_suspend, .resume = rt5640_resume, .set_bias_level = rt5640_set_bias_level, .idle_bias_off = true, .component_driver = { + .probe = rt5640_probe, + .remove = rt5640_remove, .controls = rt5640_snd_controls, .num_controls = ARRAY_SIZE(rt5640_snd_controls), .dapm_widgets = rt5640_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/rt298.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index 5555864..fe5832f 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -978,8 +978,9 @@ static irqreturn_t rt298_irq(int irq, void *data) return IRQ_HANDLED; }

-static int rt298_probe(struct snd_soc_codec *codec) +static int rt298_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct rt298_priv *rt298 = snd_soc_codec_get_drvdata(codec);

rt298->codec = codec; @@ -997,13 +998,12 @@ static int rt298_probe(struct snd_soc_codec *codec) return 0; }

-static int rt298_remove(struct snd_soc_codec *codec) +static void rt298_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct rt298_priv *rt298 = snd_soc_codec_get_drvdata(codec);

cancel_delayed_work_sync(&rt298->jack_detect_work); - - return 0; }

#ifdef CONFIG_PM @@ -1089,13 +1089,13 @@ static struct snd_soc_dai_driver rt298_dai[] = { };

static struct snd_soc_codec_driver soc_codec_dev_rt298 = { - .probe = rt298_probe, - .remove = rt298_remove, .suspend = rt298_suspend, .resume = rt298_resume, .set_bias_level = rt298_set_bias_level, .idle_bias_off = true, .component_driver = { + .probe = rt298_probe, + .remove = rt298_remove, .controls = rt298_snd_controls, .num_controls = ARRAY_SIZE(rt298_snd_controls), .dapm_widgets = rt298_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/nau8825.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index 822791eb..f02a371 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -1832,8 +1832,9 @@ static const struct regmap_config nau8825_regmap_config = { .num_reg_defaults = ARRAY_SIZE(nau8825_reg_defaults), };

-static int nau8825_codec_probe(struct snd_soc_codec *codec) +static int nau8825_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

@@ -1842,14 +1843,13 @@ static int nau8825_codec_probe(struct snd_soc_codec *codec) return 0; }

-static int nau8825_codec_remove(struct snd_soc_codec *codec) +static void nau8825_codec_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec);

/* Cancel and reset cross tak suppresstion detection funciton */ nau8825_xtalk_cancel(nau8825); - - return 0; }

/** @@ -2261,8 +2261,6 @@ static int __maybe_unused nau8825_resume(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver nau8825_codec_driver = { - .probe = nau8825_codec_probe, - .remove = nau8825_codec_remove, .set_sysclk = nau8825_set_sysclk, .set_pll = nau8825_set_pll, .set_bias_level = nau8825_set_bias_level, @@ -2271,6 +2269,8 @@ static struct snd_soc_codec_driver nau8825_codec_driver = { .resume = nau8825_resume,

.component_driver = { + .probe = nau8825_codec_probe, + .remove = nau8825_codec_remove, .controls = nau8825_controls, .num_controls = ARRAY_SIZE(nau8825_controls), .dapm_widgets = nau8825_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/mc13783.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c index 9056270..84f5ee5 100644 --- a/sound/soc/codecs/mc13783.c +++ b/sound/soc/codecs/mc13783.c @@ -606,8 +606,9 @@ static struct snd_kcontrol_new mc13783_control_list[] = { SOC_SINGLE("MC2 Capture Bias Switch", MC13783_AUDIO_TX, 1, 1, 0), };

-static int mc13783_probe(struct snd_soc_codec *codec) +static int mc13783_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec);

/* these are the reset values */ @@ -635,14 +636,13 @@ static int mc13783_probe(struct snd_soc_codec *codec) return 0; }

-static int mc13783_remove(struct snd_soc_codec *codec) +static void mc13783_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec);

/* Make sure VAUDIOON is off */ mc13xxx_reg_rmw(priv->mc13xxx, MC13783_AUDIO_RX0, 0x3, 0); - - return 0; }

#define MC13783_RATES_RECORD (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000) @@ -734,10 +734,10 @@ static struct regmap *mc13783_get_regmap(struct device *dev) }

static struct snd_soc_codec_driver soc_codec_dev_mc13783 = { - .probe = mc13783_probe, - .remove = mc13783_remove, .get_regmap = mc13783_get_regmap, .component_driver = { + .probe = mc13783_probe, + .remove = mc13783_remove, .controls = mc13783_control_list, .num_controls = ARRAY_SIZE(mc13783_control_list), .dapm_widgets = mc13783_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/max98925.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/max98925.c b/sound/soc/codecs/max98925.c index 327eaa2..b8ca524 100644 --- a/sound/soc/codecs/max98925.c +++ b/sound/soc/codecs/max98925.c @@ -516,8 +516,9 @@ static struct snd_soc_dai_driver max98925_dai[] = { } };

-static int max98925_probe(struct snd_soc_codec *codec) +static int max98925_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct max98925_priv *max98925 = snd_soc_codec_get_drvdata(codec);

max98925->codec = codec; @@ -539,8 +540,8 @@ static int max98925_probe(struct snd_soc_codec *codec) }

static const struct snd_soc_codec_driver soc_codec_dev_max98925 = { - .probe = max98925_probe, .component_driver = { + .probe = max98925_probe, .controls = max98925_snd_controls, .num_controls = ARRAY_SIZE(max98925_snd_controls), .dapm_routes = max98925_audio_map,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/max9850.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/max9850.c b/sound/soc/codecs/max9850.c index 0610840..36c6edd 100644 --- a/sound/soc/codecs/max9850.c +++ b/sound/soc/codecs/max9850.c @@ -289,8 +289,10 @@ static struct snd_soc_dai_driver max9850_dai = { .ops = &max9850_dai_ops, };

-static int max9850_probe(struct snd_soc_codec *codec) +static int max9850_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); + /* enable zero-detect */ snd_soc_update_bits(codec, MAX9850_GENERAL_PURPOSE, 1, 1); /* enable slew-rate control */ @@ -302,11 +304,11 @@ static int max9850_probe(struct snd_soc_codec *codec) }

static struct snd_soc_codec_driver soc_codec_dev_max9850 = { - .probe = max9850_probe, .set_bias_level = max9850_set_bias_level, .suspend_bias_off = true,

.component_driver = { + .probe = max9850_probe, .controls = max9850_controls, .num_controls = ARRAY_SIZE(max9850_controls), .dapm_widgets = max9850_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/max98095.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c index 6f8a757..32ee5ca 100644 --- a/sound/soc/codecs/max98095.c +++ b/sound/soc/codecs/max98095.c @@ -1988,8 +1988,9 @@ static int max98095_reset(struct snd_soc_codec *codec) return ret; }

-static int max98095_probe(struct snd_soc_codec *codec) +static int max98095_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); struct max98095_cdata *cdata; struct i2c_client *client; @@ -2088,8 +2089,9 @@ err_access: return ret; }

-static int max98095_remove(struct snd_soc_codec *codec) +static void max98095_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); struct i2c_client *client = to_i2c_client(codec->dev);

@@ -2098,17 +2100,15 @@ static int max98095_remove(struct snd_soc_codec *codec)

if (client->irq) free_irq(client->irq, codec); - - return 0; }

static struct snd_soc_codec_driver soc_codec_dev_max98095 = { - .probe = max98095_probe, - .remove = max98095_remove, .suspend = max98095_suspend, .resume = max98095_resume, .set_bias_level = max98095_set_bias_level, .component_driver = { + .probe = max98095_probe, + .remove = max98095_remove, .controls = max98095_snd_controls, .num_controls = ARRAY_SIZE(max98095_snd_controls), .dapm_widgets = max98095_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/max98088.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index 72f7745..4e992c2 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -1628,8 +1628,9 @@ static void max98088_handle_pdata(struct snd_soc_codec *codec) max98088_handle_eq_pdata(codec); }

-static int max98088_probe(struct snd_soc_codec *codec) +static int max98088_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); struct max98088_cdata *cdata; int ret = 0; @@ -1689,22 +1690,21 @@ err_access: return ret; }

-static int max98088_remove(struct snd_soc_codec *codec) +static void max98088_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec);

kfree(max98088->eq_texts); - - return 0; }

static struct snd_soc_codec_driver soc_codec_dev_max98088 = { - .probe = max98088_probe, - .remove = max98088_remove, .set_bias_level = max98088_set_bias_level, .suspend_bias_off = true,

.component_driver = { + .probe = max98088_probe, + .remove = max98088_remove, .controls = max98088_snd_controls, .num_controls = ARRAY_SIZE(max98088_snd_controls), .dapm_widgets = max98088_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/hdac_hdmi.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 4e181b2..b9d1f5c 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -1459,8 +1459,9 @@ int hdac_hdmi_jack_init(struct snd_soc_dai *dai, int device) } EXPORT_SYMBOL_GPL(hdac_hdmi_jack_init);

-static int hdmi_codec_probe(struct snd_soc_codec *codec) +static int hdmi_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct hdac_ext_device *edev = snd_soc_codec_get_drvdata(codec); struct hdac_hdmi_priv *hdmi = edev->private_data; struct snd_soc_dapm_context *dapm = @@ -1512,12 +1513,12 @@ static int hdmi_codec_probe(struct snd_soc_codec *codec) return 0; }

-static int hdmi_codec_remove(struct snd_soc_codec *codec) +static void hdmi_codec_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct hdac_ext_device *edev = snd_soc_codec_get_drvdata(codec);

pm_runtime_disable(&edev->hdac.dev); - return 0; }

#ifdef CONFIG_PM @@ -1571,9 +1572,11 @@ static void hdmi_codec_complete(struct device *dev) #endif

static struct snd_soc_codec_driver hdmi_hda_codec = { - .probe = hdmi_codec_probe, - .remove = hdmi_codec_remove, .idle_bias_off = true, + .component_driver = { + .probe = hdmi_codec_probe, + .remove = hdmi_codec_remove, + }, };

static void hdac_hdmi_get_chmap(struct hdac_device *hdac, int pcm_idx,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/da7219.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index b6411bd..31cf5e8 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -1630,8 +1630,9 @@ static struct reg_sequence da7219_rev_aa_patch[] = { { DA7219_REFERENCES, 0x08 }, };

-static int da7219_probe(struct snd_soc_codec *codec) +static int da7219_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct da7219_priv *da7219 = snd_soc_codec_get_drvdata(codec); unsigned int rev; int ret; @@ -1718,14 +1719,15 @@ err_disable_reg: return ret; }

-static int da7219_remove(struct snd_soc_codec *codec) +static void da7219_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct da7219_priv *da7219 = snd_soc_codec_get_drvdata(codec);

da7219_aad_exit(codec);

/* Supplies */ - return regulator_bulk_disable(DA7219_NUM_SUPPLIES, da7219->supplies); + regulator_bulk_disable(DA7219_NUM_SUPPLIES, da7219->supplies); }

#ifdef CONFIG_PM @@ -1761,13 +1763,13 @@ static int da7219_resume(struct snd_soc_codec *codec) #endif

static struct snd_soc_codec_driver soc_codec_dev_da7219 = { - .probe = da7219_probe, - .remove = da7219_remove, .suspend = da7219_suspend, .resume = da7219_resume, .set_bias_level = da7219_set_bias_level,

.component_driver = { + .probe = da7219_probe, + .remove = da7219_remove, .controls = da7219_snd_controls, .num_controls = ARRAY_SIZE(da7219_snd_controls), .dapm_widgets = da7219_dapm_widgets,

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch removes codec side .probe/.remove

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- include/sound/soc.h | 2 -- sound/soc/soc-core.c | 18 ------------------ 2 files changed, 20 deletions(-)

diff --git a/include/sound/soc.h b/include/sound/soc.h index 5eb2b38..ee1d361 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -892,8 +892,6 @@ struct snd_soc_codec { struct snd_soc_codec_driver {

/* driver ops */ - int (*probe)(struct snd_soc_codec *); - int (*remove)(struct snd_soc_codec *); int (*suspend)(struct snd_soc_codec *); int (*resume)(struct snd_soc_codec *); struct snd_soc_component_driver component_driver; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index edba975..3e2f0b0 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3262,20 +3262,6 @@ static void fixup_codec_formats(struct snd_soc_pcm_stream *stream) stream->formats |= codec_format_map[i]; }

-static int snd_soc_codec_drv_probe(struct snd_soc_component *component) -{ - struct snd_soc_codec *codec = snd_soc_component_to_codec(component); - - return codec->driver->probe(codec); -} - -static void snd_soc_codec_drv_remove(struct snd_soc_component *component) -{ - struct snd_soc_codec *codec = snd_soc_component_to_codec(component); - - codec->driver->remove(codec); -} - static int snd_soc_codec_drv_write(struct snd_soc_component *component, unsigned int reg, unsigned int val) { @@ -3333,10 +3319,6 @@ int snd_soc_register_codec(struct device *dev, if (ret) goto err_free;

- if (codec_drv->probe) - codec->component.probe = snd_soc_codec_drv_probe; - if (codec_drv->remove) - codec->component.remove = snd_soc_codec_drv_remove; if (codec_drv->write) codec->component.write = snd_soc_codec_drv_write; if (codec_drv->read)