lkml.org 
[lkml]   [2020]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RESEND PATCH v1 1/6] staging: greybus: audio: Update snd_jack FW usage as per new APIs
    Date
    snd_soc_jack APIs are modified in recent kernel versions. This patch
    updates the codec driver to resolve the compilation errors related to
    jack framework.

    Signed-off-by: Vaibhav Agarwal <vaibhav.sr@gmail.com>
    ---
    drivers/staging/greybus/audio_codec.c | 59 +++++++++++++++++++++------
    1 file changed, 47 insertions(+), 12 deletions(-)

    diff --git a/drivers/staging/greybus/audio_codec.c b/drivers/staging/greybus/audio_codec.c
    index 08746c85dea6..ebf8484f0ae7 100644
    --- a/drivers/staging/greybus/audio_codec.c
    +++ b/drivers/staging/greybus/audio_codec.c
    @@ -709,17 +709,29 @@ static struct snd_soc_dai_driver gbaudio_dai[] = {
    };

    static int gbaudio_init_jack(struct gbaudio_module_info *module,
    - struct snd_soc_codec *codec)
    + struct snd_soc_card *card)
    {
    int ret;

    + struct snd_soc_jack *jack;
    + struct snd_soc_jack_pin *headset, *button;
    +
    if (!module->jack_mask)
    return 0;

    snprintf(module->jack_name, NAME_SIZE, "GB %d Headset Jack",
    module->dev_id);
    - ret = snd_soc_jack_new(codec, module->jack_name, module->jack_mask,
    - &module->headset_jack);
    +
    + headset = devm_kzalloc(module->dev, sizeof(*headset), GFP_KERNEL);
    + if (!headset)
    + return -ENOMEM;
    +
    + headset->pin = module->jack_name;
    + headset->mask = module->jack_mask;
    + jack = &module->headset_jack;
    +
    + ret = snd_soc_card_jack_new(card, module->jack_name, module->jack_mask,
    + jack, headset, 1);
    if (ret) {
    dev_err(module->dev, "Failed to create new jack\n");
    return ret;
    @@ -730,11 +742,21 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module,

    snprintf(module->button_name, NAME_SIZE, "GB %d Button Jack",
    module->dev_id);
    - ret = snd_soc_jack_new(codec, module->button_name, module->button_mask,
    - &module->button_jack);
    + button = devm_kzalloc(module->dev, sizeof(*headset), GFP_KERNEL);
    + if (!button) {
    + ret = -ENOMEM;
    + goto free_headset;
    + }
    +
    + button->pin = module->button_name;
    + button->mask = module->button_mask;
    + jack = &module->button_jack;
    +
    + ret = snd_soc_card_jack_new(card, module->button_name,
    + module->button_mask, jack, button, 1);
    if (ret) {
    dev_err(module->dev, "Failed to create button jack\n");
    - return ret;
    + goto free_headset;
    }

    /*
    @@ -750,7 +772,7 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module,
    KEY_MEDIA);
    if (ret) {
    dev_err(module->dev, "Failed to set BTN_0\n");
    - return ret;
    + goto free_button;
    }
    }

    @@ -759,7 +781,7 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module,
    KEY_VOICECOMMAND);
    if (ret) {
    dev_err(module->dev, "Failed to set BTN_1\n");
    - return ret;
    + goto free_button;
    }
    }

    @@ -768,7 +790,7 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module,
    KEY_VOLUMEUP);
    if (ret) {
    dev_err(module->dev, "Failed to set BTN_2\n");
    - return ret;
    + goto free_button;
    }
    }

    @@ -777,7 +799,7 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module,
    KEY_VOLUMEDOWN);
    if (ret) {
    dev_err(module->dev, "Failed to set BTN_0\n");
    - return ret;
    + goto free_button;
    }
    }

    @@ -788,6 +810,18 @@ static int gbaudio_init_jack(struct gbaudio_module_info *module,
    */

    return 0;
    +
    +free_button:
    + jack = &module->button_jack;
    + snd_device_free(card->snd_card, jack->jack);
    + list_del(&jack->list);
    +
    +free_headset:
    + jack = &module->headset_jack;
    + snd_device_free(card->snd_card, jack->jack);
    + list_del(&jack->list);
    +
    + return ret;
    }

    int gbaudio_register_module(struct gbaudio_module_info *module)
    @@ -815,7 +849,7 @@ int gbaudio_register_module(struct gbaudio_module_info *module)
    return -EINVAL;
    }

    - ret = gbaudio_init_jack(module, codec);
    + ret = gbaudio_init_jack(module, component->card);
    if (ret) {
    up_write(&card->controls_rwsem);
    return ret;
    @@ -942,7 +976,8 @@ void gbaudio_unregister_module(struct gbaudio_module_info *module)

    #ifdef CONFIG_SND_JACK
    /* free jack devices for this module from codec->jack_list */
    - list_for_each_entry_safe(jack, next_j, &codec->jack_list, list) {
    + list_for_each_entry_safe(jack, next_j, &component->card->jack_list,
    + list) {
    if (jack == &module->headset_jack)
    mask = GBCODEC_JACK_MASK;
    else if (jack == &module->button_jack)
    --
    2.26.2
    \
     
     \ /
      Last update: 2020-06-02 07:24    [W:3.781 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site