diff options
author | David Fries <david@fries.net> | 2008-10-16 01:05:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 14:21:51 -0400 |
commit | 7a4b9706ed762373f74311f96f5122fb74212192 (patch) | |
tree | 8229e57e42ab63468e66098f10df4a7b41c1a234 | |
parent | 4b9cf1bc329e626f3fa655370ee8cc156ab29a55 (diff) |
W1: ds2490.c ds_reset remove ds_wait_status
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>
-rw-r--r-- | 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 065042db69f7..9a7fd71e1461 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) | |||
457 | return 0; | 457 | return 0; |
458 | } | 458 | } |
459 | 459 | ||
460 | static int ds_reset(struct ds_device *dev, struct ds_status *st) | 460 | static int ds_reset(struct ds_device *dev) |
461 | { | 461 | { |
462 | int err; | 462 | int err; |
463 | 463 | ||
@@ -466,14 +466,6 @@ static int ds_reset(struct ds_device *dev, struct ds_status *st) | |||
466 | if (err) | 466 | if (err) |
467 | return err; | 467 | return err; |
468 | 468 | ||
469 | ds_wait_status(dev, st); | ||
470 | #if 0 | ||
471 | if (st->command_buffer_status) { | ||
472 | printk(KERN_INFO "Short circuit.\n"); | ||
473 | return -EIO; | ||
474 | } | ||
475 | #endif | ||
476 | |||
477 | return 0; | 469 | return 0; |
478 | } | 470 | } |
479 | 471 | ||
@@ -809,12 +801,9 @@ static u8 ds9490r_read_block(void *data, u8 *buf, int len) | |||
809 | static u8 ds9490r_reset(void *data) | 801 | static u8 ds9490r_reset(void *data) |
810 | { | 802 | { |
811 | struct ds_device *dev = data; | 803 | struct ds_device *dev = data; |
812 | struct ds_status st; | ||
813 | int err; | 804 | int err; |
814 | 805 | ||
815 | memset(&st, 0, sizeof(st)); | 806 | err = ds_reset(dev); |
816 | |||
817 | err = ds_reset(dev, &st); | ||
818 | if (err) | 807 | if (err) |
819 | return 1; | 808 | return 1; |
820 | 809 | ||