Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1564897 > unrolled thread
| Started by | Lee Jones <lee.jones@linaro.org> |
|---|---|
| First post | 2017-01-23 12:40 +0100 |
| Last post | 2017-01-23 12:40 +0100 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
Re: [PATCH v2 1/4] mfd: max77686: Don't attempt to get i2c_device_id .data Lee Jones <lee.jones@linaro.org> - 2017-01-23 12:40 +0100
| From | Lee Jones <lee.jones@linaro.org> |
|---|---|
| Date | 2017-01-23 12:40 +0100 |
| Subject | Re: [PATCH v2 1/4] mfd: max77686: Don't attempt to get i2c_device_id .data |
| Message-ID | <t2L8C-5R4-11@gated-at.bofh.it> |
On Fri, 13 Jan 2017, Javier Martinez Canillas wrote:
> The driver is only used in platforms that have DT support so always the
> I2C device .data will be get from the matched OF node and never will be
> from the I2C device ID table.
>
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> Acked-by: Laxman Dewangan <ldewangan@nvidia.com>
> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
> Tested-by: Krzysztof Kozlowski <krzk@kernel.org>
>
> ---
>
> Changes in v2:
> - Add Laxman's Acked-by tag to patch 1/4.
> - Add Krzysztof's Reviewed-by and Tested-by tags to patch 1/4.
>
> drivers/mfd/max77686.c | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
Applied, thanks.
(this patch supersedes the previous one -- no action required)
> diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
> index 7b68ed72e9cb..ddae3bf3e46c 100644
> --- a/drivers/mfd/max77686.c
> +++ b/drivers/mfd/max77686.c
> @@ -188,14 +188,11 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
> if (!max77686)
> return -ENOMEM;
>
> - if (i2c->dev.of_node) {
> - match = of_match_node(max77686_pmic_dt_match, i2c->dev.of_node);
> - if (!match)
> - return -EINVAL;
> -
> - max77686->type = (unsigned long)match->data;
> - } else
> - max77686->type = id->driver_data;
> + match = of_match_node(max77686_pmic_dt_match, i2c->dev.of_node);
> + if (!match)
> + return -EINVAL;
> +
> + max77686->type = (unsigned long)match->data;
>
> i2c_set_clientdata(i2c, max77686);
> max77686->dev = &i2c->dev;
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Back to top | Article view | linux.kernel
csiph-web