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

Commit 5532c628 authored by Luke Nowakowski-Krijger's avatar Luke Nowakowski-Krijger Committed by Mauro Carvalho Chehab
Browse files

media: dvb_frontend.h: Fix shifting signed 32-bit value problem 



Fix DVBFE_ALGO_RECOVERY and DVBFE_ALGO_SEARCH_ERROR use BIT macro which
fixes undefined behavior error by certain compilers.

Also changed all other bit shifted definitions to use macro for better
readability.

Signed-off-by: default avatarLuke Nowakowski-Krijger <lnowakow@eng.ucsd.edu>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent f6af820e

include/media/dvb_frontend.h

+11 −10
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <linux/delay.h>

#include <linux/mutex.h>

#include <linux/slab.h>

#include <linux/bitops.h>



#include <linux/dvb/frontend.h>
@@ -141,10 +142,10 @@ struct analog_parameters { 
 *	These devices have AUTO recovery capabilities from LOCK failure

 */

enum dvbfe_algo {

	DVBFE_ALGO_HW			= (1 <<  0),

	DVBFE_ALGO_SW			= (1 <<  1),

	DVBFE_ALGO_CUSTOM		= (1 <<  2),

	DVBFE_ALGO_RECOVERY		= (1 << 31)

	DVBFE_ALGO_HW			= BIT(0),

	DVBFE_ALGO_SW			= BIT(1),

	DVBFE_ALGO_CUSTOM		= BIT(2),

	DVBFE_ALGO_RECOVERY		= BIT(31),

};



/**
@@ -170,12 +171,12 @@ enum dvbfe_algo { 
 *	The frontend search algorithm was requested to search again

 */

enum dvbfe_search {

	DVBFE_ALGO_SEARCH_SUCCESS	= (1 <<  0),

	DVBFE_ALGO_SEARCH_ASLEEP	= (1 <<  1),

	DVBFE_ALGO_SEARCH_FAILED	= (1 <<  2),

	DVBFE_ALGO_SEARCH_INVALID	= (1 <<  3),

	DVBFE_ALGO_SEARCH_AGAIN		= (1 <<  4),

	DVBFE_ALGO_SEARCH_ERROR		= (1 << 31),

	DVBFE_ALGO_SEARCH_SUCCESS	= BIT(0),

	DVBFE_ALGO_SEARCH_ASLEEP	= BIT(1),

	DVBFE_ALGO_SEARCH_FAILED	= BIT(2),

	DVBFE_ALGO_SEARCH_INVALID	= BIT(3),

	DVBFE_ALGO_SEARCH_AGAIN		= BIT(4),

	DVBFE_ALGO_SEARCH_ERROR		= BIT(31),

};



/**