diff options
author | Vaibhav Agarwal <vaibhav.sr@gmail.com> | 2020-07-09 15:57:18 +0530 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-29 16:40:08 +0200 |
commit | ac40b4d1e409971fe40e69761d0c80ffbbb21938 (patch) | |
tree | 60aeeb54bb1b3104d62114254925cf4cdc9f36c3 /drivers/staging/greybus/audio_module.c | |
parent | b503aef30e45ad29f8dd7f53e22240ea6e527590 (diff) |
staging: greybus: audio: Maintain jack list within GB Audio module
As per the current implementation for GB codec driver, a jack list is
maintained for each module. And it expects the list to be populated by
the snd_soc_jack structure which would require modifications in
mainstream code.
However, this is not a necessary requirement and the list can be easily
maintained within gbaudio_module_info as well. This patch provides the
relevant changes for the same.
Signed-off-by: Vaibhav Agarwal <vaibhav.sr@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/4ee030af7a8e203f89a6e513313e36f4e2991e5b.1594290158.git.vaibhav.sr@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/greybus/audio_module.c')
-rw-r--r-- | drivers/staging/greybus/audio_module.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/staging/greybus/audio_module.c b/drivers/staging/greybus/audio_module.c index 300a2b4f3fc7..16f60256adb2 100644 --- a/drivers/staging/greybus/audio_module.c +++ b/drivers/staging/greybus/audio_module.c @@ -21,8 +21,8 @@ static int gbaudio_request_jack(struct gbaudio_module_info *module, struct gb_audio_jack_event_request *req) { int report; - struct snd_jack *jack = module->headset_jack.jack; - struct snd_jack *btn_jack = module->button_jack.jack; + struct snd_jack *jack = module->headset.jack.jack; + struct snd_jack *btn_jack = module->button.jack.jack; if (!jack) { dev_err_ratelimited(module->dev, @@ -38,11 +38,11 @@ static int gbaudio_request_jack(struct gbaudio_module_info *module, if (req->event == GB_AUDIO_JACK_EVENT_REMOVAL) { module->jack_type = 0; if (btn_jack && module->button_status) { - snd_soc_jack_report(&module->button_jack, 0, + snd_soc_jack_report(&module->button.jack, 0, module->button_mask); module->button_status = 0; } - snd_soc_jack_report(&module->headset_jack, 0, + snd_soc_jack_report(&module->headset.jack, 0, module->jack_mask); return 0; } @@ -61,7 +61,7 @@ static int gbaudio_request_jack(struct gbaudio_module_info *module, module->jack_type, report); module->jack_type = report; - snd_soc_jack_report(&module->headset_jack, report, module->jack_mask); + snd_soc_jack_report(&module->headset.jack, report, module->jack_mask); return 0; } @@ -70,7 +70,7 @@ static int gbaudio_request_button(struct gbaudio_module_info *module, struct gb_audio_button_event_request *req) { int soc_button_id, report; - struct snd_jack *btn_jack = module->button_jack.jack; + struct snd_jack *btn_jack = module->button.jack.jack; if (!btn_jack) { dev_err_ratelimited(module->dev, @@ -124,7 +124,7 @@ static int gbaudio_request_button(struct gbaudio_module_info *module, module->button_status = report; - snd_soc_jack_report(&module->button_jack, report, module->button_mask); + snd_soc_jack_report(&module->button.jack, report, module->button_mask); return 0; } @@ -258,6 +258,7 @@ static int gb_audio_probe(struct gb_bundle *bundle, INIT_LIST_HEAD(&gbmodule->widget_list); INIT_LIST_HEAD(&gbmodule->ctl_list); INIT_LIST_HEAD(&gbmodule->widget_ctl_list); + INIT_LIST_HEAD(&gbmodule->jack_list); gbmodule->dev = dev; snprintf(gbmodule->name, NAME_SIZE, "%s.%s", dev->driver->name, dev_name(dev)); |