summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/completion.h44
-rw-r--r--include/miiphy.h15
2 files changed, 23 insertions, 36 deletions
diff --git a/include/linux/completion.h b/include/linux/completion.h
index 9835826d285..d99ac450e8c 100644
--- a/include/linux/completion.h
+++ b/include/linux/completion.h
@@ -129,42 +129,14 @@ extern void complete_all(struct completion *);
#define wait_for_completion(x) do {} while (0)
#define wait_for_completion_io(x) do {} while (0)
-inline int wait_for_completion_interruptible(struct completion *x)
-{
- return 1;
-}
-inline int wait_for_completion_killable(struct completion *x)
-{
- return 1;
-}
-inline unsigned long wait_for_completion_timeout(struct completion *x,
- unsigned long timeout)
-{
- return 1;
-}
-inline unsigned long wait_for_completion_io_timeout(struct completion *x,
- unsigned long timeout)
-{
- return 1;
-}
-inline long wait_for_completion_interruptible_timeout(struct completion *x,
- unsigned long timeout)
-{
- return 1;
-}
-inline long wait_for_completion_killable_timeout(struct completion *x,
- unsigned long timeout)
-{
- return 1;
-}
-inline bool try_wait_for_completion(struct completion *x)
-{
- return 1;
-}
-inline bool completion_done(struct completion *x)
-{
- return 1;
-}
+#define wait_for_completion_interruptible(x) 1
+#define wait_for_completion_killable(x) 1
+#define wait_for_completion_timeout(x, timeout) 1
+#define wait_for_completion_io_timeout(x, timeout) 1
+#define wait_for_completion_interruptible_timeout(x, timeout) 1
+#define wait_for_completion_killable_timeout(x, timeout) 1
+#define try_wait_for_completion(x) 1
+#define completion_done(x) 1
#define complete(x) do {} while (0)
#define complete_all(x) do {} while (0)
diff --git a/include/miiphy.h b/include/miiphy.h
index 00d0b9b6a43..96afe5f4030 100644
--- a/include/miiphy.h
+++ b/include/miiphy.h
@@ -193,6 +193,21 @@ struct phy_device *dm_mdio_phy_connect(struct udevice *mdiodev, int phyaddr,
phy_interface_t interface);
/**
+ * dm_eth_phy_connect_interface - Connect an Eth device to a PHY based on device
+ * tree with custom PHY interface
+ *
+ * Picks up the DT phy-handle and from ethernet device node and connects the
+ * ethernet device to the linked PHY, while allowing the caller to specify
+ * the phy-mode to use.
+ *
+ * @ethdev: ethernet device
+ * @interface: MAC-PHY protocol
+ *
+ * Return: pointer to phy_device, or 0 on error
+ */
+struct phy_device *dm_eth_phy_connect_interface(struct udevice *ethdev,
+ phy_interface_t interface);
+/**
* dm_eth_phy_connect - Connect an Eth device to a PHY based on device tree
*
* Picks up the DT phy-handle and phy-mode from ethernet device node and