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

[PATCH 15/30] W1: w1_int.c use first available master number

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: David Fries
Subject: [PATCH 15/30] W1: w1_int.c use first available master number
Date: Wednesday, July 30, 2008 - 7:49 pm

Follow the example of other devices (like the joystick device).  Pick
the first available id for each detected device.  Currently for USB
devices, suspending and resuming would cause the number to increment.

Signed-off-by: David Fries <david@fries.net>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
---
 drivers/w1/w1_int.c |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index 3fd6e66..a3a5456 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -29,7 +29,6 @@
 #include "w1_netlink.h"
 #include "w1_int.h"
 
-static u32 w1_ids = 1;
 static int w1_search_count = -1; /* Default is continual scan */
 module_param_named(search_count, w1_search_count, int, 0);
 
@@ -102,9 +101,10 @@ static void w1_free_dev(struct w1_master *dev)
 
 int w1_add_master_device(struct w1_bus_master *master)
 {
-	struct w1_master *dev;
+	struct w1_master *dev, *entry;
 	int retval = 0;
 	struct w1_netlink_msg msg;
+	int id, found;
 
         /* validate minimum functionality */
         if (!(master->touch_bit && master->reset_bus) &&
@@ -126,13 +126,33 @@ int w1_add_master_device(struct w1_bus_master *master)
 		master->set_pullup = NULL;
 	}
 
-	dev = w1_alloc_dev(w1_ids++, w1_max_slave_count, w1_max_slave_ttl, &w1_master_driver, &w1_master_device);
-	if (!dev)
+	/* Lock until the device is added (or not) to w1_masters. */
+	mutex_lock(&w1_mlock);
+	/* Search for the first available id (starting at 1). */
+	id = 0;
+	do {
+		++id;
+		found = 0;
+		list_for_each_entry(entry, &w1_masters, w1_master_entry) {
+			if (entry->id == id) {
+				found = 1;
+				break;
+			}
+		}
+	} while (found);
+
+	dev = w1_alloc_dev(id, w1_max_slave_count, w1_max_slave_ttl,
+		&w1_master_driver, &w1_master_device);
+	if (!dev) {
+		mutex_unlock(&w1_mlock);
 		return -ENOMEM;
+	}
 
 	retval =  w1_create_master_attributes(dev);
-	if (retval)
+	if (retval) {
+		mutex_unlock(&w1_mlock);
 		goto err_out_free_dev;
+	}
 
 	memcpy(dev->bus_master, master, sizeof(struct w1_bus_master));
 
@@ -144,10 +164,10 @@ int w1_add_master_device(struct w1_bus_master *master)
 		dev_err(&dev->dev,
 			 "Failed to create new kernel thread. err=%d\n",
 			 retval);
+		mutex_unlock(&w1_mlock);
 		goto err_out_rm_attr;
 	}
 
-	mutex_lock(&w1_mlock);
 	list_add(&dev->w1_master_entry, &w1_masters);
 	mutex_unlock(&w1_mlock);
 
-- 
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)