lkml.org 
[lkml]   [2022]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 16/20] hda: cs35l41: Reorganize log for playback actions
    Date
    For each case, only log the last regmap access
    so it doesn't get overwritten, and all regmap
    access should show the same issues.
    Change to dev_err to log this error.

    Also, differentiate between a regmap access
    failure and invalid playback action.

    Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com>
    ---
    sound/pci/hda/cs35l41_hda.c | 15 +++++++--------
    1 file changed, 7 insertions(+), 8 deletions(-)

    diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c
    index 08ce9b8005ec..fda4af323c32 100644
    --- a/sound/pci/hda/cs35l41_hda.c
    +++ b/sound/pci/hda/cs35l41_hda.c
    @@ -144,10 +144,9 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action)

    switch (action) {
    case HDA_GEN_PCM_ACT_OPEN:
    - ret = regmap_multi_reg_write(reg, cs35l41_hda_config,
    - ARRAY_SIZE(cs35l41_hda_config));
    - regmap_update_bits(reg, CS35L41_PWR_CTRL2,
    - CS35L41_AMP_EN_MASK, 1 << CS35L41_AMP_EN_SHIFT);
    + regmap_multi_reg_write(reg, cs35l41_hda_config, ARRAY_SIZE(cs35l41_hda_config));
    + ret = regmap_update_bits(reg, CS35L41_PWR_CTRL2,
    + CS35L41_AMP_EN_MASK, 1 << CS35L41_AMP_EN_SHIFT);
    break;
    case HDA_GEN_PCM_ACT_PREPARE:
    ret = cs35l41_hda_global_enable(cs35l41, 1);
    @@ -157,16 +156,16 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action)
    ret = cs35l41_hda_global_enable(cs35l41, 0);
    break;
    case HDA_GEN_PCM_ACT_CLOSE:
    - regmap_update_bits(reg, CS35L41_PWR_CTRL2,
    - CS35L41_AMP_EN_MASK, 0 << CS35L41_AMP_EN_SHIFT);
    + ret = regmap_update_bits(reg, CS35L41_PWR_CTRL2,
    + CS35L41_AMP_EN_MASK, 0 << CS35L41_AMP_EN_SHIFT);
    break;
    default:
    - ret = -EINVAL;
    + dev_warn(cs35l41->dev, "Playback action not supported: %d\n", action);
    break;
    }

    if (ret)
    - dev_warn(cs35l41->dev, "Failed to apply multi reg write: %d\n", ret);
    + dev_err(cs35l41->dev, "Regmap access fail: %d\n", ret);
    }

    static int cs35l41_hda_channel_map(struct device *dev, unsigned int tx_num, unsigned int *tx_slot,
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-03-04 16:09    [W:4.276 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site