leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

w1: omap_hdq: Fix some error/debug handling.

Browse Source 
- some debug messages missed spaces
- sometimes no error was returned when it should have been
- sometimes a message is printed when there is no error, rather
  than when there is one.

Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
NeilBrown 2012-05-22 09:43:02 +10:00 committed by Greg Kroah-Hartman
parent dd0aa67cd7
commit 7b5362a603
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/w1/masters/omap_hdq.c
View File

@ -180,6 +180,7 @@ static int hdq_write_byte(struct hdq_data *hdq_data, u8 val, u8 *status)
hdq_data->hdq_irqstatus, OMAP_HDQ_TIMEOUT); hdq_data->hdq_irqstatus, OMAP_HDQ_TIMEOUT);
if (ret == 0) { if (ret == 0) {
dev_dbg(hdq_data->dev, "TX wait elapsed\n"); dev_dbg(hdq_data->dev, "TX wait elapsed\n");
ret = -ETIMEDOUT;
goto out; goto out;
} }
@ -187,7 +188,7 @@ static int hdq_write_byte(struct hdq_data *hdq_data, u8 val, u8 *status)
/* check irqstatus */ /* check irqstatus */
if (!(*status & OMAP_HDQ_INT_STATUS_TXCOMPLETE)) { if (!(*status & OMAP_HDQ_INT_STATUS_TXCOMPLETE)) {
dev_dbg(hdq_data->dev, "timeout waiting for" dev_dbg(hdq_data->dev, "timeout waiting for"
"TXCOMPLETE/RXCOMPLETE, %x", *status); " TXCOMPLETE/RXCOMPLETE, %x", *status);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
goto out; goto out;
} }
@ -198,7 +199,7 @@ static int hdq_write_byte(struct hdq_data *hdq_data, u8 val, u8 *status)
OMAP_HDQ_FLAG_CLEAR, &tmp_status); OMAP_HDQ_FLAG_CLEAR, &tmp_status);
if (ret) { if (ret) {
dev_dbg(hdq_data->dev, "timeout waiting GO bit" dev_dbg(hdq_data->dev, "timeout waiting GO bit"
"return to zero, %x", tmp_status); " return to zero, %x", tmp_status);
} }
out: out:
@ -341,7 +342,7 @@ static int omap_hdq_break(struct hdq_data *hdq_data)
&tmp_status); &tmp_status);
if (ret) if (ret)
dev_dbg(hdq_data->dev, "timeout waiting INIT&GO bits" dev_dbg(hdq_data->dev, "timeout waiting INIT&GO bits"
"return to zero, %x", tmp_status); " return to zero, %x", tmp_status);
out: out:
mutex_unlock(&hdq_data->hdq_mutex); mutex_unlock(&hdq_data->hdq_mutex);
@ -386,7 +387,7 @@ static int hdq_read_byte(struct hdq_data *hdq_data, u8 *val)
/* check irqstatus */ /* check irqstatus */
if (!(status & OMAP_HDQ_INT_STATUS_RXCOMPLETE)) { if (!(status & OMAP_HDQ_INT_STATUS_RXCOMPLETE)) {
dev_dbg(hdq_data->dev, "timeout waiting for" dev_dbg(hdq_data->dev, "timeout waiting for"
"RXCOMPLETE, %x", status); " RXCOMPLETE, %x", status);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
goto out; goto out;
} }
@ -396,7 +397,7 @@ static int hdq_read_byte(struct hdq_data *hdq_data, u8 *val)
out: out:
mutex_unlock(&hdq_data->hdq_mutex); mutex_unlock(&hdq_data->hdq_mutex);
rtn: rtn:
return 0; return ret;
} }
@ -470,7 +471,7 @@ static int omap_hdq_put(struct hdq_data *hdq_data)
if (0 == hdq_data->hdq_usecount) { if (0 == hdq_data->hdq_usecount) {
dev_dbg(hdq_data->dev, "attempt to decrement use count" dev_dbg(hdq_data->dev, "attempt to decrement use count"
"when it is zero"); " when it is zero");
ret = -EINVAL; ret = -EINVAL;
} else { } else {
hdq_data->hdq_usecount--; hdq_data->hdq_usecount--;
@ -540,7 +541,7 @@ static void omap_w1_write_byte(void *_hdq, u8 byte)
mutex_unlock(&hdq_data->hdq_mutex); mutex_unlock(&hdq_data->hdq_mutex);
ret = hdq_write_byte(hdq_data, byte, &status); ret = hdq_write_byte(hdq_data, byte, &status);
if (ret == 0) { if (ret < 0) {
dev_dbg(hdq_data->dev, "TX failure:Ctrl status %x\n", status); dev_dbg(hdq_data->dev, "TX failure:Ctrl status %x\n", status);
return; return;
} }