Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux.git] / drivers / pinctrl / core.c

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index b0eea728455de0d5e974d6c6369a07d202cb5988..446d84fe0e31c7ec471bfc7fa66a3e782996ac04 100644 (file)
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -1526,15 +1526,8 @@ int pinctrl_init_done(struct device *dev)
        return ret;
 }
 
-#ifdef CONFIG_PM
-
-/**
- * pinctrl_pm_select_state() - select pinctrl state for PM
- * @dev: device to select default state for
- * @state: state to set
- */
-static int pinctrl_pm_select_state(struct device *dev,
-                                  struct pinctrl_state *state)
+static int pinctrl_select_bound_state(struct device *dev,
+                                     struct pinctrl_state *state)
 {
        struct dev_pin_info *pins = dev->pins;
        int ret;
@@ -1549,15 +1542,27 @@ static int pinctrl_pm_select_state(struct device *dev,
 }
 
 /**
- * pinctrl_pm_select_default_state() - select default pinctrl state for PM
+ * pinctrl_select_default_state() - select default pinctrl state
  * @dev: device to select default state for
  */
-int pinctrl_pm_select_default_state(struct device *dev)
+int pinctrl_select_default_state(struct device *dev)
 {
        if (!dev->pins)
                return 0;
 
-       return pinctrl_pm_select_state(dev, dev->pins->default_state);
+       return pinctrl_select_bound_state(dev, dev->pins->default_state);
+}
+EXPORT_SYMBOL_GPL(pinctrl_select_default_state);
+
+#ifdef CONFIG_PM
+
+/**
+ * pinctrl_pm_select_default_state() - select default pinctrl state for PM
+ * @dev: device to select default state for
+ */
+int pinctrl_pm_select_default_state(struct device *dev)
+{
+       return pinctrl_select_default_state(dev);
 }
 EXPORT_SYMBOL_GPL(pinctrl_pm_select_default_state);
 
@@ -1570,7 +1575,7 @@ int pinctrl_pm_select_sleep_state(struct device *dev)
        if (!dev->pins)
                return 0;
 
-       return pinctrl_pm_select_state(dev, dev->pins->sleep_state);
+       return pinctrl_select_bound_state(dev, dev->pins->sleep_state);
 }
 EXPORT_SYMBOL_GPL(pinctrl_pm_select_sleep_state);
 
@@ -1583,7 +1588,7 @@ int pinctrl_pm_select_idle_state(struct device *dev)
        if (!dev->pins)
                return 0;
 
-       return pinctrl_pm_select_state(dev, dev->pins->idle_state);
+       return pinctrl_select_bound_state(dev, dev->pins->idle_state);
 }
 EXPORT_SYMBOL_GPL(pinctrl_pm_select_idle_state);
 #endif