Skip to content

Commit

Permalink
ds1wm: report bus reset error
Browse files Browse the repository at this point in the history
The patch replaces dev_dbg() by dev_err(), so the user could actually see the
error, instead of wondering why w1 doesn't work.  The root cause of the bus
reset error isn't yet debugged though, but this sometimes happens on iPaq
H5555.

And while I'm at it, some cosmetic cleanups also made (few lines were using
spaces instead of tabs).

Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Acked-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Anton Vorontsov authored and Linus Torvalds committed Mar 5, 2008
1 parent fbc357d commit daa49ff
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions drivers/w1/masters/ds1wm.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@ struct ds1wm_data {
static inline void ds1wm_write_register(struct ds1wm_data *ds1wm_data, u32 reg,
u8 val)
{
__raw_writeb(val, ds1wm_data->map + (reg << ds1wm_data->bus_shift));
__raw_writeb(val, ds1wm_data->map + (reg << ds1wm_data->bus_shift));
}

static inline u8 ds1wm_read_register(struct ds1wm_data *ds1wm_data, u32 reg)
{
return __raw_readb(ds1wm_data->map + (reg << ds1wm_data->bus_shift));
return __raw_readb(ds1wm_data->map + (reg << ds1wm_data->bus_shift));
}


Expand Down Expand Up @@ -150,8 +150,8 @@ static int ds1wm_reset(struct ds1wm_data *ds1wm_data)
timeleft = wait_for_completion_timeout(&reset_done, DS1WM_TIMEOUT);
ds1wm_data->reset_complete = NULL;
if (!timeleft) {
dev_dbg(&ds1wm_data->pdev->dev, "reset failed\n");
return 1;
dev_err(&ds1wm_data->pdev->dev, "reset failed\n");
return 1;
}

/* Wait for the end of the reset. According to the specs, the time
Expand All @@ -168,11 +168,11 @@ static int ds1wm_reset(struct ds1wm_data *ds1wm_data)
(ds1wm_data->active_high ? DS1WM_INTEN_IAS : 0));

if (!ds1wm_data->slave_present) {
dev_dbg(&ds1wm_data->pdev->dev, "reset: no devices found\n");
return 1;
}
dev_dbg(&ds1wm_data->pdev->dev, "reset: no devices found\n");
return 1;
}

return 0;
return 0;
}

static int ds1wm_write(struct ds1wm_data *ds1wm_data, u8 data)
Expand Down Expand Up @@ -335,7 +335,7 @@ static int ds1wm_probe(struct platform_device *pdev)
if (!pdev)
return -ENODEV;

ds1wm_data = kzalloc(sizeof (*ds1wm_data), GFP_KERNEL);
ds1wm_data = kzalloc(sizeof(*ds1wm_data), GFP_KERNEL);
if (!ds1wm_data)
return -ENOMEM;

Expand Down

0 comments on commit daa49ff

Please sign in to comment.