diff options
| author |   Aaro Koskinen <aaro.koskinen@iki.fi> | 2015-04-04 22:51:07 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-30 16:59:23 +0200 |
| commit | 2638f71307f649532f613a4bcb3b163b7b63017a (patch) | |
| tree | 5d77e841858394c95b3d0d1e1622b3597632f1df /drivers/staging/octeon/ethernet-mdio.c | |
| parent | staging: octeon-ethernet: add queue information to carrier note (diff) | |
| download | linux-dev-2638f71307f649532f613a4bcb3b163b7b63017a.tar.xz linux-dev-2638f71307f649532f613a4bcb3b163b7b63017a.zip | |
staging: octeon-ethernet: consolidate carrier notifications
Always use cvm_oct_note_carrier() to avoid copy-pasted code.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/octeon/ethernet-mdio.c')
| -rw-r--r-- | drivers/staging/octeon/ethernet-mdio.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeon/ethernet-mdio.c index 604fb581f1c3..6322d0dd4238 100644 --- a/drivers/staging/octeon/ethernet-mdio.c +++ b/drivers/staging/octeon/ethernet-mdio.c @@ -39,7 +39,6 @@ #include "ethernet-mdio.h" #include "ethernet-util.h" -#include <asm/octeon/cvmx-helper-board.h> #include <asm/octeon/cvmx-gmxx-defs.h> #include <asm/octeon/cvmx-smix-defs.h> @@ -116,8 +115,8 @@ int cvm_oct_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) return phy_mii_ioctl(priv->phydev, rq, cmd); } -static void cvm_oct_note_carrier(struct octeon_ethernet *priv, - cvmx_helper_link_info_t li) +void cvm_oct_note_carrier(struct octeon_ethernet *priv, + cvmx_helper_link_info_t li) { if (li.s.link_up) { pr_notice_ratelimited("%s: %u Mbps %s duplex, port %d, queue %d\n", |