Linux-ACPI Archive on lore.kernel.org
 help / color / Atom feed
From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
	Hans de Goede <hdegoede@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Andy Shevchenko <andy@infradead.org>,
	linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
	platform-driver-x86@vger.kernel.org
Subject: [PATCH v4 09/16] device connection: Find connections also by checking the references
Date: Wed, 22 May 2019 13:51:06 +0300
Message-ID: <20190522105113.11153-10-heikki.krogerus@linux.intel.com> (raw)
In-Reply-To: <20190522105113.11153-1-heikki.krogerus@linux.intel.com>

We can also use this API to find named references that the
device nodes have by using fwnode_property_get_reference_args()
function.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/base/devcon.c     | 26 ++++++++++++++++++++++++++
 drivers/usb/roles/class.c |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/drivers/base/devcon.c b/drivers/base/devcon.c
index 04db9ae235e4..f7035fc12b92 100644
--- a/drivers/base/devcon.c
+++ b/drivers/base/devcon.c
@@ -38,6 +38,28 @@ fwnode_graph_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
 	return NULL;
 }
 
+static void *
+fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
+		    void *data, devcon_match_fn_t match)
+{
+	struct device_connection con = { };
+	void *ret;
+	int i;
+
+	for (i = 0; ; i++) {
+		con.fwnode = fwnode_find_reference(fwnode, con_id, i);
+		if (IS_ERR(con.fwnode))
+			break;
+
+		ret = match(&con, -1, data);
+		fwnode_handle_put(con.fwnode);
+		if (ret)
+			return ret;
+	}
+
+	return NULL;
+}
+
 /**
  * device_connection_find_match - Find physical connection to a device
  * @dev: Device with the connection
@@ -65,6 +87,10 @@ void *device_connection_find_match(struct device *dev, const char *con_id,
 		ret = fwnode_graph_devcon_match(fwnode, con_id, data, match);
 		if (ret)
 			return ret;
+
+		ret = fwnode_devcon_match(fwnode, con_id, data, match);
+		if (ret)
+			return ret;
 	}
 
 	mutex_lock(&devcon_lock);
diff --git a/drivers/usb/roles/class.c b/drivers/usb/roles/class.c
index f45d8df5cfb8..86defca6623e 100644
--- a/drivers/usb/roles/class.c
+++ b/drivers/usb/roles/class.c
@@ -101,7 +101,7 @@ static void *usb_role_switch_match(struct device_connection *con, int ep,
 	struct device *dev;
 
 	if (con->fwnode) {
-		if (!fwnode_property_present(con->fwnode, con->id))
+		if (con->id && !fwnode_property_present(con->fwnode, con->id))
 			return NULL;
 
 		dev = class_find_device(role_class, NULL, con->fwnode,
-- 
2.20.1


  parent reply index

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-22 10:50 [PATCH v4 00/16] Software fwnode references Heikki Krogerus
2019-05-22 10:50 ` [PATCH v4 01/16] software node: Allow node creation without properties Heikki Krogerus
2019-05-22 10:50 ` [PATCH v4 02/16] software node: Simplify software_node_release() function Heikki Krogerus
2019-05-22 10:51 ` [PATCH v4 03/16] software node: Add support for static node descriptors Heikki Krogerus
2019-05-22 10:51 ` [PATCH v4 04/16] software node: Use kobject name when finding child nodes by name Heikki Krogerus
2019-05-22 10:51 ` [PATCH v4 05/16] software node: Add software_node_get_reference_args() Heikki Krogerus
2019-05-22 10:51 ` [PATCH v4 06/16] driver core: Add helper device_find_child_by_name() Heikki Krogerus
2019-05-22 10:51 ` [PATCH v4 07/16] ACPI / property: Don't limit named child node matching to data nodes Heikki Krogerus
2019-05-22 10:51 ` [PATCH v4 08/16] device property: Introduce fwnode_find_reference() Heikki Krogerus
2019-05-22 10:51 ` Heikki Krogerus [this message]
2019-05-22 10:51 ` [PATCH v4 10/16] usb: typec: Registering real device entries for the muxes Heikki Krogerus
2019-05-22 10:51 ` [PATCH v4 11/16] platform/x86: intel_cht_int33fe: Register max17047 in its own function Heikki Krogerus
2019-05-22 10:51 ` [PATCH v4 12/16] platform/x86: intel_cht_int33fe: Remove unused fusb302 device property Heikki Krogerus
2019-05-22 10:51 ` [PATCH v4 13/16] platform/x86: intel_cht_int33fe: Provide software nodes for the devices Heikki Krogerus
2019-05-29  9:30   ` Hans de Goede
2019-05-31  9:10     ` Rafael J. Wysocki
2019-05-31 13:46       ` Heikki Krogerus
2019-05-22 10:51 ` [PATCH v4 14/16] platform/x86: intel_cht_int33fe: Provide fwnode for the USB connector Heikki Krogerus
2019-05-22 10:51 ` [PATCH v4 15/16] platform/x86: intel_cht_int33fe: Supply fwnodes for the external dependencies Heikki Krogerus
2019-05-29  9:36   ` Hans de Goede
2019-05-22 10:51 ` [PATCH v4 16/16] platform/x86: intel_cht_int33fe: Replacing the old connections with references Heikki Krogerus
2019-05-24 18:44 ` [PATCH v4 00/16] Software fwnode references Andy Shevchenko
2019-05-29  9:29 ` Hans de Goede
2019-05-31 13:42   ` Heikki Krogerus

Reply instructions:

You may reply publically 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=20190522105113.11153-10-heikki.krogerus@linux.intel.com \
    --to=heikki.krogerus@linux.intel.com \
    --cc=andy@infradead.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=hdegoede@redhat.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=rjw@rjwysocki.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

Linux-ACPI Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-acpi/0 linux-acpi/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-acpi linux-acpi/ https://lore.kernel.org/linux-acpi \
		linux-acpi@vger.kernel.org
	public-inbox-index linux-acpi

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-acpi


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git