From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: "Rafael J. Wysocki" <rafael@kernel.org>, Felipe Balbi <balbi@kernel.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
linux-acpi@vger.kernel.org
Subject: [PATCH 2/3] software node: Introduce device_add_software_node()
Date: Tue, 25 Aug 2020 16:59:50 +0300 [thread overview]
Message-ID: <20200825135951.53340-3-heikki.krogerus@linux.intel.com> (raw)
In-Reply-To: <20200825135951.53340-1-heikki.krogerus@linux.intel.com>
This helper will register a software node and then assign
it to device at the same time. The function will also make
sure that the device can't have more than one software node.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
drivers/base/swnode.c | 45 ++++++++++++++++++++++++++++++++++++++++
include/linux/property.h | 3 +++
2 files changed, 48 insertions(+)
diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
index 9a13a61a2f0bb..ec14f02565a65 100644
--- a/drivers/base/swnode.c
+++ b/drivers/base/swnode.c
@@ -1356,6 +1356,51 @@ void fwnode_remove_software_node(struct fwnode_handle *fwnode)
}
EXPORT_SYMBOL_GPL(fwnode_remove_software_node);
+/**
+ * device_add_software_node - Assign software node to a device
+ * @dev: The device the software node is meant for.
+ * @swnode: The software node.
+ *
+ * This function will register @swnode and make it the secondary firmware node
+ * pointer of @dev. If @dev has no primary node, then @swnode will become the primary
+ * node.
+ */
+int device_add_software_node(struct device *dev, const struct software_node *swnode)
+{
+ int ret;
+
+ /* Only one software node per device. */
+ if (dev_to_swnode(dev))
+ return -EBUSY;
+
+ ret = software_node_register(swnode);
+ if (ret)
+ return ret;
+
+ set_secondary_fwnode(dev, software_node_fwnode(swnode));
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(device_add_software_node);
+
+/**
+ * device_remove_software_node - Remove device's software node
+ * @dev: The device with the software node.
+ *
+ * This function will unregister the software node of @dev.
+ */
+void device_remove_software_node(struct device *dev)
+{
+ struct swnode *swnode;
+
+ swnode = dev_to_swnode(dev);
+ if (!swnode)
+ return;
+
+ kobject_put(&swnode->kobj);
+}
+EXPORT_SYMBOL_GPL(device_remove_software_node);
+
int software_node_notify(struct device *dev, unsigned long action)
{
struct swnode *swnode;
diff --git a/include/linux/property.h b/include/linux/property.h
index 4a2e0edb78275..5f84286183f9a 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -468,4 +468,7 @@ fwnode_create_software_node(const struct property_entry *properties,
const struct fwnode_handle *parent);
void fwnode_remove_software_node(struct fwnode_handle *fwnode);
+int device_add_software_node(struct device *dev, const struct software_node *swnode);
+void device_remove_software_node(struct device *dev);
+
#endif /* _LINUX_PROPERTY_H_ */
--
2.28.0
next prev parent reply other threads:[~2020-08-25 14:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-25 13:59 [PATCH 0/3] PM operations for software nodes Heikki Krogerus
2020-08-25 13:59 ` [PATCH 1/3] software node: Power management " Heikki Krogerus
2020-09-25 15:54 ` Rafael J. Wysocki
2020-09-28 11:32 ` Heikki Krogerus
2020-08-25 13:59 ` Heikki Krogerus [this message]
2020-08-25 14:32 ` [PATCH 2/3] software node: Introduce device_add_software_node() Andy Shevchenko
2020-08-25 14:33 ` Andy Shevchenko
2020-08-25 13:59 ` [PATCH 3/3] usb: dwc3: pci: Register a software node for the dwc3 platform device Heikki Krogerus
2020-08-25 14:39 ` [PATCH 0/3] PM operations for software nodes Andy Shevchenko
2020-09-16 13:27 ` 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=20200825135951.53340-3-heikki.krogerus@linux.intel.com \
--to=heikki.krogerus@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=balbi@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=sakari.ailus@linux.intel.com \
/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;
as well as URLs for NNTP newsgroup(s).