From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 528DBC04EB8 for ; Sun, 2 Dec 2018 15:45:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 02F4E20881 for ; Sun, 2 Dec 2018 15:45:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="S6iP7sMg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 02F4E20881 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-iio-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725878AbeLBPpV (ORCPT ); Sun, 2 Dec 2018 10:45:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:40242 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725869AbeLBPpV (ORCPT ); Sun, 2 Dec 2018 10:45:21 -0500 Received: from archlinux (cpc91196-cmbg18-2-0-cust659.5-4.cable.virginm.net [81.96.234.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 55AD42082F; Sun, 2 Dec 2018 15:45:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543765516; bh=Qayha4uM2DnVZ64Y/fEyeMA7JYBB1KSBjEptSWOtF3w=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=S6iP7sMgrn5IIwu06R3i/QeYtRxY1ztsPBcRCIvUDW4rgTKUmYaVXyyc7Y+lil7iT g5PCRpoE41oUtnYvx+rDsnDeTWmdkH9Wc9Bzo33AgbqkxOw3TkyJ30sGbVIefDQh6O ONE+uUU3M9gpxhlOcuQAPSR+xXhT5Bq5DYCsb7Jo= Date: Sun, 2 Dec 2018 15:45:12 +0000 From: Jonathan Cameron To: Slawomir Stepien Cc: lars@metafoo.de, Michael.Hennerich@analog.com, knaack.h@gmx.de, pmeerw@pmeerw.net, linux-iio@vger.kernel.org, gregkh@linuxfoundation.org Subject: Re: [PATCH 1/3] staging: iio: adc: ad7280a: split ad7280_channel_init() to more functions Message-ID: <20181202154512.5ed31f1f@archlinux> In-Reply-To: <20181202115830.20363-2-sst@poczta.fm> References: <20181202115830.20363-1-sst@poczta.fm> <20181202115830.20363-2-sst@poczta.fm> X-Mailer: Claws Mail 3.17.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org On Sun, 2 Dec 2018 12:58:28 +0100 Slawomir Stepien wrote: > The ad7280_channel_init function has been split into more specific > functions to increase the code readability. > > Signed-off-by: Slawomir Stepien Hi Slawomir, A few comments inline. I agree with the basic idea, but suggest a slight different balance in where things are handled. Jonathan > --- > drivers/staging/iio/adc/ad7280a.c | 119 +++++++++++++++++++----------- > 1 file changed, 77 insertions(+), 42 deletions(-) > > diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c > index 7a0ba26f9fd9..a6b1bdd9f372 100644 > --- a/drivers/staging/iio/adc/ad7280a.c > +++ b/drivers/staging/iio/adc/ad7280a.c > @@ -496,6 +496,75 @@ static const struct attribute_group ad7280_attrs_group = { > .attrs = ad7280_attributes, > }; > > +static void ad7280_voltage_channel_init(struct ad7280_state *st, int cnt, > + int dev, int ch) > +{ > + struct iio_chan_spec *chan = &st->channels[cnt]; Pass the chan spec in here instead of the _state structure. It will give cleaner code and better visibility on the scope of this function where it is called. > + > + chan->type = IIO_VOLTAGE; > + chan->differential = 1; > + chan->channel = (dev * 6) + ch; This offset does seem more than a little random buried away in this function. I would pass it in explicitly as a parameter so that the we have all the channel number manipulations visible in one place. > + chan->channel2 = chan->channel + 1; > +} > + > +static void ad7280_temp_channel_init(struct ad7280_state *st, int cnt, int dev, > + int ch) > +{ > + struct iio_chan_spec *chan = &st->channels[cnt]; > + > + chan->type = IIO_TEMP; > + chan->channel = (dev * 6) + ch - 6; This one is even more obscure when found in here. Pass it in as an additional parameter. > +} > + > +static void ad7280_common_fields_init(struct ad7280_state *st, int cnt, int dev, > + int ch) It's not really the common fields given the voltage version is different. Perhaps there is a better name for this function? > +{ > + struct iio_chan_spec *chan = &st->channels[cnt]; > + > + chan->indexed = 1; > + chan->info_mask_separate = BIT(IIO_CHAN_INFO_RAW); > + chan->info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE); > + chan->address = ad7280a_devaddr(dev) << 8 | ch; > + chan->scan_index = cnt; > + chan->scan_type.sign = 'u'; > + chan->scan_type.realbits = 12; > + chan->scan_type.storagebits = 32; > + chan->scan_type.shift = 0; I doubt there is any need to set shift and 0 is the obvious default so no 'documentation' benefit in doing it here. > +} > + > +static void ad7280_all_voltage_channel_init(struct ad7280_state *st, int cnt, > + int dev) Total voltage perhaps rather than 'all'? > +{ > + struct iio_chan_spec *chan = &st->channels[cnt]; > + > + chan->type = IIO_VOLTAGE; > + chan->differential = 1; > + chan->channel = 0; > + chan->channel2 = dev * 6; > + chan->address = AD7280A_ALL_CELLS; > + chan->indexed = 1; > + chan->info_mask_separate = BIT(IIO_CHAN_INFO_RAW); > + chan->info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE); > + chan->scan_index = cnt; > + chan->scan_type.sign = 'u'; > + chan->scan_type.realbits = 32; > + chan->scan_type.storagebits = 32; > + chan->scan_type.shift = 0; > +} > + > +static void ad7280_timestamp_channel_init(struct ad7280_state *st, int cnt) > +{ > + struct iio_chan_spec *chan = &st->channels[cnt]; > + > + chan->type = IIO_TIMESTAMP; > + chan->channel = -1; > + chan->scan_index = cnt; > + chan->scan_type.sign = 's'; > + chan->scan_type.realbits = 64; > + chan->scan_type.storagebits = 64; > + chan->scan_type.shift = 0; > +} > + > static int ad7280_channel_init(struct ad7280_state *st) > { > int dev, ch, cnt; > @@ -508,51 +577,17 @@ static int ad7280_channel_init(struct ad7280_state *st) > for (dev = 0, cnt = 0; dev <= st->slave_num; dev++) > for (ch = AD7280A_CELL_VOLTAGE_1; ch <= AD7280A_AUX_ADC_6; > ch++, cnt++) { > - if (ch < AD7280A_AUX_ADC_1) { > - st->channels[cnt].type = IIO_VOLTAGE; > - st->channels[cnt].differential = 1; > - st->channels[cnt].channel = (dev * 6) + ch; > - st->channels[cnt].channel2 = > - st->channels[cnt].channel + 1; > - } else { > - st->channels[cnt].type = IIO_TEMP; > - st->channels[cnt].channel = (dev * 6) + ch - 6; > - } > - st->channels[cnt].indexed = 1; > - st->channels[cnt].info_mask_separate = > - BIT(IIO_CHAN_INFO_RAW); > - st->channels[cnt].info_mask_shared_by_type = > - BIT(IIO_CHAN_INFO_SCALE); > - st->channels[cnt].address = > - ad7280a_devaddr(dev) << 8 | ch; > - st->channels[cnt].scan_index = cnt; > - st->channels[cnt].scan_type.sign = 'u'; > - st->channels[cnt].scan_type.realbits = 12; > - st->channels[cnt].scan_type.storagebits = 32; > - st->channels[cnt].scan_type.shift = 0; > + if (ch < AD7280A_AUX_ADC_1) > + ad7280_voltage_channel_init(st, cnt, dev, ch); > + else > + ad7280_temp_channel_init(st, cnt, dev, ch); > + > + ad7280_common_fields_init(st, cnt, dev, ch); > } > > - st->channels[cnt].type = IIO_VOLTAGE; > - st->channels[cnt].differential = 1; > - st->channels[cnt].channel = 0; > - st->channels[cnt].channel2 = dev * 6; > - st->channels[cnt].address = AD7280A_ALL_CELLS; > - st->channels[cnt].indexed = 1; > - st->channels[cnt].info_mask_separate = BIT(IIO_CHAN_INFO_RAW); > - st->channels[cnt].info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE); > - st->channels[cnt].scan_index = cnt; > - st->channels[cnt].scan_type.sign = 'u'; > - st->channels[cnt].scan_type.realbits = 32; > - st->channels[cnt].scan_type.storagebits = 32; > - st->channels[cnt].scan_type.shift = 0; > + ad7280_all_voltage_channel_init(st, cnt, dev); > cnt++; > - st->channels[cnt].type = IIO_TIMESTAMP; > - st->channels[cnt].channel = -1; > - st->channels[cnt].scan_index = cnt; > - st->channels[cnt].scan_type.sign = 's'; > - st->channels[cnt].scan_type.realbits = 64; > - st->channels[cnt].scan_type.storagebits = 64; > - st->channels[cnt].scan_type.shift = 0; > + ad7280_timestamp_channel_init(st, cnt); > > return cnt + 1; > }