From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753311AbbJ0BKM (ORCPT ); Mon, 26 Oct 2015 21:10:12 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:51684 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751998AbbJ0BKK (ORCPT ); Mon, 26 Oct 2015 21:10:10 -0400 Date: Mon, 26 Oct 2015 18:10:08 -0700 From: Guenter Roeck To: Marc Titinger Cc: jdelvare@suse.com, lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2] hwmon: ina2xx: give precedence to DT over checking for platform data. Message-ID: <20151027011008.GB31838@roeck-us.net> References: <562B7D56.3010700@roeck-us.net> <1445876673-32180-3-git-send-email-mtitinger@baylibre.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1445876673-32180-3-git-send-email-mtitinger@baylibre.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Oct 26, 2015 at 05:24:33PM +0100, Marc Titinger wrote: > when checking for the value of the shunt resistor. > > Signed-off-by: Marc Titinger > --- > drivers/hwmon/ina2xx.c | 21 ++++++++++----------- > 1 file changed, 10 insertions(+), 11 deletions(-) > > diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c > index 3edd163..1946433 100644 > --- a/drivers/hwmon/ina2xx.c > +++ b/drivers/hwmon/ina2xx.c > @@ -414,7 +414,6 @@ static const struct attribute_group ina226_group = { > static int ina2xx_probe(struct i2c_client *client, > const struct i2c_device_id *id) > { > - struct ina2xx_platform_data *pdata; > struct device *dev = &client->dev; > struct ina2xx_data *data; > struct device *hwmon_dev; > @@ -425,14 +424,13 @@ static int ina2xx_probe(struct i2c_client *client, > if (!data) > return -ENOMEM; > > - if (dev_get_platdata(dev)) { > - pdata = dev_get_platdata(dev); > - data->rshunt = pdata->shunt_uohms; > - } else if (!of_property_read_u32(dev->of_node, > - "shunt-resistor", &val)) { > - data->rshunt = val; > - } else { > - data->rshunt = INA2XX_RSHUNT_DEFAULT; > + if (of_property_read_u32(dev->of_node, "shunt-resistor", &val) < 0) { > + struct ina2xx_platform_data *pdata = dev_get_platdata(dev); > + > + if (pdata) > + val = pdata->shunt_uohms; > + else > + val = INA2XX_RSHUNT_DEFAULT; > } > > /* set the device type */ > @@ -440,10 +438,11 @@ static int ina2xx_probe(struct i2c_client *client, > data->config = &ina2xx_config[data->kind]; > data->client = client; > > - if (data->rshunt <= 0 || > - data->rshunt > data->config->calibration_factor) > + if (val <= 0 || val > data->config->calibration_factor) > return -ENODEV; > > + data->rshunt = val; > + I think it would be better to rearrange the code a bit. The code now looks odd, with value being assigned, then the assignment of data->kind etc, followed by checking val. It might be better to do the assignments first, then calculate val, and check its range immediately. > ina2xx_regmap_config.max_register = data->config->registers; > > data->regmap = devm_regmap_init_i2c(client, &ina2xx_regmap_config); > -- > 1.9.1 >