From: David Fries 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 Signed-off-by: Evgeniy Polyakov Signed-off-by: Andrew Morton --- drivers/w1/masters/ds2490.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff -puN drivers/w1/masters/ds2490.c~w1-ds2490c-ds_reset-remove-ds_wait_status drivers/w1/masters/ds2490.c --- a/drivers/w1/masters/ds2490.c~w1-ds2490c-ds_reset-remove-ds_wait_status +++ a/drivers/w1/masters/ds2490.c @@ -457,7 +457,7 @@ static int ds_wait_status(struct ds_devi return 0; } -static int ds_reset(struct ds_device *dev, struct ds_status *st) +static int ds_reset(struct ds_device *dev) { int err; @@ -466,14 +466,6 @@ static int ds_reset(struct ds_device *de 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; } @@ -809,12 +801,9 @@ static u8 ds9490r_read_block(void *data, 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; _