diff options
| author | Lee Jones <lee.jones@linaro.org> | 2013-09-27 14:25:55 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2013-10-23 16:21:41 +0100 |
| commit | 22d7dc8aba3bf34fdf324f43718c238075cc7cf7 (patch) | |
| tree | 94d110c29650c6b3529f3fbdfeecbe128ed96ddf /drivers/mfd | |
| parent | 5e172d751869ca6756a7276168e11d641dc6b58a (diff) | |
| download | op-kernel-dev-22d7dc8aba3bf34fdf324f43718c238075cc7cf7.zip op-kernel-dev-22d7dc8aba3bf34fdf324f43718c238075cc7cf7.tar.gz | |
mfd: arizona: Only attempt to parse DT if platform data was not passed
If platform data is passed when probing the device then it should take
precedence over Device Tree. This patch saves cycles in the pdata case
and prevents error messages when DT is not passed.
Reported-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/arizona-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index 5ac3aa4..a2f5bef 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -607,11 +607,11 @@ int arizona_dev_init(struct arizona *arizona) dev_set_drvdata(arizona->dev, arizona); mutex_init(&arizona->clk_lock); - arizona_of_get_core_pdata(arizona); - if (dev_get_platdata(arizona->dev)) memcpy(&arizona->pdata, dev_get_platdata(arizona->dev), sizeof(arizona->pdata)); + else + arizona_of_get_core_pdata(arizona); regcache_cache_only(arizona->regmap, true); |
