Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2005-01-20 16:20:17 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-20 16:20:17 -0800
commita0764fb0c36a44059ec1ba719aa4c10f2890f6fe (patch)
tree0723e9cface5da082d4b8e0ea74e2f0faedf986a
parent25768610fb74c37503a5e6aff5257844c1a85d31 (diff)
[PATCH] Lock initializer cleanup: Firewire
Use the new lock initializers DEFINE_SPIN_LOCK and DEFINE_RW_LOCK Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/ieee1394/dv1394.c2
-rw-r--r--drivers/ieee1394/highlevel.c4
-rw-r--r--drivers/ieee1394/raw1394.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index 332d8a2f7813..f80090084575 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -177,7 +177,7 @@ static long dv1394_compat_ioctl(struct file *file, unsigned int cmd,
/* list of all video_cards */
static LIST_HEAD(dv1394_cards);
-static spinlock_t dv1394_cards_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(dv1394_cards_lock);
/* translate from a struct file* to the corresponding struct video_card* */
diff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.c
index 50c403c6cec5..24c1746c8b73 100644
--- a/drivers/ieee1394/highlevel.c
+++ b/drivers/ieee1394/highlevel.c
@@ -43,9 +43,9 @@ static LIST_HEAD(hl_drivers);
static DECLARE_RWSEM(hl_drivers_sem);
static LIST_HEAD(hl_irqs);
-static rwlock_t hl_irqs_lock = RW_LOCK_UNLOCKED;
+static DEFINE_RWLOCK(hl_irqs_lock);
-static rwlock_t addr_space_lock = RW_LOCK_UNLOCKED;
+static DEFINE_RWLOCK(addr_space_lock);
/* addr_space list will have zero and max already included as bounds */
static struct hpsb_address_ops dummy_ops = { NULL, NULL, NULL, NULL };
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index d57a000c5ddc..674dd23e5585 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -71,7 +71,7 @@ printk(KERN_INFO "raw1394:" fmt "\n" , ## args)
static LIST_HEAD(host_info_list);
static int host_count;
-static spinlock_t host_info_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(host_info_lock);
static atomic_t internal_generation = ATOMIC_INIT(0);
static atomic_t iso_buffer_size;