From: Richard Weinberger <richard@nod.at>
To: jic23@kernel.org
Cc: harald@ccbib.org, knaack.h@gmx.de, lars@metafoo.de,
pmeerw@pmeerw.net, sanjeev_sharma@mentor.com,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
Richard Weinberger <richard@nod.at>
Subject: [PATCH 3/4] iio: dht11: Logging updates
Date: Wed, 3 Dec 2014 00:32:55 +0100 [thread overview]
Message-ID: <1417563176-31972-4-git-send-email-richard@nod.at> (raw)
In-Reply-To: <1417563176-31972-1-git-send-email-richard@nod.at>
Currently the driver uses pr_* and dev_* functions.
Change all logging functions to dev_* style to be consistent
and have the correct device prefix in all messages.
This change set also adds new messages to diagnose issues.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
drivers/iio/humidity/dht11.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/iio/humidity/dht11.c b/drivers/iio/humidity/dht11.c
index 0023699..fbcd7cb 100644
--- a/drivers/iio/humidity/dht11.c
+++ b/drivers/iio/humidity/dht11.c
@@ -96,20 +96,22 @@ static int dht11_decode(struct dht11 *dht11, int offset)
timeres = t;
}
if (2*timeres > DHT11_DATA_BIT_HIGH) {
- pr_err("dht11: timeresolution %d too bad for decoding\n",
+ dev_err(dht11->dev, "timeresolution %d too bad for decoding\n",
timeres);
return -EIO;
}
threshold = DHT11_DATA_BIT_HIGH / timeres;
if (DHT11_DATA_BIT_LOW/timeres + 1 >= threshold)
- pr_err("dht11: WARNING: decoding ambiguous\n");
+ dev_err(dht11->dev, "decoding ambiguous\n");
/* scale down with timeres and check validity */
for (i = 0; i < DHT11_BITS_PER_READ; ++i) {
t = dht11->edges[offset + 2*i + 2].ts -
dht11->edges[offset + 2*i + 1].ts;
- if (!dht11->edges[offset + 2*i + 1].value)
- return -EIO; /* lost synchronisation */
+ if (!dht11->edges[offset + 2*i + 1].value) {
+ dev_err(dht11->dev, "lost synchronisation\n");
+ return -EIO;
+ }
timing[i] = t / timeres;
}
@@ -119,8 +121,10 @@ static int dht11_decode(struct dht11 *dht11, int offset)
temp_dec = dht11_decode_byte(&timing[24], threshold);
checksum = dht11_decode_byte(&timing[32], threshold);
- if (((hum_int + hum_dec + temp_int + temp_dec) & 0xff) != checksum)
+ if (((hum_int + hum_dec + temp_int + temp_dec) & 0xff) != checksum) {
+ dev_err(dht11->dev, "invalid checksum\n");
return -EIO;
+ }
dht11->timestamp = iio_get_time_ns();
if (hum_int < 20) { /* DHT22 */
@@ -193,7 +197,7 @@ static int dht11_read_raw(struct iio_dev *iio_dev,
free_irq(dht11->irq, iio_dev);
if (ret == 0 && dht11->num_edges < DHT11_EDGES_PER_READ - 1) {
- dev_err(&iio_dev->dev,
+ dev_err(dht11->dev,
"Only %d signal edges detected\n",
dht11->num_edges);
ret = -ETIMEDOUT;
--
1.8.4.5
next prev parent reply other threads:[~2014-12-02 23:32 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-02 23:32 iio: dht11 Updates Richard Weinberger
2014-12-02 23:32 ` [PATCH 1/4] iio: dht11: Add locking Richard Weinberger
2014-12-14 12:31 ` Hartmut Knaack
2014-12-14 14:06 ` Richard Weinberger
2014-12-02 23:32 ` [PATCH 2/4] iio: dht11: IRQ fixes Richard Weinberger
2014-12-02 23:35 ` Richard Weinberger
2014-12-06 17:21 ` harald
2014-12-02 23:32 ` Richard Weinberger [this message]
2014-12-03 12:58 ` [PATCH 3/4] iio: dht11: Logging updates Harald Geyer
2014-12-03 13:11 ` Richard Weinberger
2014-12-03 13:56 ` Harald Geyer
2014-12-03 21:30 ` Richard Weinberger
2014-12-04 14:25 ` Harald Geyer
2014-12-02 23:32 ` [PATCH 4/4] iio: dht11: Fix out-of-bounds read Richard Weinberger
2014-12-14 12:32 ` Hartmut Knaack
2014-12-03 12:18 ` iio: dht11 Updates Harald Geyer
2014-12-03 13:15 ` Richard Weinberger
2014-12-03 14:08 ` Harald Geyer
2014-12-03 14:29 ` Richard Weinberger
2014-12-03 22:05 ` Richard Weinberger
2014-12-04 13:45 ` Harald Geyer
2014-12-04 14:15 ` Richard Weinberger
2014-12-03 20:20 ` Richard Weinberger
2014-12-04 16:08 ` Harald Geyer
2015-01-01 12:38 ` Jonathan Cameron
2015-01-01 21:18 ` harald
2015-01-02 11:28 ` Richard Weinberger
2015-01-04 11:01 ` Jonathan Cameron
2015-01-05 13:49 ` [PATCHv2 1/3] iio: dht11: Fix out-of-bounds read Harald Geyer
2015-01-05 13:55 ` Richard Weinberger
2015-01-06 5:39 ` sanjeev sharma
2015-01-07 12:15 ` [PATCHv2 1/3,RESEND] " Harald Geyer
2015-01-10 11:14 ` Jonathan Cameron
2015-01-10 18:39 ` Richard Weinberger
2015-01-12 11:26 ` Harald Geyer
2015-01-12 11:27 ` Richard Weinberger
2015-01-07 12:18 ` [PATCHv2 2/3,RESEND] iio: dht11: Add locking Harald Geyer
2015-01-10 11:16 ` Jonathan Cameron
2015-02-22 10:44 ` Richard Weinberger
2015-02-25 12:01 ` Jonathan Cameron
2015-01-07 12:22 ` [PATCHv2 3/3,RESEND] iio: dht11: IRQ fixes Harald Geyer
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=1417563176-31972-4-git-send-email-richard@nod.at \
--to=richard@nod.at \
--cc=harald@ccbib.org \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
--cc=sanjeev_sharma@mentor.com \
/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;
as well as URLs for NNTP newsgroup(s).