commit dde2b954302d143deee6dbd931ba2aa21413bb0a
author Kristian Høgsberg <krh@redhat.com> Tue Apr 17 11:51:57 2007 -0400
committer Stefan Richter <stefanr@s5r6.in-berlin.de> Tue Apr 17 21:14:32 2007 +0200
tree 783ecd8fffecaae521540ad533c5aeb343778ac0
parent 0fc7d6e4f4c243b49077b29466c9e135e3401938

firewire: Don't use subsystem rwsem, it's going away.

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

drivers/firewire/fw-device.c

diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
index 7197657..7503b8d 100644
--- a/drivers/firewire/fw-device.c
+++ b/drivers/firewire/fw-device.c
@@ -550,6 +550,7 @@
 	return 0;
 }
 
+static DECLARE_RWSEM(idr_rwsem);
 static DEFINE_IDR(fw_device_idr);
 int fw_cdev_major;
 
@@ -557,9 +558,9 @@
 {
 	struct fw_device *device;
 
-	down_read(&fw_bus_type.subsys.rwsem);
+	down_read(&idr_rwsem);
 	device = idr_find(&fw_device_idr, MINOR(devt));
-	up_read(&fw_bus_type.subsys.rwsem);
+	up_read(&idr_rwsem);
 
 	return device;
 }
@@ -570,9 +571,9 @@
 		container_of(work, struct fw_device, work.work);
 	int minor = MINOR(device->device.devt);
 
-	down_write(&fw_bus_type.subsys.rwsem);
+	down_write(&idr_rwsem);
 	idr_remove(&fw_device_idr, minor);
-	up_write(&fw_bus_type.subsys.rwsem);
+	up_write(&idr_rwsem);
 
 	fw_device_cdev_remove(device);
 	device_for_each_child(&device->device, NULL, shutdown_unit);
@@ -621,10 +622,10 @@
 	}
 
 	err = -ENOMEM;
-	down_write(&fw_bus_type.subsys.rwsem);
+	down_write(&idr_rwsem);
 	if (idr_pre_get(&fw_device_idr, GFP_KERNEL))
 		err = idr_get_new(&fw_device_idr, device, &minor);
-	up_write(&fw_bus_type.subsys.rwsem);
+	up_write(&idr_rwsem);
 	if (err < 0)
 		goto error;
 
@@ -670,9 +671,9 @@
 	return;
 
  error_with_cdev:
-	down_write(&fw_bus_type.subsys.rwsem);
+	down_write(&idr_rwsem);
 	idr_remove(&fw_device_idr, minor);
-	up_write(&fw_bus_type.subsys.rwsem);
+	up_write(&idr_rwsem);
  error:
 	put_device(&device->device);
 }