From d5765ff8f9b77916d36e9cbb466670cc26ce541d Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Wed, 27 Feb 2013 19:37:59 +0000 Subject: [PATCH] --- yaml --- r: 363615 b: refs/heads/master c: 0221519534ac5060b55d7f5d0accdd30364b7997 h: refs/heads/master i: 363613: 908550a6fedb2b9914f46a3eb85a9f6eddd9c3fc 363611: 1b45ae2724236eefd3793de962f5fb1723f6e2da 363607: f151123b5e109a5319a0c714ba2fe05a1c028b75 363599: 18dbd670ad8f55bf73ed531e7482d8ea39923081 363583: 37c753ed6b5955e01e9161c577299305695e3bc1 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/cdc/ad7150.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fdae8170ced4..f9c27faf406c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 202c7db091c759131b13e15f5ef9859ac6b7e2fb +refs/heads/master: 0221519534ac5060b55d7f5d0accdd30364b7997 diff --git a/trunk/drivers/staging/iio/cdc/ad7150.c b/trunk/drivers/staging/iio/cdc/ad7150.c index 3c608c14dd99..687dd2c91437 100644 --- a/trunk/drivers/staging/iio/cdc/ad7150.c +++ b/trunk/drivers/staging/iio/cdc/ad7150.c @@ -429,8 +429,8 @@ static const struct iio_chan_spec ad7150_channels[] = { .type = IIO_CAPACITANCE, .indexed = 1, .channel = 0, - .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | - IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE_BIT, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_AVERAGE_RAW), .event_mask = IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) | IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING) | @@ -442,8 +442,8 @@ static const struct iio_chan_spec ad7150_channels[] = { .type = IIO_CAPACITANCE, .indexed = 1, .channel = 1, - .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | - IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE_BIT, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_AVERAGE_RAW), .event_mask = IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) | IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING) |