From 525795ac3ea02f3b8e14a8de63ee241b4810ca72 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 7 Apr 2010 16:19:36 -0300
Subject: [PATCH] --- yaml --- r: 192939 b: refs/heads/master c:
 6eb9435b874ae5ff56d56952167a8e9be5c5deeb h: refs/heads/master i:   192937:
 19729a10fd0c17c2189df536fec8fac64c05d03b   192935:
 c64846be66884119bb31f58433ae7d3ee1dea509 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/media/IR/ir-nec-decoder.c | 2 +-
 trunk/drivers/media/IR/ir-raw-event.c   | 4 +---
 trunk/drivers/media/IR/ir-rc5-decoder.c | 2 +-
 trunk/drivers/media/IR/rc-map.c         | 3 +--
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index dff9a5cef719..d874f85e9eb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c373cabfbbb7631526003f17d470c0d1e5915a4c
+refs/heads/master: 6eb9435b874ae5ff56d56952167a8e9be5c5deeb
diff --git a/trunk/drivers/media/IR/ir-nec-decoder.c b/trunk/drivers/media/IR/ir-nec-decoder.c
index 9d1ada95aa72..18918e52c0c0 100644
--- a/trunk/drivers/media/IR/ir-nec-decoder.c
+++ b/trunk/drivers/media/IR/ir-nec-decoder.c
@@ -25,7 +25,7 @@
 
 /* Used to register nec_decoder clients */
 static LIST_HEAD(decoder_list);
-static spinlock_t decoder_lock;
+static DEFINE_SPINLOCK(decoder_lock);
 
 enum nec_state {
 	STATE_INACTIVE,
diff --git a/trunk/drivers/media/IR/ir-raw-event.c b/trunk/drivers/media/IR/ir-raw-event.c
index 57990a337922..ddb3365adc82 100644
--- a/trunk/drivers/media/IR/ir-raw-event.c
+++ b/trunk/drivers/media/IR/ir-raw-event.c
@@ -21,7 +21,7 @@
 
 /* Used to handle IR raw handler extensions */
 static LIST_HEAD(ir_raw_handler_list);
-static spinlock_t ir_raw_handler_lock;
+static DEFINE_SPINLOCK(ir_raw_handler_lock);
 
 /**
  * RUN_DECODER()	- runs an operation on all IR decoders
@@ -205,8 +205,6 @@ static void init_decoders(struct work_struct *work)
 
 void ir_raw_init(void)
 {
-	spin_lock_init(&ir_raw_handler_lock);
-
 #ifdef MODULE
 	INIT_WORK(&wq_load, init_decoders);
 	schedule_work(&wq_load);
diff --git a/trunk/drivers/media/IR/ir-rc5-decoder.c b/trunk/drivers/media/IR/ir-rc5-decoder.c
index a62277b625a8..6323066438b5 100644
--- a/trunk/drivers/media/IR/ir-rc5-decoder.c
+++ b/trunk/drivers/media/IR/ir-rc5-decoder.c
@@ -29,7 +29,7 @@ static unsigned int ir_rc5_remote_gap = 888888;
 
 /* Used to register rc5_decoder clients */
 static LIST_HEAD(decoder_list);
-static spinlock_t decoder_lock;
+static DEFINE_SPINLOCK(decoder_lock);
 
 enum rc5_state {
 	STATE_INACTIVE,
diff --git a/trunk/drivers/media/IR/rc-map.c b/trunk/drivers/media/IR/rc-map.c
index 2f6201ce1898..ff185c054267 100644
--- a/trunk/drivers/media/IR/rc-map.c
+++ b/trunk/drivers/media/IR/rc-map.c
@@ -17,8 +17,7 @@
 
 /* Used to handle IR raw handler extensions */
 static LIST_HEAD(rc_map_list);
-static spinlock_t rc_map_lock;
-
+static DEFINE_SPINLOCK(rc_map_lock);
 
 static struct rc_keymap *seek_rc_map(const char *name)
 {