Linux pinctrl_select_state() operates on struct pinctrl_state. The
helper that selects a state by name is instead called
pinctrl_get_select.
There's only a single user in-tree for that function, so let's rename
it and adjust the prototype.
Signed-off-by: Ahmad Fatoum <a.fat...@pengutronix.de>
---
drivers/i2c/busses/i2c-imx.c | 24 ++++++++++++++----------
drivers/pinctrl/pinctrl.c | 13 +++++++++----
include/linux/pinctrl/consumer.h | 10 +++++++---
3 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index f6a67ec067df..981db015ea34 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -509,21 +509,25 @@ static int i2c_fsl_xfer(struct i2c_adapter *adapter,
return (result < 0) ? result : num;
}
+static void i2c_fsl_pinctrl_select_state(struct i2c_adapter *adapter,
+ const char *name)
+{
+ struct pinctrl *pinctrl;
+
+ pinctrl = pinctrl_get_select(adapter->dev.parent, name);
+ if (pinctrl)
+ pinctrl_put(pinctrl);
+ else
+ dev_err(adapter->dev.parent, "pinctrl failed: %pe\n", pinctrl);
+}
+
static void i2c_fsl_prepare_recovery(struct i2c_adapter *adapter)
{
- int ret;
-
- ret = pinctrl_select_state(adapter->dev.parent, "gpio");
- if (ret)
- dev_err(adapter->dev.parent, "pinctrl failed: %s\n",
strerror(-ret));
+ i2c_fsl_pinctrl_select_state(adapter, "gpio");
}
static void i2c_fsl_unprepare_recovery(struct i2c_adapter *adapter)
{
- int ret;
-
- ret = pinctrl_select_state(adapter->dev.parent, "default");
- if (ret)
- dev_err(adapter->dev.parent, "pinctrl failed: %s\n",
strerror(-ret));
+ i2c_fsl_pinctrl_select_state(adapter, "default");
}
static void i2c_fsl_init_recovery(struct fsl_i2c_struct *i2c_fsl,
diff --git a/drivers/pinctrl/pinctrl.c b/drivers/pinctrl/pinctrl.c
index 95e7b0ea96e1..2d331211f71c 100644
--- a/drivers/pinctrl/pinctrl.c
+++ b/drivers/pinctrl/pinctrl.c
@@ -161,20 +161,25 @@ int of_pinctrl_select_state_default(struct device_node
*np)
return of_pinctrl_select_state(np, "default");
}
-int pinctrl_select_state(struct device *dev, const char *name)
+struct pinctrl *pinctrl_get_select(struct device *dev, const char *name)
{
struct device_node *np;
+ int ret;
np = dev->of_node;
if (!np)
- return 0;
+ return ERR_PTR(-ENODEV);
- return of_pinctrl_select_state(np, name);
+ ret = of_pinctrl_select_state(np, name);
+ if (ret)
+ return ERR_PTR(ret);
+
+ return (struct pinctrl *)np;
}
int pinctrl_select_state_default(struct device *dev)
{
- return pinctrl_select_state(dev, "default");
+ return PTR_ERR_OR_ZERO(pinctrl_get_select(dev, "default"));
}
int pinctrl_register(struct pinctrl_device *pdev)
diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h
index 3028f960deb4..33d5c1b19a89 100644
--- a/include/linux/pinctrl/consumer.h
+++ b/include/linux/pinctrl/consumer.h
@@ -7,8 +7,10 @@
struct device;
struct device_node;
+struct pinctrl;
+
#ifdef CONFIG_PINCTRL
-int pinctrl_select_state(struct device *dev, const char *state);
+struct pinctrl *pinctrl_get_select(struct device *dev, const char *state);
int pinctrl_select_state_default(struct device *dev);
int of_pinctrl_select_state(struct device_node *np, const char *state);
int of_pinctrl_select_state_default(struct device_node *np);
@@ -17,9 +19,9 @@ int pinctrl_gpio_direction_output(unsigned int pin);
int pinctrl_gpio_get_direction(unsigned pin);
int pinctrl_single_probe(struct device *dev);
#else
-static inline int pinctrl_select_state(struct device *dev, const char *state)
+static inline struct pinctrl *pinctrl_get_select(struct device *dev, const
char *state)
{
- return -ENODEV;
+ return ERR_PTR(-ENODEV);
}
static inline int pinctrl_select_state_default(struct device *dev)
@@ -58,4 +60,6 @@ static inline int pinctrl_single_probe(struct device *dev)
}
#endif
+static inline void pinctrl_put(struct pinctrl *pinctrl) {}
+
#endif /* LINUX_PINCTRL_CONSUMER_H */
--
2.39.2
