diff options
| author | Zhangfei Gao <zhangfei.gao@linaro.org> | 2013-03-19 20:09:38 +0800 |
|---|---|---|
| committer | Zhangfei Gao <zhangfei.gao@linaro.org> | 2013-03-19 22:26:16 +0800 |
| commit | 02044b50c904eb184fed07652a8efac2bc807a71 (patch) | |
| tree | 1ac71f26ea40971b3af985ccac7b341baa3b1ff0 | |
| parent | acb0005b392040acbaf6de6d944b8802fa0e1f0f (diff) | |
mmc: dw_mmc-hisilicon: change pinctrl func
Use devm_pinctrl_get_select_default to set default pinctrl
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
| -rw-r--r-- | drivers/mmc/host/dw_mmc-hisilicon.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/drivers/mmc/host/dw_mmc-hisilicon.c b/drivers/mmc/host/dw_mmc-hisilicon.c index 29c4f380685b..85c4271e2bd3 100644 --- a/drivers/mmc/host/dw_mmc-hisilicon.c +++ b/drivers/mmc/host/dw_mmc-hisilicon.c @@ -349,26 +349,15 @@ int dw_mci_hs_probe(struct platform_device *pdev) const struct dw_mci_drv_data *drv_data; const struct of_device_id *match; struct pinctrl *pinctrl; - struct pinctrl_state *pins_default; - int r; match = of_match_node(dw_mci_hs_match, pdev->dev.of_node); drv_data = match->data; - pinctrl = devm_pinctrl_get(&pdev->dev); + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); if (IS_ERR(pinctrl)) - return PTR_ERR(pinctrl); + dev_warn(&pdev->dev, + "pins are not configured from the driver\n"); - 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"); - } return dw_mci_pltfm_register(pdev, drv_data); } |