Commit cec73844 authored by Steven Rostedt's avatar Steven Rostedt Committed by Mauro Carvalho Chehab

V4L/DVB (10129): dvb: remove deprecated use of RW_LOCK_UNLOCKED in frontends

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: default avatarSteven Rostedt <srostedt@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent aa16c10a
...@@ -39,7 +39,7 @@ static const char mod_name[] = "drx397xD"; ...@@ -39,7 +39,7 @@ static const char mod_name[] = "drx397xD";
#define F_SET_0D4h 2 #define F_SET_0D4h 2
enum fw_ix { enum fw_ix {
#define _FW_ENTRY(a, b) b #define _FW_ENTRY(a, b, c) b
#include "drx397xD_fw.h" #include "drx397xD_fw.h"
}; };
...@@ -72,11 +72,11 @@ static struct { ...@@ -72,11 +72,11 @@ static struct {
int refcnt; int refcnt;
const u8 *data[ARRAY_SIZE(blob_name)]; const u8 *data[ARRAY_SIZE(blob_name)];
} fw[] = { } fw[] = {
#define _FW_ENTRY(a, b) { \ #define _FW_ENTRY(a, b, c) { \
.name = a, \ .name = a, \
.file = 0, \ .file = 0, \
.lock = RW_LOCK_UNLOCKED, \ .lock = __RW_LOCK_UNLOCKED(fw[c].lock), \
.refcnt = 0, \ .refcnt = 0, \
.data = { } } .data = { } }
#include "drx397xD_fw.h" #include "drx397xD_fw.h"
}; };
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
*/ */
#ifdef _FW_ENTRY #ifdef _FW_ENTRY
_FW_ENTRY("drx397xD.A2.fw", DRXD_FW_A2 = 0 ), _FW_ENTRY("drx397xD.A2.fw", DRXD_FW_A2 = 0, DRXD_FW_A2 ),
_FW_ENTRY("drx397xD.B1.fw", DRXD_FW_B1 ), _FW_ENTRY("drx397xD.B1.fw", DRXD_FW_B1, DRXD_FW_B1 ),
#undef _FW_ENTRY #undef _FW_ENTRY
#endif /* _FW_ENTRY */ #endif /* _FW_ENTRY */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment