diff options
| author | Zhangfei Gao <zhangfei.gao@linaro.org> | 2013-03-19 22:32:11 +0800 |
|---|---|---|
| committer | Zhangfei Gao <zhangfei.gao@linaro.org> | 2013-03-19 22:32:11 +0800 |
| commit | c601f5d861f526c75d688fe5970a2f1306fc1d11 (patch) | |
| tree | b3e6a84aba847606c0c507aa44d9da32fb79dc20 | |
| parent | 02044b50c904eb184fed07652a8efac2bc807a71 (diff) | |
i2c: designware: change pinctrl funcmmc_branch
Use devm_pinctrl_get_select_default to set default pinctrl
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-hs.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/drivers/i2c/busses/i2c-designware-hs.c b/drivers/i2c/busses/i2c-designware-hs.c index db0712fb9128..d986a12f5bb5 100644 --- a/drivers/i2c/busses/i2c-designware-hs.c +++ b/drivers/i2c/busses/i2c-designware-hs.c @@ -41,7 +41,6 @@ static int hs_dw_i2c_probe(struct platform_device *pdev) struct i2c_adapter *adap; struct resource *iores; struct pinctrl *pinctrl; - struct pinctrl_state *pins_default; int r; d = devm_kzalloc(&pdev->dev, sizeof(struct dw_i2c_dev), GFP_KERNEL); @@ -70,20 +69,10 @@ static int hs_dw_i2c_probe(struct platform_device *pdev) return -EINVAL; } - pinctrl = devm_pinctrl_get(&pdev->dev); + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); if (IS_ERR(pinctrl)) - return PTR_ERR(pinctrl); - - pins_default = pinctrl_lookup_state(pinctrl, - PINCTRL_STATE_DEFAULT); - if (IS_ERR(pins_default)) { - dev_warn(&pdev->dev, "could not get default pinstate\n"); - } else { - r = pinctrl_select_state(pinctrl, pins_default); - if (r) - dev_warn(&pdev->dev, - "could not set default pins\n"); - } + dev_warn(&pdev->dev, + "pins are not configured from the driver\n"); d->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(d->clk)) |