media: dvb_frontend.h: Fix shifting signed 32-bit value problem
authorLuke Nowakowski-Krijger <lnowakow@eng.ucsd.edu>
Thu, 4 Jul 2019 20:58:12 +0000 (17:58 -0300)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Wed, 14 Aug 2019 08:04:08 +0000 (05:04 -0300)
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: Luke Nowakowski-Krijger <lnowakow@eng.ucsd.edu>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
include/media/dvb_frontend.h

index f05cd7b94a2cf9eda7c2bdea397ffc5f29f40b05..0d76fa4551b360e8a2e693935d964c54381ff433 100644 (file)
@@ -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),
 };
 
 /**