From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
To: linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
David Fries <david@fries.net>,
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Subject: [PATCH 25/30] W1: ds2490.c ds_reset remove ds_wait_status
Date: Fri, 11 Jul 2008 17:51:40 +0400 [thread overview]
Message-ID: <12157843071820-git-send-email-johnpol@2ka.mipt.ru> (raw)
In-Reply-To: <12157843054074-git-send-email-johnpol@2ka.mipt.ru>
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
next prev parent reply other threads:[~2008-07-11 13:48 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-11 13:51 w1 updates Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 1/30] W1: fix deadlocks and remove w1_control_thread Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 2/30] W1: abort search early on on exit Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 3/30] W1: don't delay search start Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 4/30] W1: w1_process, block or sleep Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 5/30] W1: feature, enable hardware strong pullup Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 6/30] W1: feature, w1_therm.c use strong pullup and documentation Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 7/30] W1: be able to manually add and remove slaves Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 8/30] W1: recode w1_slave_found logic Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 9/30] W1: new module parameter search_count Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 10/30] W1: Document add, remove, search_count, and pullup Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 11/30] W1: w1_slave_read_id read bug, use device_attribute Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 12/30] W1: w1_therm fix user buffer overflow and cat Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 13/30] W1: w1_family, remove unused variable need_exit Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 14/30] W1: w1_therm consistent mutex access code cleanup Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 15/30] W1: w1_int.c use first available master number Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 16/30] W1: w1.c s/printk/dev_dbg/ Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 17/30] W1: w1_io.c reset comments and msleep Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 18/30] W1: ds1wm.c msleep for reset Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 19/30] W1: ds2490.c correct print message Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 20/30] W1: ds2490.c add support for strong pullup Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 21/30] W1: ds2490.c ds_write_bit, grouping error, disable readback Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 22/30] W1: ds2490.c disable bit read and write Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 23/30] W1: ds2490.c simplify and fix ds_touch_bit Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 24/30] W1: ds2490.c ds_dump_status rework Evgeniy Polyakov
2008-07-11 13:51 ` Evgeniy Polyakov [this message]
2008-07-11 13:51 ` [PATCH 26/30] W1: ds2490.c reset ds2490 in init Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 27/30] W1: ds2490.c magic number work Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 28/30] W1: ds2490.c ds_write_block remove extra ds_wait_status Evgeniy Polyakov
2008-07-11 13:51 ` [PATCH 29/30] W1: Documentation/w1/masters/ds2490 update Evgeniy Polyakov
2008-07-14 20:40 ` Randy Dunlap
2008-07-15 2:16 ` David Fries
2008-07-17 21:52 ` Randy Dunlap
2008-07-15 2:17 ` David Fries
2008-07-11 13:51 ` [PATCH 30/30] W1: ds2490.c optimize ds_set_pullup Evgeniy Polyakov
-- strict thread matches above, loose matches on Subject: below --
2008-07-29 2:04 [PATCH 0/30] W1: w1 core fixes, ds2490 updates, strong pullup David Fries
2008-07-29 2:26 ` [PATCH 25/30] W1: ds2490.c ds_reset remove ds_wait_status David Fries
2008-07-29 23:13 ` [PATCH 0/30] W1: w1 core fixes, ds2490 updates, strong pullup Andrew Morton
2008-07-31 2:50 ` [PATCH 25/30] W1: ds2490.c ds_reset remove ds_wait_status David Fries
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=12157843071820-git-send-email-johnpol@2ka.mipt.ru \
--to=johnpol@2ka.mipt.ru \
--cc=akpm@linux-foundation.org \
--cc=david@fries.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox