From: Heiko Stuebner <heiko.stuebner@xxxxxxxxxxxxxxxxxxxxx> As suggested give the current ADC_CHANNEL constant a distinct and consistent prefix. Suggested-by: Peter Meerwald-Stadler <pmeerw@xxxxxxxxxx> Signed-off-by: Heiko Stuebner <heiko.stuebner@xxxxxxxxxxxxxxxxxxxxx> --- changes in v5: - new patch drivers/iio/adc/rockchip_saradc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c index 270eb7e83823..29d7f6e4057e 100644 --- a/drivers/iio/adc/rockchip_saradc.c +++ b/drivers/iio/adc/rockchip_saradc.c @@ -118,7 +118,7 @@ static const struct iio_info rockchip_saradc_iio_info = { .read_raw = rockchip_saradc_read_raw, }; -#define ADC_CHANNEL(_index, _id) { \ +#define SARADC_CHANNEL(_index, _id) { \ .type = IIO_VOLTAGE, \ .indexed = 1, \ .channel = _index, \ @@ -128,9 +128,9 @@ static const struct iio_info rockchip_saradc_iio_info = { } static const struct iio_chan_spec rockchip_saradc_iio_channels[] = { - ADC_CHANNEL(0, "adc0"), - ADC_CHANNEL(1, "adc1"), - ADC_CHANNEL(2, "adc2"), + SARADC_CHANNEL(0, "adc0"), + SARADC_CHANNEL(1, "adc1"), + SARADC_CHANNEL(2, "adc2"), }; static const struct rockchip_saradc_data saradc_data = { @@ -141,8 +141,8 @@ static const struct rockchip_saradc_data saradc_data = { }; static const struct iio_chan_spec rockchip_rk3066_tsadc_iio_channels[] = { - ADC_CHANNEL(0, "adc0"), - ADC_CHANNEL(1, "adc1"), + SARADC_CHANNEL(0, "adc0"), + SARADC_CHANNEL(1, "adc1"), }; static const struct rockchip_saradc_data rk3066_tsadc_data = { @@ -153,12 +153,12 @@ static const struct rockchip_saradc_data rk3066_tsadc_data = { }; static const struct iio_chan_spec rockchip_rk3399_saradc_iio_channels[] = { - ADC_CHANNEL(0, "adc0"), - ADC_CHANNEL(1, "adc1"), - ADC_CHANNEL(2, "adc2"), - ADC_CHANNEL(3, "adc3"), - ADC_CHANNEL(4, "adc4"), - ADC_CHANNEL(5, "adc5"), + SARADC_CHANNEL(0, "adc0"), + SARADC_CHANNEL(1, "adc1"), + SARADC_CHANNEL(2, "adc2"), + SARADC_CHANNEL(3, "adc3"), + SARADC_CHANNEL(4, "adc4"), + SARADC_CHANNEL(5, "adc5"), }; static const struct rockchip_saradc_data rk3399_saradc_data = { -- 2.25.1