mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Peter Rosin <peda@axentia.se>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Aswath Govindraju <a-govindraju@ti.com>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH 4/6] mux: add missing mux_state_get
Date: Sun, 2 Jan 2022 23:38:36 +0100	[thread overview]
Message-ID: <90c40462-9672-949a-14cd-e13e440fe177@axentia.se> (raw)
In-Reply-To: <94ab71e1-2e68-def2-95b8-33162172f65c@axentia.se>

From: Peter Rosin <peda@axentia.se>

And implement devm_mux_state_get in terms of the new function.

Tested-by: Aswath Govindraju <a-govindraju@ti.com>
Signed-off-by: Peter Rosin <peda@axentia.se>
---
 drivers/mux/core.c           | 41 ++++++++++++++++++++++++++----------
 include/linux/mux/consumer.h |  1 +
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/drivers/mux/core.c b/drivers/mux/core.c
index 7d38e7c0c02e..90073ce01539 100644
--- a/drivers/mux/core.c
+++ b/drivers/mux/core.c
@@ -673,6 +673,33 @@ 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.
+ */
+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;
+}
+EXPORT_SYMBOL_GPL(mux_state_get);
+
 /**
  * mux_state_put() - Put away the mux-state for good.
  * @mstate: The mux-state to put away.
@@ -705,25 +732,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);
 
diff --git a/include/linux/mux/consumer.h b/include/linux/mux/consumer.h
index babf2a744056..944678604549 100644
--- a/include/linux/mux/consumer.h
+++ b/include/linux/mux/consumer.h
@@ -54,6 +54,7 @@ int mux_control_deselect(struct mux_control *mux);
 int mux_state_deselect(struct mux_state *mstate);
 
 struct mux_control *mux_control_get(struct device *dev, const char *mux_name);
+struct mux_state *mux_state_get(struct device *dev, const char *mux_name);
 void mux_control_put(struct mux_control *mux);
 void mux_state_put(struct mux_state *mstate);
 
-- 
2.20.1



  parent reply	other threads:[~2022-01-02 22:38 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-02 22:34 mux for 5.17-rc1 Peter Rosin
2022-01-02 22:38 ` [PATCH 1/6] dt-bindings: ti-serdes-mux: Add defines for J721S2 SoC Peter Rosin
2022-01-02 22:38 ` [PATCH 2/6] dt-bindings: mux: Document mux-states property Peter Rosin
2022-01-02 22:38 ` [PATCH 3/6] mux: Add support for reading mux state from consumer DT node Peter Rosin
2022-01-03 12:43   ` Greg Kroah-Hartman
2022-01-03 13:05     ` Aswath Govindraju
2022-01-03 13:23       ` Greg Kroah-Hartman
2022-01-02 22:38 ` Peter Rosin [this message]
2022-01-03 12:42   ` [PATCH 4/6] mux: add missing mux_state_get Greg Kroah-Hartman
2022-01-03 17:26     ` Peter Rosin
2022-01-06 14:41       ` Greg Kroah-Hartman
2022-01-07  7:10         ` Peter Rosin
2022-01-02 22:38 ` [PATCH 5/6] mux: fix grammar, missing "is" Peter Rosin
2022-01-03 12:37   ` Greg Kroah-Hartman
2022-01-02 22:38 ` [PATCH 6/6] mux: Fix struct mux_state kernel-doc comment Peter Rosin
2022-01-03 12:46 ` mux for 5.17-rc1 Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=90c40462-9672-949a-14cd-e13e440fe177@axentia.se \
    --to=peda@axentia.se \
    --cc=a-govindraju@ti.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®