diff options
| author | Melike Yurtoglu <aysemelikeyurtoglu@gmail.com> | 2014-09-28 15:53:21 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-28 23:30:54 -0400 |
| commit | 5a2da4abe30a05c138acd1c1cf3c08154dfa7847 (patch) | |
| tree | 7795ecf95f0bb10e2be0a4c8913039fe191797f1 /drivers/staging/octeon | |
| parent | aa66d88d0bf8d098794cf9923be7e773454d1806 (diff) | |
| download | op-kernel-dev-5a2da4abe30a05c138acd1c1cf3c08154dfa7847.zip op-kernel-dev-5a2da4abe30a05c138acd1c1cf3c08154dfa7847.tar.gz | |
staging: octeon: Fix missing blank line warning.
Fixes "Missing a blank line after declarations" checkpatch.pl warning in
ethernet-rgmii.c
Signed-off-by: Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/octeon')
| -rw-r--r-- | drivers/staging/octeon/ethernet-rgmii.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/staging/octeon/ethernet-rgmii.c b/drivers/staging/octeon/ethernet-rgmii.c index 651be7e..7eea5f0 100644 --- a/drivers/staging/octeon/ethernet-rgmii.c +++ b/drivers/staging/octeon/ethernet-rgmii.c @@ -83,6 +83,7 @@ static void cvm_oct_rgmii_poll(struct net_device *dev) int interface = INTERFACE(priv->port); int index = INDEX(priv->port); union cvmx_gmxx_rxx_int_reg gmxx_rxx_int_reg; + gmxx_rxx_int_reg.u64 = cvmx_read_csr(CVMX_GMXX_RXX_INT_REG (index, interface)); @@ -217,6 +218,7 @@ static irqreturn_t cvm_oct_rgmii_rml_interrupt(int cpl, void *dev_id) /* Read the GMX interrupt status bits */ union cvmx_gmxx_rxx_int_reg gmx_rx_int_reg; + gmx_rx_int_reg.u64 = cvmx_read_csr(CVMX_GMXX_RXX_INT_REG (index, interface)); @@ -261,6 +263,7 @@ static irqreturn_t cvm_oct_rgmii_rml_interrupt(int cpl, void *dev_id) /* Read the GMX interrupt status bits */ union cvmx_gmxx_rxx_int_reg gmx_rx_int_reg; + gmx_rx_int_reg.u64 = cvmx_read_csr(CVMX_GMXX_RXX_INT_REG (index, interface)); @@ -316,6 +319,7 @@ int cvm_oct_rgmii_open(struct net_device *dev) if (!octeon_is_simulation()) { if (priv->phydev) { int r = phy_read_status(priv->phydev); + if (r == 0 && priv->phydev->link == 0) netif_carrier_off(dev); cvm_oct_adjust_link(dev); @@ -407,6 +411,7 @@ int cvm_oct_rgmii_init(struct net_device *dev) void cvm_oct_rgmii_uninit(struct net_device *dev) { struct octeon_ethernet *priv = netdev_priv(dev); + cvm_oct_common_uninit(dev); /* |
