netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
	davem@davemloft.net, linville@tuxdriver.com, jhs@mojatatu.com,
	alexander.duyck@gmail.com
Subject: [PATCH net-next v5 03/13] net: phy: provide stub for fixed_phy_set_link_update
Date: Wed, 27 Aug 2014 17:04:48 -0700	[thread overview]
Message-ID: <1409184298-1793-4-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1409184298-1793-1-git-send-email-f.fainelli@gmail.com>

In preparation for updating the DSA code and avoid using ifdefs there,
provide an empty stub for fixed_phy_set_link_update when
CONFIG_FIXED_PHY is not selected.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
New patch in v4 that originated from more build testing

 include/linux/phy_fixed.h | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h
index ae612acebb53..941138664c1d 100644
--- a/include/linux/phy_fixed.h
+++ b/include/linux/phy_fixed.h
@@ -18,6 +18,9 @@ extern int fixed_phy_register(unsigned int irq,
 			      struct fixed_phy_status *status,
 			      struct device_node *np);
 extern void fixed_phy_del(int phy_addr);
+extern int fixed_phy_set_link_update(struct phy_device *phydev,
+			int (*link_update)(struct net_device *,
+					   struct fixed_phy_status *));
 #else
 static inline int fixed_phy_add(unsigned int irq, int phy_id,
 				struct fixed_phy_status *status)
@@ -34,14 +37,12 @@ static inline int fixed_phy_del(int phy_addr)
 {
 	return -ENODEV;
 }
-#endif /* CONFIG_FIXED_PHY */
-
-/*
- * This function issued only by fixed_phy-aware drivers, no need
- * protect it with #ifdef
- */
-extern int fixed_phy_set_link_update(struct phy_device *phydev,
+static inline int fixed_phy_set_link_update(struct phy_device *phydev,
 			int (*link_update)(struct net_device *,
-					   struct fixed_phy_status *));
+					   struct fixed_phy_status *))
+{
+	return -ENODEV;
+}
+#endif /* CONFIG_FIXED_PHY */
 
 #endif /* __PHY_FIXED_H */
-- 
1.9.1

  parent reply	other threads:[~2014-08-28  0:05 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-28  0:04 [PATCH net-next v5 00/13] dsa: Broadcom Starfighter 2 switch support Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 01/13] net: dsa: reduce number of protocol hooks Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 02/13] net: phy: add generic UniMAC MDIO bus driver Florian Fainelli
2014-08-28  0:04 ` Florian Fainelli [this message]
2014-08-28  0:04 ` [PATCH net-next v5 04/13] net: dsa: provide a switch device device tree node pointer Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 05/13] net: dsa: retain a per-port device_node pointer Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 06/13] net: dsa: allow for more complex PHY setups Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 07/13] net: dsa: allow switches to work without tagging Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 08/13] net: dsa: allow drivers to do link adjustment Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 09/13] net: dsa: allow updating fixed PHY link information Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 10/13] net: dsa: add Broadcom tag RX/TX handler Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 11/13] net: dsa: add Broadcom SF2 switch driver Florian Fainelli
2014-09-09 19:37   ` Alexander Duyck
2014-08-28  0:04 ` [PATCH net-next v5 12/13] Documentation: devicetree: update dsa binding with optional properties Florian Fainelli
2014-08-28  0:04 ` [PATCH net-next v5 13/13] Documentation: devicetree: add Broadcom Starfighter 2 binding Florian Fainelli

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=1409184298-1793-4-git-send-email-f.fainelli@gmail.com \
    --to=f.fainelli@gmail.com \
    --cc=alexander.duyck@gmail.com \
    --cc=davem@davemloft.net \
    --cc=jhs@mojatatu.com \
    --cc=linville@tuxdriver.com \
    --cc=netdev@vger.kernel.org \
    /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).