Merge tag 'staging-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / drivers / iio / adc / max9611.c

diff --git a/drivers/iio/adc/max9611.c b/drivers/iio/adc/max9611.c
index e480529..04d5ff7 100644 (file)
--- a/drivers/iio/adc/max9611.c
+++ b/drivers/iio/adc/max9611.c
@@ -115,22 +115,17 @@ enum max9611_conf_ids {
  *                   where data shall be read from
  */
 static const unsigned int max9611_mux_conf[][2] = {
-       /* CONF_SENSE_1x */
-       { MAX9611_MUX_SENSE_1x, MAX9611_REG_CSA_DATA },
-       /* CONF_SENSE_4x */
-       { MAX9611_MUX_SENSE_4x, MAX9611_REG_CSA_DATA },
-       /* CONF_SENSE_8x */
-       { MAX9611_MUX_SENSE_8x, MAX9611_REG_CSA_DATA },
-       /* CONF_IN_VOLT */
-       { MAX9611_INPUT_VOLT, MAX9611_REG_RS_DATA },
-       /* CONF_TEMP */
-       { MAX9611_MUX_TEMP, MAX9611_REG_TEMP_DATA },
+       [CONF_SENSE_1x] = { MAX9611_MUX_SENSE_1x, MAX9611_REG_CSA_DATA },
+       [CONF_SENSE_4x] = { MAX9611_MUX_SENSE_4x, MAX9611_REG_CSA_DATA },
+       [CONF_SENSE_8x] = { MAX9611_MUX_SENSE_8x, MAX9611_REG_CSA_DATA },
+       [CONF_IN_VOLT]  = { MAX9611_INPUT_VOLT, MAX9611_REG_RS_DATA },
+       [CONF_TEMP]     = { MAX9611_MUX_TEMP, MAX9611_REG_TEMP_DATA },
 };
 
 enum max9611_csa_gain {
-       CSA_GAIN_1x,
-       CSA_GAIN_4x,
-       CSA_GAIN_8x,
+       CSA_GAIN_1x = CONF_SENSE_1x,
+       CSA_GAIN_4x = CONF_SENSE_4x,
+       CSA_GAIN_8x = CONF_SENSE_8x,
 };
 
 enum max9611_csa_gain_params {
@@ -148,18 +143,9 @@ enum max9611_csa_gain_params {
  * value; use this structure to retrieve the correct LSB and offset values.
  */
 static const unsigned int max9611_gain_conf[][2] = {
-       { /* [0] CSA_GAIN_1x */
-               MAX9611_CSA_1X_LSB_nV,
-               MAX9611_CSA_1X_OFFS_RAW,
-       },
-       { /* [1] CSA_GAIN_4x */
-               MAX9611_CSA_4X_LSB_nV,
-               MAX9611_CSA_4X_OFFS_RAW,
-       },
-       { /* [2] CSA_GAIN_8x */
-               MAX9611_CSA_8X_LSB_nV,
-               MAX9611_CSA_8X_OFFS_RAW,
-       },
+       [CSA_GAIN_1x] = { MAX9611_CSA_1X_LSB_nV, MAX9611_CSA_1X_OFFS_RAW, },
+       [CSA_GAIN_4x] = { MAX9611_CSA_4X_LSB_nV, MAX9611_CSA_4X_OFFS_RAW, },
+       [CSA_GAIN_8x] = { MAX9611_CSA_8X_LSB_nV, MAX9611_CSA_8X_OFFS_RAW, },
 };
 
 enum max9611_chan_addrs {