Messages in this thread Patch in this message | | | From | Evgeniy Polyakov <> | Subject | [PATCH 25/30] W1: ds2490.c ds_reset remove ds_wait_status | Date | Fri, 11 Jul 2008 17:51:40 +0400 |
| |
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>
--- drivers/w1/masters/ds2490.c | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/w1/masters/ds2490.c b/drivers/w1/masters/ds2490.c index 0bcdd3f..eb902ab 100644 --- a/drivers/w1/masters/ds2490.c +++ b/drivers/w1/masters/ds2490.c @@ -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; @@ -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; } @@ -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; -- 1.4.4.4
| |