From: Tzung-Bi Shih <tzungbi@google.com>
To: broonie@kernel.org
Cc: tzungbi@google.com, alsa-devel@alsa-project.org
Subject: [PATCH 1/6] ASoC: rt5682: simplify assertions
Date: Thu, 30 Apr 2020 16:22:26 +0800 [thread overview]
Message-ID: <20200430082231.151127-2-tzungbi@google.com> (raw)
In-Reply-To: <20200430082231.151127-1-tzungbi@google.com>
Simplifies assertions for errors.
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
sound/soc/codecs/rt5682.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c
index d36f560ad7a8..e542aab46619 100644
--- a/sound/soc/codecs/rt5682.c
+++ b/sound/soc/codecs/rt5682.c
@@ -3462,7 +3462,7 @@ int rt5682_io_init(struct device *dev, struct sdw_slave *slave)
ret = regmap_multi_reg_write(rt5682->regmap, patch_list,
ARRAY_SIZE(patch_list));
- if (ret != 0)
+ if (ret)
dev_warn(dev, "Failed to apply regmap patch: %d\n", ret);
regmap_write(rt5682->regmap, RT5682_DEPOP_1, 0x0000);
@@ -3536,8 +3536,7 @@ static int rt5682_i2c_probe(struct i2c_client *i2c,
rt5682 = devm_kzalloc(&i2c->dev, sizeof(struct rt5682_priv),
GFP_KERNEL);
-
- if (rt5682 == NULL)
+ if (!rt5682)
return -ENOMEM;
i2c_set_clientdata(i2c, rt5682);
@@ -3562,14 +3561,14 @@ static int rt5682_i2c_probe(struct i2c_client *i2c,
ret = devm_regulator_bulk_get(&i2c->dev, ARRAY_SIZE(rt5682->supplies),
rt5682->supplies);
- if (ret != 0) {
+ if (ret) {
dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret);
return ret;
}
ret = regulator_bulk_enable(ARRAY_SIZE(rt5682->supplies),
rt5682->supplies);
- if (ret != 0) {
+ if (ret) {
dev_err(&i2c->dev, "Failed to enable supplies: %d\n", ret);
return ret;
}
@@ -3599,7 +3598,7 @@ static int rt5682_i2c_probe(struct i2c_client *i2c,
ret = regmap_multi_reg_write(rt5682->regmap, patch_list,
ARRAY_SIZE(patch_list));
- if (ret != 0)
+ if (ret)
dev_warn(&i2c->dev, "Failed to apply regmap patch: %d\n", ret);
regmap_write(rt5682->regmap, RT5682_DEPOP_1, 0x0000);
--
2.26.2.303.gf8c07b1a785-goog
next prev parent reply other threads:[~2020-04-30 8:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-30 8:22 [PATCH 0/6] ASoC: rt5682: apply some refactors Tzung-Bi Shih
2020-04-30 8:22 ` Tzung-Bi Shih [this message]
2020-04-30 8:22 ` [PATCH 2/6] ASoC: rt5682: fix space issues Tzung-Bi Shih
2020-04-30 8:22 ` [PATCH 3/6] ASoC: rt5682: remove empty default case Tzung-Bi Shih
2020-04-30 8:22 ` [PATCH 4/6] ASoC: rt5682: replace message printing from pr_() to dev_() Tzung-Bi Shih
2020-04-30 8:22 ` [PATCH 5/6] ASoC: rt5682: remove duplicate rt5682_reset() calls Tzung-Bi Shih
2020-04-30 8:22 ` [PATCH 6/6] ASoC: rt5682: remove unwanted btn_type assignment Tzung-Bi Shih
2020-04-30 13:40 ` [PATCH 0/6] ASoC: rt5682: apply some refactors Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200430082231.151127-2-tzungbi@google.com \
--to=tzungbi@google.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.