V4L/DVB (10129): dvb: remove deprecated use of RW_LOCK_UNLOCKED in frontends
authorSteven Rostedt <rostedt@goodmis.org>
Fri, 12 Dec 2008 02:01:14 +0000 (23:01 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 30 Dec 2008 11:40:40 +0000 (09:40 -0200)
Impact: clean up

RW_LOCK_UNLOCKED is deprecated.  This patch replaces it with the
__RW_LOCK_UNLOCKED(lock) macro.  This change was a little trickier than
others due to the macro being used in another macro that fills an array.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/frontends/drx397xD.c
drivers/media/dvb/frontends/drx397xD_fw.h

index b9ca5c8d2dd9400814f64566a24952b541126a0a..ec4e08dbc699c78a31432a470d1292d1261ca312 100644 (file)
@@ -39,7 +39,7 @@ static const char mod_name[] = "drx397xD";
 #define F_SET_0D4h     2
 
 enum fw_ix {
-#define _FW_ENTRY(a, b)                b
+#define _FW_ENTRY(a, b, c)     b
 #include "drx397xD_fw.h"
 };
 
@@ -72,11 +72,11 @@ static struct {
        int refcnt;
        const u8 *data[ARRAY_SIZE(blob_name)];
 } fw[] = {
-#define _FW_ENTRY(a, b)                {                       \
-                       .name   = a,                    \
-                       .file   = 0,                    \
-                       .lock   = RW_LOCK_UNLOCKED,     \
-                       .refcnt = 0,                    \
+#define _FW_ENTRY(a, b, c)     {                                       \
+                       .name   = a,                                    \
+                       .file   = 0,                                    \
+                       .lock   = __RW_LOCK_UNLOCKED(fw[c].lock),       \
+                       .refcnt = 0,                                    \
                        .data   = { }           }
 #include "drx397xD_fw.h"
 };
index 01de02a81cd41ea27f30405d8a33119eaf1450d4..c8b44c1e807f892866f0c3e3cdb2963dee576422 100644 (file)
@@ -18,8 +18,8 @@
  */
 
 #ifdef _FW_ENTRY
-       _FW_ENTRY("drx397xD.A2.fw",     DRXD_FW_A2 = 0          ),
-       _FW_ENTRY("drx397xD.B1.fw",     DRXD_FW_B1              ),
+       _FW_ENTRY("drx397xD.A2.fw",     DRXD_FW_A2 = 0, DRXD_FW_A2      ),
+       _FW_ENTRY("drx397xD.B1.fw",     DRXD_FW_B1,     DRXD_FW_B1      ),
 #undef _FW_ENTRY
 #endif /* _FW_ENTRY */