From: Marc Titinger <mtitinger@baylibre.com> To: linux@roeck-us.net, jdelvare@suse.com Cc: lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org, mturquette@baylibre.com, bcousson@baylibre.com, ptitiano@baylibre.com, Marc Titinger <mtitinger@baylibre.com> Subject: [PATCH v2 2/2] hwmon: ina2xx: give precedence to DT over checking for platform data. Date: Tue, 27 Oct 2015 10:51:08 +0100 [thread overview] Message-ID: <1445939468-21755-2-git-send-email-mtitinger@baylibre.com> (raw) In-Reply-To: <1445939468-21755-1-git-send-email-mtitinger@baylibre.com> In-Reply-To: <20151027011008.GB31838@roeck-us.net> when checking for the value of the shunt resistor. Signed-off-by: Marc Titinger <mtitinger@baylibre.com> --- v2: - do part type init earlier to regroup rshunt value checking and assignement. drivers/hwmon/ina2xx.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c index 5e7ada8..5fe742b 100644 --- a/drivers/hwmon/ina2xx.c +++ b/drivers/hwmon/ina2xx.c @@ -417,7 +417,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; @@ -428,24 +427,24 @@ 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; - } - /* set the device type */ data->kind = id->driver_data; data->config = &ina2xx_config[data->kind]; - if (data->rshunt <= 0 || - data->rshunt > data->config->calibration_factor) + 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; + } + + if (val <= 0 || val > data->config->calibration_factor) return -ENODEV; + data->rshunt = val; + ina2xx_regmap_config.max_register = data->config->registers; data->regmap = devm_regmap_init_i2c(client, &ina2xx_regmap_config); -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Marc Titinger <mtitinger@baylibre.com> To: linux@roeck-us.net, jdelvare@suse.com Cc: lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org, mturquette@baylibre.com, bcousson@baylibre.com, ptitiano@baylibre.com, Marc Titinger <mtitinger@baylibre.com> Subject: [lm-sensors] [PATCH v2 2/2] hwmon: ina2xx: give precedence to DT over checking for platform data. Date: Tue, 27 Oct 2015 09:51:08 +0000 [thread overview] Message-ID: <1445939468-21755-2-git-send-email-mtitinger@baylibre.com> (raw) In-Reply-To: <1445939468-21755-1-git-send-email-mtitinger@baylibre.com> when checking for the value of the shunt resistor. Signed-off-by: Marc Titinger <mtitinger@baylibre.com> --- v2: - do part type init earlier to regroup rshunt value checking and assignement. drivers/hwmon/ina2xx.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c index 5e7ada8..5fe742b 100644 --- a/drivers/hwmon/ina2xx.c +++ b/drivers/hwmon/ina2xx.c @@ -417,7 +417,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; @@ -428,24 +427,24 @@ 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; - } - /* set the device type */ data->kind = id->driver_data; data->config = &ina2xx_config[data->kind]; - if (data->rshunt <= 0 || - data->rshunt > data->config->calibration_factor) + 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; + } + + if (val <= 0 || val > data->config->calibration_factor) return -ENODEV; + data->rshunt = val; + ina2xx_regmap_config.max_register = data->config->registers; data->regmap = devm_regmap_init_i2c(client, &ina2xx_regmap_config); -- 1.9.1 _______________________________________________ lm-sensors mailing list lm-sensors@lm-sensors.org http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
next prev parent reply other threads:[~2015-10-27 9:52 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-10-19 16:21 [RFC] hwmon: ina2xx: allow for actual measurement bandwidth above 160 Hz Marc Titinger 2015-10-19 16:21 ` [lm-sensors] " Marc Titinger 2015-10-20 1:32 ` Guenter Roeck 2015-10-20 1:32 ` [lm-sensors] " Guenter Roeck 2015-10-20 7:58 ` Marc Titinger 2015-10-20 7:58 ` [lm-sensors] " Marc Titinger 2015-10-20 8:20 ` [PATCH v2] " Marc Titinger 2015-10-20 8:20 ` [lm-sensors] " Marc Titinger 2015-10-20 12:54 ` Guenter Roeck 2015-10-20 12:54 ` [lm-sensors] " Guenter Roeck 2015-10-20 13:17 ` Marc Titinger 2015-10-20 13:17 ` [lm-sensors] " Marc Titinger 2015-10-20 13:30 ` Guenter Roeck 2015-10-20 13:30 ` [lm-sensors] " Guenter Roeck 2015-10-20 13:46 ` Marc Titinger 2015-10-20 13:46 ` [lm-sensors] " Marc Titinger 2015-10-20 17:00 ` Guenter Roeck 2015-10-20 17:00 ` [lm-sensors] " Guenter Roeck 2015-10-21 7:46 ` Marc Titinger 2015-10-21 7:46 ` [lm-sensors] " Marc Titinger 2015-10-20 13:52 ` Michael Turquette 2015-10-20 13:52 ` [lm-sensors] " Michael Turquette 2015-10-23 16:13 ` [RFC] hwmon: ina2xx: port to using remap, improve bandwidth Marc Titinger 2015-10-23 16:13 ` [lm-sensors] " Marc Titinger 2015-10-23 16:49 ` kbuild test robot 2015-10-23 16:49 ` [lm-sensors] " kbuild test robot 2015-10-23 16:52 ` Guenter Roeck 2015-10-23 16:52 ` [lm-sensors] " Guenter Roeck 2015-10-23 20:35 ` Marc Titinger 2015-10-23 20:35 ` [lm-sensors] " Marc Titinger 2015-10-24 2:21 ` Guenter Roeck 2015-10-24 2:21 ` [lm-sensors] " Guenter Roeck 2015-10-24 12:45 ` Guenter Roeck 2015-10-24 12:45 ` [lm-sensors] " Guenter Roeck 2015-10-26 16:24 ` [PATCH 0/2] hwmon: ina2xx: convert driver to using regmap Marc Titinger 2015-10-26 16:24 ` [lm-sensors] " Marc Titinger 2015-10-26 16:24 ` [PATCH 1/2] " Marc Titinger 2015-10-26 16:24 ` [lm-sensors] " Marc Titinger 2015-10-27 1:02 ` Guenter Roeck 2015-10-27 1:02 ` [lm-sensors] " Guenter Roeck 2015-10-27 1:12 ` Guenter Roeck 2015-10-27 1:12 ` [lm-sensors] " Guenter Roeck 2015-10-27 9:51 ` [PATCH v2 " Marc Titinger 2015-10-27 9:51 ` [lm-sensors] " Marc Titinger 2015-10-28 2:47 ` Guenter Roeck 2015-10-28 2:47 ` [lm-sensors] " Guenter Roeck 2015-10-28 9:23 ` Marc Titinger 2015-10-28 9:23 ` [lm-sensors] " Marc Titinger 2015-10-26 16:24 ` [PATCH 2/2] hwmon: ina2xx: give precedence to DT over checking for platform data Marc Titinger 2015-10-26 16:24 ` [lm-sensors] " Marc Titinger 2015-10-27 1:10 ` Guenter Roeck 2015-10-27 1:10 ` [lm-sensors] " Guenter Roeck 2015-10-27 9:51 ` Marc Titinger [this message] 2015-10-27 9:51 ` [lm-sensors] [PATCH v2 " Marc Titinger 2015-10-23 16:55 ` [RFC] hwmon: ina2xx: port to using remap, improve bandwidth kbuild test robot 2015-10-23 16:55 ` [lm-sensors] " kbuild test robot 2015-10-23 20:10 ` kbuild test robot 2015-10-23 20:10 ` [lm-sensors] " kbuild test robot
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=1445939468-21755-2-git-send-email-mtitinger@baylibre.com \ --to=mtitinger@baylibre.com \ --cc=bcousson@baylibre.com \ --cc=jdelvare@suse.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=lm-sensors@lm-sensors.org \ --cc=mturquette@baylibre.com \ --cc=ptitiano@baylibre.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.