Skip to content

Commit

Permalink
W1: ds2490.c ds_reset remove ds_wait_status
Browse files Browse the repository at this point in the history
ds_reset no longer calls ds_wait_status, the result wasn't used and it
would only delay the following data operations.

Signed-off-by: David Fries <david@fries.net>
Signed-off-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
David Fries authored and Linus Torvalds committed Oct 16, 2008
1 parent 4b9cf1b commit 7a4b970
Showing 1 changed file with 2 additions and 13 deletions.
15 changes: 2 additions & 13 deletions drivers/w1/masters/ds2490.c
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ static int ds_wait_status(struct ds_device *dev, struct ds_status *st)
return 0;
}

static int ds_reset(struct ds_device *dev, struct ds_status *st)
static int ds_reset(struct ds_device *dev)
{
int err;

Expand All @@ -466,14 +466,6 @@ static int ds_reset(struct ds_device *dev, struct ds_status *st)
if (err)
return err;

ds_wait_status(dev, st);
#if 0
if (st->command_buffer_status) {
printk(KERN_INFO "Short circuit.\n");
return -EIO;
}
#endif

return 0;
}

Expand Down Expand Up @@ -809,12 +801,9 @@ static u8 ds9490r_read_block(void *data, u8 *buf, int len)
static u8 ds9490r_reset(void *data)
{
struct ds_device *dev = data;
struct ds_status st;
int err;

memset(&st, 0, sizeof(st));

err = ds_reset(dev, &st);
err = ds_reset(dev);
if (err)
return 1;

Expand Down

0 comments on commit 7a4b970

Please sign in to comment.