On 09.02.2023 10:37, Lucas Tanure wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> Add cs35l41_error_release function to handle error release sequences.
>
> Signed-off-by: Lucas Tanure <lucas.tanure@xxxxxxxxxxxxx>
> Acked-by: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxx>
> ---
> sound/soc/codecs/cs35l41.c | 64 ++++++++++----------------------------
> 1 file changed, 16 insertions(+), 48 deletions(-)
>
> diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c
> index f2b5032daa6a..c006364e5335 100644
> --- a/sound/soc/codecs/cs35l41.c
> +++ b/sound/soc/codecs/cs35l41.c
> @@ -369,6 +369,16 @@ static void cs35l41_boost_enable(struct cs35l41_private *cs35l41, unsigned int e
> }
> }
>
> +
There is one extra line here.
> +static void cs35l41_error_release(struct cs35l41_private *cs35l41, unsigned int irq_err_bit,
> + unsigned int rel_err_bit)
> +{
> + regmap_write(cs35l41->regmap, CS35L41_IRQ1_STATUS1, irq_err_bit);
> + regmap_write(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN, 0);
> + regmap_update_bits(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN, rel_err_bit, rel_err_bit);
> + regmap_update_bits(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN, rel_err_bit, 0);
> +}
> +
> static irqreturn_t cs35l41_irq(int irq, void *data)
> {
> struct cs35l41_private *cs35l41 = data;
> @@ -405,54 +415,26 @@ static irqreturn_t cs35l41_irq(int irq, void *data)
> */
> if (status[0] & CS35L41_AMP_SHORT_ERR) {
> dev_crit_ratelimited(cs35l41->dev, "Amp short error\n");
> - regmap_write(cs35l41->regmap, CS35L41_IRQ1_STATUS1,
> - CS35L41_AMP_SHORT_ERR);
> - regmap_write(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN, 0);
> - regmap_update_bits(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN,
> - CS35L41_AMP_SHORT_ERR_RLS,
> - CS35L41_AMP_SHORT_ERR_RLS);
> - regmap_update_bits(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN,
> - CS35L41_AMP_SHORT_ERR_RLS, 0);
> + cs35l41_error_release(cs35l41, CS35L41_AMP_SHORT_ERR, CS35L41_AMP_SHORT_ERR_RLS);
> ret = IRQ_HANDLED;
> }
>
> if (status[0] & CS35L41_TEMP_WARN) {
> dev_crit_ratelimited(cs35l41->dev, "Over temperature warning\n");
> - regmap_write(cs35l41->regmap, CS35L41_IRQ1_STATUS1,
> - CS35L41_TEMP_WARN);
> - regmap_write(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN, 0);
> - regmap_update_bits(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN,
> - CS35L41_TEMP_WARN_ERR_RLS,
> - CS35L41_TEMP_WARN_ERR_RLS);
> - regmap_update_bits(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN,
> - CS35L41_TEMP_WARN_ERR_RLS, 0);
> + cs35l41_error_release(cs35l41, CS35L41_TEMP_WARN, CS35L41_TEMP_WARN_ERR_RLS);
> ret = IRQ_HANDLED;
> }
>
> if (status[0] & CS35L41_TEMP_ERR) {
> dev_crit_ratelimited(cs35l41->dev, "Over temperature error\n");
> - regmap_write(cs35l41->regmap, CS35L41_IRQ1_STATUS1,
> - CS35L41_TEMP_ERR);
> - regmap_write(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN, 0);
> - regmap_update_bits(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN,
> - CS35L41_TEMP_ERR_RLS,
> - CS35L41_TEMP_ERR_RLS);
> - regmap_update_bits(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN,
> - CS35L41_TEMP_ERR_RLS, 0);
> + cs35l41_error_release(cs35l41, CS35L41_TEMP_ERR, CS35L41_TEMP_ERR_RLS);
> ret = IRQ_HANDLED;
> }
>
> if (status[0] & CS35L41_BST_OVP_ERR) {
> dev_crit_ratelimited(cs35l41->dev, "VBST Over Voltage error\n");
> cs35l41_boost_enable(cs35l41, 0);
> - regmap_write(cs35l41->regmap, CS35L41_IRQ1_STATUS1,
> - CS35L41_BST_OVP_ERR);
> - regmap_write(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN, 0);
> - regmap_update_bits(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN,
> - CS35L41_BST_OVP_ERR_RLS,
> - CS35L41_BST_OVP_ERR_RLS);
> - regmap_update_bits(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN,
> - CS35L41_BST_OVP_ERR_RLS, 0);
> + cs35l41_error_release(cs35l41, CS35L41_BST_OVP_ERR, CS35L41_BST_OVP_ERR_RLS);
> cs35l41_boost_enable(cs35l41, 1);
> ret = IRQ_HANDLED;
> }
> @@ -460,14 +442,7 @@ static irqreturn_t cs35l41_irq(int irq, void *data)
> if (status[0] & CS35L41_BST_DCM_UVP_ERR) {
> dev_crit_ratelimited(cs35l41->dev, "DCM VBST Under Voltage Error\n");
> cs35l41_boost_enable(cs35l41, 0);
> - regmap_write(cs35l41->regmap, CS35L41_IRQ1_STATUS1,
> - CS35L41_BST_DCM_UVP_ERR);
> - regmap_write(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN, 0);
> - regmap_update_bits(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN,
> - CS35L41_BST_UVP_ERR_RLS,
> - CS35L41_BST_UVP_ERR_RLS);
> - regmap_update_bits(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN,
> - CS35L41_BST_UVP_ERR_RLS, 0);
> + cs35l41_error_release(cs35l41, CS35L41_BST_DCM_UVP_ERR, CS35L41_BST_UVP_ERR_RLS);
> cs35l41_boost_enable(cs35l41, 1);
> ret = IRQ_HANDLED;
> }
> @@ -475,14 +450,7 @@ static irqreturn_t cs35l41_irq(int irq, void *data)
> if (status[0] & CS35L41_BST_SHORT_ERR) {
> dev_crit_ratelimited(cs35l41->dev, "LBST error: powering off!\n");
> cs35l41_boost_enable(cs35l41, 0);
> - regmap_write(cs35l41->regmap, CS35L41_IRQ1_STATUS1,
> - CS35L41_BST_SHORT_ERR);
> - regmap_write(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN, 0);
> - regmap_update_bits(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN,
> - CS35L41_BST_SHORT_ERR_RLS,
> - CS35L41_BST_SHORT_ERR_RLS);
> - regmap_update_bits(cs35l41->regmap, CS35L41_PROTECT_REL_ERR_IGN,
> - CS35L41_BST_SHORT_ERR_RLS, 0);
> + cs35l41_error_release(cs35l41, CS35L41_BST_SHORT_ERR, CS35L41_BST_SHORT_ERR_RLS);
> cs35l41_boost_enable(cs35l41, 1);
> ret = IRQ_HANDLED;
> }
> --
> 2.39.1
>
