Merge \\\\"Fix misc-macro-parentheses warnings in hardware/akm.\\\\" am: b459b8d1de am: 7201e557ef am: 37025e90a3
am: 7889f98849
Change-Id: I5b8c1756f2d793b75b32d1882eda16c0cf1a1bc3
diff --git a/AK8975_FS/akmdfs/AK8975Driver.h b/AK8975_FS/akmdfs/AK8975Driver.h
index 2f226ac..a09610a 100644
--- a/AK8975_FS/akmdfs/AK8975Driver.h
+++ b/AK8975_FS/akmdfs/AK8975Driver.h
@@ -27,7 +27,7 @@
#define AKD_FALSE 0 /*!< Represents false */
#define AKD_SUCCESS 1 /*!< Represents success.*/
#define AKD_FAIL 0 /*!< Represents fail. */
-#define AKD_ERROR -1 /*!< Represents error. */
+#define AKD_ERROR (-1) /*!< Represents error. */
/*! 0:Don't Output data, 1:Output data */
#define AKD_DBG_DATA 0
diff --git a/AK8975_FS/akmdfs/AKFS_Common.h b/AK8975_FS/akmdfs/AKFS_Common.h
index 4b6874d..cd1ed52 100644
--- a/AK8975_FS/akmdfs/AKFS_Common.h
+++ b/AK8975_FS/akmdfs/AKFS_Common.h
@@ -113,7 +113,7 @@
/***** Dbg Zone Output ***************************************/
#if ENABLE_AKMDEBUG
#define AKMDATA(flag, format, ...) \
- ((((int)flag) & g_dbgzone) \
+ ((((int)(flag)) & g_dbgzone) \
? (fprintf(stdout, (format), ##__VA_ARGS__)) \
: ((void)0))
#else
diff --git a/AK8975_FS/akmdfs/AKFS_Measure.h b/AK8975_FS/akmdfs/AKFS_Measure.h
index c41e363..1f001ac 100644
--- a/AK8975_FS/akmdfs/AKFS_Measure.h
+++ b/AK8975_FS/akmdfs/AKFS_Measure.h
@@ -23,14 +23,14 @@
#include "AKFS_Compass.h"
/*** Constant definition ******************************************************/
-#define AK8975_SELFTEST_MIN_X -100
+#define AK8975_SELFTEST_MIN_X (-100)
#define AK8975_SELFTEST_MAX_X 100
-#define AK8975_SELFTEST_MIN_Y -100
+#define AK8975_SELFTEST_MIN_Y (-100)
#define AK8975_SELFTEST_MAX_Y 100
-#define AK8975_SELFTEST_MIN_Z -1000
-#define AK8975_SELFTEST_MAX_Z -300
+#define AK8975_SELFTEST_MIN_Z (-1000)
+#define AK8975_SELFTEST_MAX_Z (-300)
#define CONVERT_ACC(a) ((int)((a) * 720 / 9.8f))
#define CONVERT_MAG(m) ((int)((m) / 0.06f))
diff --git a/AK8975_FS/libsensors/sensors.h b/AK8975_FS/libsensors/sensors.h
index 6060e6a..ed33092 100644
--- a/AK8975_FS/libsensors/sensors.h
+++ b/AK8975_FS/libsensors/sensors.h
@@ -31,7 +31,7 @@
/*****************************************************************************/
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
#define ID_A (0)
#define ID_M (1)
