summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/frontends/drx397xD.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-12-12 02:01:14 +0000
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-12 02:01:14 +0000
commit652cff3226732d3592b00645a9adfdae7d78deb1 (patch)
treeeb03618b894ac0854ce915e5ebd13553f2d7bbf0 /linux/drivers/media/dvb/frontends/drx397xD.c
parentefe8d48c56888677c8f5986e3a0a1a8e3f7dd6b3 (diff)
downloadmediapointer-dvb-s2-652cff3226732d3592b00645a9adfdae7d78deb1.tar.gz
mediapointer-dvb-s2-652cff3226732d3592b00645a9adfdae7d78deb1.tar.bz2
dvb: remove deprecated use of RW_LOCK_UNLOCKED in frontends
From: Steven Rostedt <rostedt@goodmis.org> 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>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/drx397xD.c')
-rw-r--r--linux/drivers/media/dvb/frontends/drx397xD.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/frontends/drx397xD.c b/linux/drivers/media/dvb/frontends/drx397xD.c
index 7a2b2d461..48abee27c 100644
--- a/linux/drivers/media/dvb/frontends/drx397xD.c
+++ b/linux/drivers/media/dvb/frontends/drx397xD.c
@@ -40,7 +40,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"
};
@@ -73,11 +73,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"
};