diff options
| author | Vaibhav Agarwal <vaibhav.agarwal@linaro.org> | 2016-09-01 11:38:38 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2016-09-02 14:13:39 +0200 |
| commit | 79c222bcb72789456076a26a9bad2acc62cb2cdc (patch) | |
| tree | bfa06a6a4722d1b75adc81bb9ab87df29bae379b /drivers | |
| parent | 1f3e09e759061f803b03039070605b5a524da547 (diff) | |
greybus: audio: Remove unnecessary num_jack field from module_info
snd_jack will be registered based on real capabilities shared by
module's FW instead of parsing widgets and register it with fixed
capabilities. Remove module_info->num_jack, since it is no more
required.
Signed-off-by: Vaibhav Agarwal <vaibhav.agarwal@linaro.org>
Reviewed-by: Mark Greer <mgreer@animalcreek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/greybus/audio_codec.c | 9 | ||||
| -rw-r--r-- | drivers/staging/greybus/audio_codec.h | 1 | ||||
| -rw-r--r-- | drivers/staging/greybus/audio_topology.c | 1 |
3 files changed, 0 insertions, 11 deletions
diff --git a/drivers/staging/greybus/audio_codec.c b/drivers/staging/greybus/audio_codec.c index 6ebde18a5a53..810ac6269cff 100644 --- a/drivers/staging/greybus/audio_codec.c +++ b/drivers/staging/greybus/audio_codec.c @@ -707,15 +707,6 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module, { int ret; - if (!module->num_jacks) - return 0; - - /* register jack(s) in case any */ - if (module->num_jacks > 1) { - dev_err(module->dev, "Currently supports max=1 jack\n"); - return -EINVAL; - } - snprintf(module->jack_name, NAME_SIZE, "GB %d Headset Jack", module->dev_id); ret = snd_soc_jack_new(codec, module->jack_name, GBCODEC_JACK_MASK, diff --git a/drivers/staging/greybus/audio_codec.h b/drivers/staging/greybus/audio_codec.h index 0153809e72ab..5a397b0a1886 100644 --- a/drivers/staging/greybus/audio_codec.h +++ b/drivers/staging/greybus/audio_codec.h @@ -175,7 +175,6 @@ struct gbaudio_module_info { /* jack related */ char jack_name[NAME_SIZE]; char button_name[NAME_SIZE]; - int num_jacks; int jack_type; int button_status; struct snd_soc_jack headset_jack; diff --git a/drivers/staging/greybus/audio_topology.c b/drivers/staging/greybus/audio_topology.c index e54078ad0583..e2fc186756a7 100644 --- a/drivers/staging/greybus/audio_topology.c +++ b/drivers/staging/greybus/audio_topology.c @@ -1065,7 +1065,6 @@ static int gbaudio_tplg_create_widget(struct gbaudio_module_info *module, case snd_soc_dapm_hp: *dw = (struct snd_soc_dapm_widget) SND_SOC_DAPM_HP(w->name, gbcodec_event_hp); - module->num_jacks++; module->op_devices |= (GBAUDIO_DEVICE_OUT_WIRED_HEADSET | GBAUDIO_DEVICE_OUT_WIRED_HEADPHONE); module->ip_devices |= GBAUDIO_DEVICE_IN_WIRED_HEADSET; |