summaryrefslogtreecommitdiff
path: root/drivers/mux
diff options
context:
space:
mode:
authorPeter Rosin <peda@axentia.se>2022-01-07 10:44:32 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-02-04 17:47:11 +0300
commit6632866df852bd0907f67ff7db5cbdb448f6ae16 (patch)
treeca92310767dd973d6363febefe1eae8d5666af9a /drivers/mux
parent84564481bc4520c47e7fe9c594c0523d81e6a97a (diff)
downloadlinux-6632866df852bd0907f67ff7db5cbdb448f6ae16.tar.xz
mux: add missing mux_state_get
And implement devm_mux_state_get in terms of the new function. Now we have both mux_state_get and mux_state_put as convenient functions ready to be exported should someone ever need unmanaged interfaces. Tested-by: Aswath Govindraju <a-govindraju@ti.com> Signed-off-by: Peter Rosin <peda@axentia.se> Link: https://lore.kernel.org/r/6f8cfdfd-9fa6-40d1-09b3-0c9fc50835ac@axentia.se Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mux')
-rw-r--r--drivers/mux/core.c40
1 files changed, 29 insertions, 11 deletions
diff --git a/drivers/mux/core.c b/drivers/mux/core.c
index 931fa8bd4962..5cf2124fa55b 100644
--- a/drivers/mux/core.c
+++ b/drivers/mux/core.c
@@ -674,6 +674,32 @@ struct mux_control *devm_mux_control_get(struct device *dev,
EXPORT_SYMBOL_GPL(devm_mux_control_get);
/*
+ * mux_state_get() - Get the mux-state for a device.
+ * @dev: The device that needs a mux-state.
+ * @mux_name: The name identifying the mux-state.
+ *
+ * Return: A pointer to the mux-state, or an ERR_PTR with a negative errno.
+ */
+static struct mux_state *mux_state_get(struct device *dev, const char *mux_name)
+{
+ struct mux_state *mstate;
+
+ mstate = kzalloc(sizeof(*mstate), GFP_KERNEL);
+ if (!mstate)
+ return ERR_PTR(-ENOMEM);
+
+ mstate->mux = mux_get(dev, mux_name, &mstate->state);
+ if (IS_ERR(mstate->mux)) {
+ int err = PTR_ERR(mstate->mux);
+
+ kfree(mstate);
+ return ERR_PTR(err);
+ }
+
+ return mstate;
+}
+
+/*
* mux_state_put() - Put away the mux-state for good.
* @mstate: The mux-state to put away.
*
@@ -704,25 +730,17 @@ struct mux_state *devm_mux_state_get(struct device *dev,
const char *mux_name)
{
struct mux_state **ptr, *mstate;
- struct mux_control *mux_ctrl;
- int state;
-
- mstate = devm_kzalloc(dev, sizeof(struct mux_state), GFP_KERNEL);
- if (!mstate)
- return ERR_PTR(-ENOMEM);
ptr = devres_alloc(devm_mux_state_release, sizeof(*ptr), GFP_KERNEL);
if (!ptr)
return ERR_PTR(-ENOMEM);
- mux_ctrl = mux_get(dev, mux_name, &state);
- if (IS_ERR(mux_ctrl)) {
+ mstate = mux_state_get(dev, mux_name);
+ if (IS_ERR(mstate)) {
devres_free(ptr);
- return (struct mux_state *)mux_ctrl;
+ return mstate;
}
- mstate->mux = mux_ctrl;
- mstate->state = state;
*ptr = mstate;
devres_add(dev, ptr);