Skip to contentSkip to conversation

Move fwnode_connection_find_match() under drivers/base/property.c

PATCH Superseded Heikki Krogerus 2 participants 5 messages Sep 7, 2020

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Heikki Krogerus

author reviewer
#0 lore raw

cover Move fwnode_connection_find_match() under drivers/base/property.c

Hi,

This was the last patch in my series that removed struct device_connection [1]. It's now split into two separate patches.

[1] https://lore.kernel.org/lkml/[email protected]/

thanks,

Heikki Krogerus (2):
device property: Move fwnode_connection_find_match() under
drivers/base/property.c
Documentation: Remove device connection documentation

 .../driver-api/device_connection.rst          |  43 --------
 drivers/base/Makefile                         |   2 +-
 drivers/base/devcon.c                         | 101 ------------------
 drivers/base/property.c                       |  73 +++++++++++++
 include/linux/device.h                        |   9 --
 include/linux/property.h                      |  14 +++
 6 files changed, 88 insertions(+), 154 deletions(-)
 delete mode 100644 Documentation/driver-api/device_connection.rst
 delete mode 100644 drivers/base/devcon.c
Signature · 1 line
2.28.0
author reviewer
#1 lore raw

PATCH 1/2 device property: Move fwnode_connection_find_match() under drivers/base/property.c

The function is now only a helper that searches the connection from device graph and then by checking if the supplied connection identifier matches a property that contains reference.

---
 drivers/base/Makefile    |   2 +-
 drivers/base/devcon.c    | 101 ---------------------------------------
 drivers/base/property.c  |  73 ++++++++++++++++++++++++++++
 include/linux/device.h   |   9 ----
 include/linux/property.h |  14 ++++++
 5 files changed, 88 insertions(+), 111 deletions(-)
 delete mode 100644 drivers/base/devcon.c
drivers/base/Makefile +1 -1
index 157452080f3d7..41369fc7004fd 100644
@@ -6,7 +6,7 @@ obj-y			:= component.o core.o bus.o dd.o syscore.o \
 			   cpu.o firmware.o init.o map.o devres.o \
 			   attribute_container.o transport_class.o \
 			   topology.o container.o property.o cacheinfo.o \
-			   devcon.o swnode.o
+			   swnode.o
 obj-$(CONFIG_DEVTMPFS)	+= devtmpfs.o
 obj-y			+= power/
 obj-$(CONFIG_ISA_BUS_API)	+= isa.o
drivers/base/devcon.c deleted +0 -101

101 lines not on this page · raw message

drivers/base/property.c +73 -0

76 lines not on this page · raw message

include/linux/device.h +0 -9
index c3ced17d91ee6..6f76c1f38e116 100644
@@ -292,15 +292,6 @@ struct device_dma_parameters {
 	unsigned long segment_boundary_mask;
 };
 
-typedef void *(*devcon_match_fn_t)(struct fwnode_handle *fwnode, const char *id,
-				   void *data);
-
-void *fwnode_connection_find_match(struct fwnode_handle *fwnode,
-				   const char *con_id, void *data,
-				   devcon_match_fn_t match);
-void *device_connection_find_match(struct device *dev, const char *con_id,
-				   void *data, devcon_match_fn_t match);
-
 /**
  * enum device_link_state - Device link states.
  * @DL_STATE_NONE: The presence of the drivers is not being tracked.
include/linux/property.h +14 -0
index 9f805c4428195..aedae94dcf41d 100644
@@ -418,6 +418,20 @@ fwnode_graph_get_endpoint_by_id(const struct fwnode_handle *fwnode,
 int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,
 				struct fwnode_endpoint *endpoint);
 
+typedef void *(*devcon_match_fn_t)(struct fwnode_handle *fwnode, const char *id,
+				   void *data);
+
+void *fwnode_connection_find_match(struct fwnode_handle *fwnode,
+				   const char *con_id, void *data,
+				   devcon_match_fn_t match);
+
+static inline void *device_connection_find_match(struct device *dev,
+						 const char *con_id, void *data,
+						 devcon_match_fn_t match)
+{
+	return fwnode_connection_find_match(dev_fwnode(dev), con_id, data, match);
+}
+
 /* -------------------------------------------------------------------------- */
 /* Software fwnode support - when HW description is incomplete or missing */
 
Signature · 1 line
2.28.0
author reviewer
#2 lore raw

PATCH 2/2 Documentation: Remove device connection documentation

In reply to Heikki Krogerus

The API that allowed device connection descriptions to be added is now removed, so removing also the documentation for it.

---
 .../driver-api/device_connection.rst          | 43 -------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 Documentation/driver-api/device_connection.rst
Documentation/driver-api/device_connection.rst deleted +0 -43
deleted file mode 100644
index ba364224c349b..0000000000000
@@ -1,43 +0,0 @@
-==================
-Device connections
-==================
-
-Introduction
-------------
-
-Devices often have connections to other devices that are outside of the direct
-child/parent relationship. A serial or network communication controller, which
-could be a PCI device, may need to be able to get a reference to its PHY
-component, which could be attached for example to the I2C bus. Some device
-drivers need to be able to control the clocks or the GPIOs for their devices,
-and so on.
-
-Device connections are generic descriptions of any type of connection between
-two separate devices.
-
-Device connections alone do not create a dependency between the two devices.
-They are only descriptions which are not tied to either of the devices directly.
-A dependency between the two devices exists only if one of the two endpoint
-devices requests a reference to the other. The descriptions themselves can be
-defined in firmware (not yet supported) or they can be built-in.
-
-Usage
------
-
-Device connections should exist before device ``->probe`` callback is called for
-either endpoint device in the description. If the connections are defined in
-firmware, this is not a problem. It should be considered if the connection
-descriptions are "built-in", and need to be added separately.
-
-The connection description consists of the names of the two devices with the
-connection, i.e. the endpoints, and unique identifier for the connection which
-is needed if there are multiple connections between the two devices.
-
-After a description exists, the devices in it can request reference to the other
-endpoint device, or they can request the description itself.
-
-API
----
-
-.. kernel-doc:: drivers/base/devcon.c
-   :functions: device_connection_find_match device_connection_find device_connection_add device_connection_remove
Signature · 1 line
2.28.0
#3 lore raw

Re: [PATCH 2/2] Documentation: Remove device connection documentation

Quoted 9 lines · Heikki Krogerus

The API that allowed device connection descriptions to be added is now removed, so removing also the documentation for it.

---
 .../driver-api/device_connection.rst          | 43 -------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 Documentation/driver-api/device_connection.rst

Oops, you forgot to remove this file from the list in Documentation/driver-api/index.rst, which I think will now break the documentation build, right?

Can you redo this one with that fix?

thanks,

greg k-h

author reviewer
#4 lore raw

Re: [PATCH 2/2] Documentation: Remove device connection documentation

Quoted 11 lines · Greg Kroah-Hartman
Quoted 9 lines · Heikki Krogerus

The API that allowed device connection descriptions to be added is now removed, so removing also the documentation for it.

---
 .../driver-api/device_connection.rst          | 43 -------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 Documentation/driver-api/device_connection.rst
Quoted 5 lines

Oops, you forgot to remove this file from the list in Documentation/driver-api/index.rst, which I think will now break the documentation build, right?

Can you redo this one with that fix?

Argh! It does not actually break the documentation build. It did generate a warning though, and that I missed. Apologies.

I'll fix this.

thanks,

Signature · 1 line
heikki