The patch number 10129 was added via Mauro Carvalho Chehab <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[email protected]
------
From: Steven Rostedt <[email protected]>
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: Steven Rostedt <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
linux/drivers/media/dvb/frontends/drx397xD.c | 12 ++++++------
linux/drivers/media/dvb/frontends/drx397xD_fw.h | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff -r 9a34af8f01e5 -r 567e6e49f817
linux/drivers/media/dvb/frontends/drx397xD.c
--- a/linux/drivers/media/dvb/frontends/drx397xD.c Mon Dec 29 19:37:14
2008 +0000
+++ b/linux/drivers/media/dvb/frontends/drx397xD.c Fri Dec 12 02:01:14
2008 +0000
@@ -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"
};
diff -r 9a34af8f01e5 -r 567e6e49f817
linux/drivers/media/dvb/frontends/drx397xD_fw.h
--- a/linux/drivers/media/dvb/frontends/drx397xD_fw.h Mon Dec 29 19:37:14
2008 +0000
+++ b/linux/drivers/media/dvb/frontends/drx397xD_fw.h Fri Dec 12 02:01:14
2008 +0000
@@ -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 */
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/567e6e49f81721d82804cf43ec4f16496054dc04
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
