All of lore.kernel.org
 help / color / mirror / Atom feed
From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Heiko Stuebner <heiko@sntech.de>
Cc: Guenter Roeck <linux@roeck-us.net>,
	Hans de Goede <hdegoede@redhat.com>,
	linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [RFC,4/5] usb: typec: Find the ports by also matching against the device node
Date: Wed, 24 Oct 2018 18:05:24 +0300	[thread overview]
Message-ID: <20181024150525.11552-5-heikki.krogerus@linux.intel.com> (raw)

When the connections are defined in firmware, struct
device_connection will have the fwnode member pointing to
the device node (struct fwnode_handle) of the requested
device, and the endpoint will not be used at all in that
case.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/usb/typec/class.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c
index 5db0593ca0bd..fe6f3a932a88 100644
--- a/drivers/usb/typec/class.c
+++ b/drivers/usb/typec/class.c
@@ -204,15 +204,28 @@ static void typec_altmode_put_partner(struct altmode *altmode)
 	put_device(&adev->dev);
 }
 
-static int __typec_port_match(struct device *dev, const void *name)
+static int typec_port_fwnode_match(struct device *dev, const void *fwnode)
+{
+	return dev_name(fwnode) == fwnode;
+}
+
+static int typec_port_name_match(struct device *dev, const void *name)
 {
 	return !strcmp((const char *)name, dev_name(dev));
 }
 
 static void *typec_port_match(struct device_connection *con, int ep, void *data)
 {
-	return class_find_device(typec_class, NULL, con->endpoint[ep],
-				 __typec_port_match);
+	struct device *dev;
+
+	if (con->fwnode)
+		dev = class_find_device(typec_class, NULL, con->fwnode,
+					typec_port_fwnode_match);
+	else
+		dev = class_find_device(typec_class, NULL, con->endpoint[ep],
+					typec_port_name_match);
+
+	return dev ? dev : ERR_PTR(-EPROBE_DEFER);
 }
 
 struct typec_altmode *

WARNING: multiple messages have this Message-ID (diff)
From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Heiko Stuebner <heiko@sntech.de>
Cc: Guenter Roeck <linux@roeck-us.net>,
	Hans de Goede <hdegoede@redhat.com>,
	linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [RFC PATCH 4/5] usb: typec: Find the ports by also matching against the device node
Date: Wed, 24 Oct 2018 18:05:24 +0300	[thread overview]
Message-ID: <20181024150525.11552-5-heikki.krogerus@linux.intel.com> (raw)
In-Reply-To: <20181024150525.11552-1-heikki.krogerus@linux.intel.com>

When the connections are defined in firmware, struct
device_connection will have the fwnode member pointing to
the device node (struct fwnode_handle) of the requested
device, and the endpoint will not be used at all in that
case.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/usb/typec/class.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c
index 5db0593ca0bd..fe6f3a932a88 100644
--- a/drivers/usb/typec/class.c
+++ b/drivers/usb/typec/class.c
@@ -204,15 +204,28 @@ static void typec_altmode_put_partner(struct altmode *altmode)
 	put_device(&adev->dev);
 }
 
-static int __typec_port_match(struct device *dev, const void *name)
+static int typec_port_fwnode_match(struct device *dev, const void *fwnode)
+{
+	return dev_name(fwnode) == fwnode;
+}
+
+static int typec_port_name_match(struct device *dev, const void *name)
 {
 	return !strcmp((const char *)name, dev_name(dev));
 }
 
 static void *typec_port_match(struct device_connection *con, int ep, void *data)
 {
-	return class_find_device(typec_class, NULL, con->endpoint[ep],
-				 __typec_port_match);
+	struct device *dev;
+
+	if (con->fwnode)
+		dev = class_find_device(typec_class, NULL, con->fwnode,
+					typec_port_fwnode_match);
+	else
+		dev = class_find_device(typec_class, NULL, con->endpoint[ep],
+					typec_port_name_match);
+
+	return dev ? dev : ERR_PTR(-EPROBE_DEFER);
 }
 
 struct typec_altmode *
-- 
2.19.1


             reply	other threads:[~2018-10-24 15:05 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-24 15:05 Heikki Krogerus [this message]
2018-10-24 15:05 ` [RFC PATCH 4/5] usb: typec: Find the ports by also matching against the device node Heikki Krogerus
  -- strict thread matches above, loose matches on Subject: below --
2019-01-22 13:23 [RFC,3/5] usb: roles: Find the muxes " Heikki Krogerus
2019-01-22 13:23 ` [RFC PATCH 3/5] " Heikki Krogerus
2019-01-22  5:40 [RFC,3/5] " Jun Li
2019-01-22  5:40 ` [RFC PATCH 3/5] " Jun Li
2018-10-25  9:02 [RFC,4/5] usb: typec: Find the ports " Heikki Krogerus
2018-10-25  9:02 ` [RFC PATCH 4/5] " Heikki Krogerus
2018-10-25  7:28 [RFC,1/5] driver core: Add fwnode member to struct device_connection Heikki Krogerus
2018-10-25  7:28 ` [RFC PATCH 1/5] " Heikki Krogerus
2018-10-25  7:27 [RFC,4/5] usb: typec: Find the ports by also matching against the device node Heikki Krogerus
2018-10-25  7:27 ` [RFC PATCH 4/5] " Heikki Krogerus
2018-10-24 17:07 [RFC,4/5] " Sergei Shtylyov
2018-10-24 17:07 ` [RFC PATCH 4/5] " Sergei Shtylyov
2018-10-24 15:33 [RFC,1/5] driver core: Add fwnode member to struct device_connection Randy Dunlap
2018-10-24 15:33 ` [RFC PATCH 1/5] " Randy Dunlap
2018-10-24 15:05 [RFC,5/5] drivers core: Find device connections also from device graphs Heikki Krogerus
2018-10-24 15:05 ` [RFC PATCH 5/5] " Heikki Krogerus
2018-10-24 15:05 [RFC,3/5] usb: roles: Find the muxes by also matching against the device node Heikki Krogerus
2018-10-24 15:05 ` [RFC PATCH 3/5] " Heikki Krogerus
2018-10-24 15:05 [RFC,2/5] usb: typec: mux: " Heikki Krogerus
2018-10-24 15:05 ` [RFC PATCH 2/5] " Heikki Krogerus
2018-10-24 15:05 [RFC,1/5] driver core: Add fwnode member to struct device_connection Heikki Krogerus
2018-10-24 15:05 ` [RFC PATCH 1/5] " Heikki Krogerus
2018-10-24 15:05 [RFC PATCH 0/5] Adding graph handling to device connection API Heikki Krogerus

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=20181024150525.11552-5-heikki.krogerus@linux.intel.com \
    --to=heikki.krogerus@linux.intel.com \
    --cc=hdegoede@redhat.com \
    --cc=heiko@sntech.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=linux@roeck-us.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.