From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out-168.synserver.de ([212.40.185.168]:1065 "EHLO smtp-out-168.synserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934713AbbEOPSo (ORCPT ); Fri, 15 May 2015 11:18:44 -0400 From: Lars-Peter Clausen To: Jonathan Cameron , Hartmut Knaack , Peter Meerwald Cc: linux-iio@vger.kernel.org, Paul Cercueil , Lars-Peter Clausen Subject: [PATCH 2/5] iio: adis16400: Use != channel indices for the two voltage channels Date: Fri, 15 May 2015 17:18:35 +0200 Message-Id: <1431703118-32676-3-git-send-email-lars@metafoo.de> In-Reply-To: <1431703118-32676-1-git-send-email-lars@metafoo.de> References: <1431703118-32676-1-git-send-email-lars@metafoo.de> Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org From: Paul Cercueil Previously, the two voltage channels had the same ID, which didn't cause conflicts in sysfs only because one channel is named and the other isn't; this is still violating the spec though, two indexed channels should never have the same index. Signed-off-by: Paul Cercueil Signed-off-by: Lars-Peter Clausen --- drivers/iio/imu/adis16400_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/iio/imu/adis16400_core.c b/drivers/iio/imu/adis16400_core.c index 8de6427..7b63788 100644 --- a/drivers/iio/imu/adis16400_core.c +++ b/drivers/iio/imu/adis16400_core.c @@ -459,10 +459,10 @@ static int adis16400_read_raw(struct iio_dev *indio_dev, } } -#define ADIS16400_VOLTAGE_CHAN(addr, bits, name, si) { \ +#define ADIS16400_VOLTAGE_CHAN(addr, bits, name, si, chn) { \ .type = IIO_VOLTAGE, \ .indexed = 1, \ - .channel = 0, \ + .channel = chn, \ .extend_name = name, \ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ BIT(IIO_CHAN_INFO_SCALE), \ @@ -479,10 +479,10 @@ static int adis16400_read_raw(struct iio_dev *indio_dev, } #define ADIS16400_SUPPLY_CHAN(addr, bits) \ - ADIS16400_VOLTAGE_CHAN(addr, bits, "supply", ADIS16400_SCAN_SUPPLY) + ADIS16400_VOLTAGE_CHAN(addr, bits, "supply", ADIS16400_SCAN_SUPPLY, 0) #define ADIS16400_AUX_ADC_CHAN(addr, bits) \ - ADIS16400_VOLTAGE_CHAN(addr, bits, NULL, ADIS16400_SCAN_ADC) + ADIS16400_VOLTAGE_CHAN(addr, bits, NULL, ADIS16400_SCAN_ADC, 1) #define ADIS16400_GYRO_CHAN(mod, addr, bits) { \ .type = IIO_ANGL_VEL, \ -- 1.8.0