usb: chipidea: ci13xxx_imx: let device core handle pinctrl
authorFabio Estevam <fabio.estevam@freescale.com>
Thu, 13 Jun 2013 14:59:45 +0000 (17:59 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Jun 2013 20:45:45 +0000 (13:45 -0700)
Since commit ab78029 (drivers/pinctrl: grab default handles from device core),
we can rely on device core for handling pinctrl.

So remove devm_pinctrl_get_select_default() from the driver.

Cc: <linux-usb@vger.kernel.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/chipidea/ci13xxx_imx.c

index 585099a..45bb9b5 100644 (file)
@@ -20,7 +20,6 @@
 #include <linux/usb/chipidea.h>
 #include <linux/clk.h>
 #include <linux/regulator/consumer.h>
-#include <linux/pinctrl/consumer.h>
 
 #include "ci.h"
 #include "ci13xxx_imx.h"
@@ -103,7 +102,6 @@ static int ci13xxx_imx_probe(struct platform_device *pdev)
        struct device_node *phy_np;
        struct resource *res;
        struct regulator *reg_vbus;
-       struct pinctrl *pinctrl;
        int ret;
 
        if (of_find_property(pdev->dev.of_node, "fsl,usbmisc", NULL)
@@ -122,11 +120,6 @@ static int ci13xxx_imx_probe(struct platform_device *pdev)
                return -ENOENT;
        }
 
-       pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-       if (IS_ERR(pinctrl))
-               dev_warn(&pdev->dev, "pinctrl get/select failed, err=%ld\n",
-                       PTR_ERR(pinctrl));
-
        data->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(data->clk)) {
                dev_err(&pdev->dev,