From: Jonathan Cameron <jic23@kernel.org>
To: "Andrew F. Davis" <afd@ti.com>,
"Stefan Brüns" <stefan.bruens@rwth-aachen.de>,
linux-iio@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Marc Titinger <mtitinger@baylibre.com>
Subject: Re: [PATCH 2/2] iio: adc: Fix bad GENMASK use, typos, whitespace
Date: Sun, 7 May 2017 14:42:48 +0100 [thread overview]
Message-ID: <10fe5c8f-e3c8-08aa-cd18-f9c4e08f2eb1@kernel.org> (raw)
In-Reply-To: <64dfaa1b-5979-5b7a-be1a-64ca7148e0ef@ti.com>
On 02/05/17 21:06, Andrew F. Davis wrote:
> On 05/01/2017 06:19 AM, Stefan Brüns wrote:
>> Commit 7906dd52c5a0 ("iio: ina2xx: Fix whitespace and re-order code")
>> changed the register number of the MASK_ENABLE register from 0x06 to the
>> value equivalent GENMASK(2,1), although its no mask.
>> Also fix a typo (INA2_6_6 instead of INA2_2_6), and use the datasheet
>> name ("Mask/Enable") for the register number define.
>> Fix bad indentation for channel attributes.
>>
>> Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
>> ---
>
> Good catches,
>
> Acked-by: Andrew F. Davis <afd@ti.com>
Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.
Thanks,
Jonathan
>
>> drivers/iio/adc/ina2xx-adc.c | 12 ++++++------
>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/iio/adc/ina2xx-adc.c b/drivers/iio/adc/ina2xx-adc.c
>> index 3263231276ca..f395101d68d7 100644
>> --- a/drivers/iio/adc/ina2xx-adc.c
>> +++ b/drivers/iio/adc/ina2xx-adc.c
>> @@ -41,8 +41,8 @@
>> #define INA2XX_CURRENT 0x04 /* readonly */
>> #define INA2XX_CALIBRATION 0x05
>>
>> -#define INA226_ALERT_MASK GENMASK(2, 1)
>> -#define INA266_CVRF BIT(3)
>> +#define INA226_MASK_ENABLE 0x06
>> +#define INA226_CVRF BIT(3)
>>
>> #define INA2XX_MAX_REGISTERS 8
>>
>> @@ -416,8 +416,8 @@ static ssize_t ina2xx_shunt_resistor_store(struct device *dev,
>> .address = (_address), \
>> .indexed = 1, \
>> .channel = (_index), \
>> - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) \
>> - | BIT(IIO_CHAN_INFO_SCALE), \
>> + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
>> + BIT(IIO_CHAN_INFO_SCALE), \
>> .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ) | \
>> BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), \
>> .scan_index = (_index), \
>> @@ -480,12 +480,12 @@ static int ina2xx_work_buffer(struct iio_dev *indio_dev)
>> */
>> if (!chip->allow_async_readout)
>> do {
>> - ret = regmap_read(chip->regmap, INA226_ALERT_MASK,
>> + ret = regmap_read(chip->regmap, INA226_MASK_ENABLE,
>> &alert);
>> if (ret < 0)
>> return ret;
>>
>> - alert &= INA266_CVRF;
>> + alert &= INA226_CVRF;
>> } while (!alert);
>>
>> /*
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
prev parent reply other threads:[~2017-05-07 22:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20170501111942.12736-1-stefan.bruens@rwth-aachen.de>
2017-05-01 11:19 ` [PATCH 1/2] iio: Documentation: Remove (partially) duplicate line Stefan Brüns
2017-05-07 13:40 ` Jonathan Cameron
2017-05-01 11:19 ` [PATCH 2/2] iio: adc: Fix bad GENMASK use, typos, whitespace Stefan Brüns
2017-05-02 20:06 ` Andrew F. Davis
2017-05-07 13:42 ` Jonathan Cameron [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=10fe5c8f-e3c8-08aa-cd18-f9c4e08f2eb1@kernel.org \
--to=jic23@kernel.org \
--cc=afd@ti.com \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtitinger@baylibre.com \
--cc=pmeerw@pmeerw.net \
--cc=stefan.bruens@rwth-aachen.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome