From: SF Markus Elfring <elfring@users.sourceforge.net>
To: linux-media@vger.kernel.org,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Max Kellermann <max.kellermann@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 1/6] [media] tda8261: Use common error handling code in tda8261_set_params()
Date: Tue, 26 Sep 2017 11:27:47 +0000 [thread overview]
Message-ID: <28425caf-2736-96ae-00a7-3fb273b1f9d5@users.sourceforge.net> (raw)
In-Reply-To: <15d74bee-7467-4687-24e1-3501c22f6d75@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 26 Sep 2017 11:01:44 +0200
* Add a jump target so that a bit of exception handling can be better
reused at the end of this function.
This issue was detected by using the Coccinelle software.
* The script "checkpatch.pl" pointed information out like the following.
ERROR: do not use assignment in if condition
Thus fix an affected source code place.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/media/dvb-frontends/tda8261.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/drivers/media/dvb-frontends/tda8261.c b/drivers/media/dvb-frontends/tda8261.c
index 4eb294f330bc..5a8a9b6b8107 100644
--- a/drivers/media/dvb-frontends/tda8261.c
+++ b/drivers/media/dvb-frontends/tda8261.c
@@ -129,18 +129,18 @@ static int tda8261_set_params(struct dvb_frontend *fe)
/* Set params */
err = tda8261_write(state, buf);
- if (err < 0) {
- pr_err("%s: I/O Error\n", __func__);
- return err;
- }
+ err = tda8261_get_status(fe, &status);
+ if (err < 0)
+ goto report_failure;
+
/* sleep for some time */
pr_debug("%s: Waiting to Phase LOCK\n", __func__);
msleep(20);
/* check status */
- if ((err = tda8261_get_status(fe, &status)) < 0) {
- pr_err("%s: I/O Error\n", __func__);
- return err;
- }
+ err = tda8261_get_status(fe, &status);
+ if (err < 0)
+ goto report_failure;
+
if (status = 1) {
pr_debug("%s: Tuner Phase locked: status=%d\n", __func__,
status);
@@ -150,6 +150,10 @@ static int tda8261_set_params(struct dvb_frontend *fe)
}
return 0;
+
+report_failure:
+ pr_err("%s: I/O Error\n", __func__);
+ return err;
}
static void tda8261_release(struct dvb_frontend *fe)
--
2.14.1
next prev parent reply other threads:[~2017-09-26 11:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-26 11:26 [PATCH 0/6] [media] TDA8261: Fine-tuning for five function implementations SF Markus Elfring
2017-09-26 11:27 ` SF Markus Elfring [this message]
2017-09-26 11:45 ` [PATCH 1/6] [media] tda8261: Use common error handling code in tda8261_set_params() Christoph Böhmwalder
2017-09-26 16:50 ` SF Markus Elfring
2017-09-26 11:28 ` [PATCH 2/6] [media] tda8261: Improve a size determination in tda8261_attach() SF Markus Elfring
2017-09-26 11:30 ` [PATCH 3/6] [media] tda8261: Return directly after a failed kzalloc() " SF Markus Elfring
2017-09-26 11:32 ` [PATCH 4/6] [media] tda8261: Delete an unnecessary variable initialisation " SF Markus Elfring
2017-09-26 11:33 ` [PATCH 5/6] [media] tda8261: Adjust three function calls together with a variable assignment SF Markus Elfring
2017-09-26 11:34 ` [PATCH 6/6] [media] tda8261: Delete an unnecessary variable initialisation in three functions SF Markus Elfring
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=28425caf-2736-96ae-00a7-3fb273b1f9d5@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=max.kellermann@gmail.com \
--cc=mchehab@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox