Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/media/dvb/frontends/drx397xD.c

+6 −6
Original line number Diff line number Diff line
@@ -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,10 +72,10 @@ static struct { 
	int refcnt;

	const u8 *data[ARRAY_SIZE(blob_name)];

} fw[] = {

#define _FW_ENTRY(a, b)		{			\

#define _FW_ENTRY(a, b, c)	{					\

			.name	= a,					\

			.file	= 0,					\

			.lock	= RW_LOCK_UNLOCKED,	\

			.lock	= __RW_LOCK_UNLOCKED(fw[c].lock),	\

			.refcnt = 0,					\

			.data	= { }		}

#include "drx397xD_fw.h"

drivers/media/dvb/frontends/drx397xD_fw.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */