Home » Mailing list archives » linux-kernel » 2008 » July » 31

[PATCH 25/30] W1: ds2490.c ds_reset remove ds_wait_status

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: David Fries
Subject: [PATCH 25/30] W1: ds2490.c ds_reset remove ds_wait_status
Date: Wednesday, July 30, 2008 - 7:50 pm

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 065042d..9a7fd71 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
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 0/30] W1: w1 core fixes, ds2490 updates, strong pullup, David Fries, (Mon Jul 28, 7:04 pm)
[PATCH 1/30] W1: fix deadlocks and remove w1_control_thread, David Fries, (Mon Jul 28, 7:10 pm)
[PATCH 2/30] W1: abort search early on on exit, David Fries, (Mon Jul 28, 7:12 pm)
[PATCH 3/30] W1: don't delay search start, David Fries, (Mon Jul 28, 7:13 pm)
[PATCH 4/30] W1: w1_process, block or sleep, David Fries, (Mon Jul 28, 7:14 pm)
[PATCH 5/30] W1: feature, enable hardware strong pullup, David Fries, (Mon Jul 28, 7:14 pm)
[PATCH 6/30] W1: feature, w1_therm.c use strong pullup and ..., David Fries, (Mon Jul 28, 7:15 pm)
[PATCH 7/30] W1: be able to manually add and remove slaves, David Fries, (Mon Jul 28, 7:17 pm)
[PATCH 8/30] W1: recode w1_slave_found logic, David Fries, (Mon Jul 28, 7:18 pm)
[PATCH 9/30] W1: new module parameter search_count, David Fries, (Mon Jul 28, 7:19 pm)
[PATCH 10/30] W1: Document add, remove, search_count, and ..., David Fries, (Mon Jul 28, 7:20 pm)
[PATCH 11/30] W1: w1_slave_read_id read bug, use device_at ..., David Fries, (Mon Jul 28, 7:21 pm)
[PATCH 12/30] W1: w1_therm fix user buffer overflow and cat, David Fries, (Mon Jul 28, 7:21 pm)
[PATCH 13/30] W1: w1_family, remove unused variable need_exit, David Fries, (Mon Jul 28, 7:21 pm)
[PATCH 14/30] W1: w1_therm consistent mutex access code cl ..., David Fries, (Mon Jul 28, 7:22 pm)
[PATCH 15/30] W1: w1_int.c use first available master number, David Fries, (Mon Jul 28, 7:23 pm)
[PATCH 16/30] W1: w1.c s/printk/dev_dbg/, David Fries, (Mon Jul 28, 7:23 pm)
[PATCH 17/30] W1: w1_io.c reset comments and msleep, David Fries, (Mon Jul 28, 7:24 pm)
[PATCH 18/30] W1: ds1wm.c msleep for reset, David Fries, (Mon Jul 28, 7:24 pm)
[PATCH 19/30] W1: ds2490.c correct print message, David Fries, (Mon Jul 28, 7:25 pm)
[PATCH 20/30] W1: ds2490.c add support for strong pullup, David Fries, (Mon Jul 28, 7:25 pm)
[PATCH 21/30] W1: ds2490.c ds_write_bit, grouping error, d ..., David Fries, (Mon Jul 28, 7:25 pm)
[PATCH 22/30] W1: ds2490.c disable bit read and write, David Fries, (Mon Jul 28, 7:25 pm)
[PATCH 23/30] W1: ds2490.c simplify and fix ds_touch_bit, David Fries, (Mon Jul 28, 7:26 pm)
[PATCH 24/30] W1: ds2490.c ds_dump_status rework, David Fries, (Mon Jul 28, 7:26 pm)
[PATCH 25/30] W1: ds2490.c ds_reset remove ds_wait_status, David Fries, (Mon Jul 28, 7:26 pm)
[PATCH 26/30] W1: ds2490.c reset ds2490 in init, David Fries, (Mon Jul 28, 7:27 pm)
[PATCH 27/30] W1: ds2490.c magic number work, David Fries, (Mon Jul 28, 7:28 pm)
[PATCH 28/30] W1: ds2490.c ds_write_block remove extra ds_ ..., David Fries, (Mon Jul 28, 7:28 pm)
[PATCH 29/30] W1: Documentation/w1/masters/ds2490 update, David Fries, (Mon Jul 28, 7:29 pm)
[PATCH 30/30] W1: ds2490.c optimize ds_set_pullup, David Fries, (Mon Jul 28, 7:30 pm)
Re: [PATCH 0/30] W1: w1 core fixes, ds2490 updates, strong ..., Andrew Morton, (Tue Jul 29, 4:13 pm)
Re: [PATCH 5/30] W1: feature, enable hardware strong pullup, Andrew Morton, (Tue Jul 29, 4:21 pm)
Re: [PATCH 0/30] W1: w1 core fixes, ds2490 updates, strong ..., David Fries, (Wed Jul 30, 7:37 pm)
[PATCH 1/30] W1: fix deadlocks and remove w1_control_thread, David Fries, (Wed Jul 30, 7:47 pm)
[PATCH 2/30] W1: abort search early on on exit, David Fries, (Wed Jul 30, 7:48 pm)
[PATCH 3/30] W1: don't delay search start, David Fries, (Wed Jul 30, 7:48 pm)
[PATCH 4/30] W1: w1_process, block or sleep, David Fries, (Wed Jul 30, 7:48 pm)
[PATCH 5/30] W1: feature, enable hardware strong pullup, David Fries, (Wed Jul 30, 7:48 pm)
[PATCH 6/30] W1: feature, w1_therm.c use strong pullup and ..., David Fries, (Wed Jul 30, 7:48 pm)
[PATCH 7/30] W1: be able to manually add and remove slaves, David Fries, (Wed Jul 30, 7:48 pm)
[PATCH 8/30] W1: recode w1_slave_found logic, David Fries, (Wed Jul 30, 7:48 pm)
[PATCH 9/30] W1: new module parameter search_count, David Fries, (Wed Jul 30, 7:48 pm)
[PATCH 10/30] W1: Document add, remove, search_count, and ..., David Fries, (Wed Jul 30, 7:49 pm)
[PATCH 11/30] W1: w1_slave_read_id read bug, use device_at ..., David Fries, (Wed Jul 30, 7:49 pm)
[PATCH 12/30] W1: w1_therm fix user buffer overflow and cat, David Fries, (Wed Jul 30, 7:49 pm)
[PATCH 13/30] W1: w1_family, remove unused variable need_exit, David Fries, (Wed Jul 30, 7:49 pm)
[PATCH 14/30] W1: w1_therm consistent mutex access code cl ..., David Fries, (Wed Jul 30, 7:49 pm)
[PATCH 15/30] W1: w1_int.c use first available master number, David Fries, (Wed Jul 30, 7:49 pm)
[PATCH 16/30] W1: w1.c s/printk/dev_dbg/, David Fries, (Wed Jul 30, 7:49 pm)
[PATCH 17/30] W1: w1_io.c reset comments and msleep, David Fries, (Wed Jul 30, 7:49 pm)
[PATCH 18/30] W1: ds1wm.c msleep for reset, David Fries, (Wed Jul 30, 7:49 pm)
[PATCH 19/30] W1: ds2490.c correct print message, David Fries, (Wed Jul 30, 7:49 pm)
[PATCH 20/30] W1: ds2490.c add support for strong pullup, David Fries, (Wed Jul 30, 7:49 pm)
[PATCH 21/30] W1: ds2490.c ds_write_bit, grouping error, d ..., David Fries, (Wed Jul 30, 7:50 pm)
[PATCH 22/30] W1: ds2490.c disable bit read and write, David Fries, (Wed Jul 30, 7:50 pm)
[PATCH 23/30] W1: ds2490.c simplify and fix ds_touch_bit, David Fries, (Wed Jul 30, 7:50 pm)
[PATCH 24/30] W1: ds2490.c ds_dump_status rework, David Fries, (Wed Jul 30, 7:50 pm)
[PATCH 25/30] W1: ds2490.c ds_reset remove ds_wait_status, David Fries, (Wed Jul 30, 7:50 pm)
[PATCH 26/30] W1: ds2490.c reset ds2490 in init, David Fries, (Wed Jul 30, 7:50 pm)
[PATCH 27/30] W1: ds2490.c magic number work, David Fries, (Wed Jul 30, 7:50 pm)
[PATCH 28/30] W1: ds2490.c ds_write_block remove extra ds_ ..., David Fries, (Wed Jul 30, 7:50 pm)
[PATCH 29/30] W1: Documentation/w1/masters/ds2490 update, David Fries, (Wed Jul 30, 7:50 pm)
[PATCH 30/30] W1: ds2490.c optimize ds_set_pullup, David Fries, (Wed Jul 30, 7:50 pm)
Re: [PATCH 0/30] W1: w1 core fixes, ds2490 updates, strong ..., Andrew Morton, (Wed Jul 30, 8:03 pm)