From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from saturn.retrosnub.co.uk ([178.18.118.26]:59132 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758651Ab3B0UkV (ORCPT ); Wed, 27 Feb 2013 15:40:21 -0500 From: Jonathan Cameron To: linux-iio@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen Subject: [PATCH 45/67] staging:iio:accel:adis16220 move to info_mask_(shared_by_type/separate) Date: Wed, 27 Feb 2013 20:38:51 +0000 Message-Id: <1361997553-31058-46-git-send-email-jic23@kernel.org> In-Reply-To: <1361997553-31058-1-git-send-email-jic23@kernel.org> References: <1361997553-31058-1-git-send-email-jic23@kernel.org> Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org The original info_mask is going away in favour of the broken out versions. Signed-off-by: Jonathan Cameron cc: Lars-Peter Clausen --- drivers/staging/iio/accel/adis16220_core.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/staging/iio/accel/adis16220_core.c b/drivers/staging/iio/accel/adis16220_core.c index 370b01a..0f0fb81 100644 --- a/drivers/staging/iio/accel/adis16220_core.c +++ b/drivers/staging/iio/accel/adis16220_core.c @@ -344,37 +344,32 @@ static const struct iio_chan_spec adis16220_channels[] = { .indexed = 1, .channel = 0, .extend_name = "supply", - .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | - IIO_CHAN_INFO_SCALE_SEPARATE_BIT, + .info_mask_separate = IIO_CHAN_INFO_RAW | IIO_CHAN_INFO_SCALE, .address = in_supply, }, { .type = IIO_ACCEL, - .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | - IIO_CHAN_INFO_OFFSET_SEPARATE_BIT | - IIO_CHAN_INFO_SCALE_SEPARATE_BIT | - IIO_CHAN_INFO_PEAK_SEPARATE_BIT, + .info_mask_separate = IIO_CHAN_INFO_RAW | IIO_CHAN_INFO_OFFSET | + IIO_CHAN_INFO_SCALE | IIO_CHAN_INFO_PEAK, .address = accel, }, { .type = IIO_TEMP, .indexed = 1, .channel = 0, - .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | - IIO_CHAN_INFO_OFFSET_SEPARATE_BIT | - IIO_CHAN_INFO_SCALE_SEPARATE_BIT, + .info_mask_separate = IIO_CHAN_INFO_RAW | IIO_CHAN_INFO_OFFSET | + IIO_CHAN_INFO_SCALE, .address = temp, }, { .type = IIO_VOLTAGE, .indexed = 1, .channel = 1, - .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | - IIO_CHAN_INFO_OFFSET_SEPARATE_BIT | - IIO_CHAN_INFO_SCALE_SEPARATE_BIT, + .info_mask_separate = IIO_CHAN_INFO_RAW | IIO_CHAN_INFO_OFFSET | + IIO_CHAN_INFO_SCALE, .address = in_1, }, { .type = IIO_VOLTAGE, .indexed = 1, .channel = 2, - .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, + .info_mask_separate = IIO_CHAN_INFO_RAW, .address = in_2, } }; -- 1.8.1.1