diff options
| author | Vaibhav Agarwal | 2016-09-01 08:08:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-09-02 14:13:39 +0200 |
| commit | 79c222bcb72789456076a26a9bad2acc62cb2cdc (patch) | |
| tree | bfa06a6a4722d1b75adc81bb9ab87df29bae379b /drivers/staging/greybus/audio_codec.c | |
| parent | greybus: svc: fix timeout indentation (diff) | |
| download | kernel-qcow2-linux-79c222bcb72789456076a26a9bad2acc62cb2cdc.tar.gz kernel-qcow2-linux-79c222bcb72789456076a26a9bad2acc62cb2cdc.tar.xz kernel-qcow2-linux-79c222bcb72789456076a26a9bad2acc62cb2cdc.zip | |
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/staging/greybus/audio_codec.c')
| -rw-r--r-- | drivers/staging/greybus/audio_codec.c | 9 |
1 files changed, 0 insertions, 9 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, |