Merge remote-tracking branch 'staging/staging-next'

[karo-tx-linux.git] / drivers / staging / octeon / ethernet-rgmii.c

diff --git a/drivers/staging/octeon/ethernet-rgmii.c b/drivers/staging/octeon/ethernet-rgmii.c
index 1055ee14b66a7834883552e0f6a5dc229778784c..9353796af0b68e49259cd494896915935fb49d20 100644 (file)
--- a/drivers/staging/octeon/ethernet-rgmii.c
+++ b/drivers/staging/octeon/ethernet-rgmii.c
@@ -247,9 +247,7 @@ int cvm_oct_rgmii_init(struct net_device *dev)
        if (((priv->imode == CVMX_HELPER_INTERFACE_MODE_GMII)
             && (priv->port == 0))
            || (priv->imode == CVMX_HELPER_INTERFACE_MODE_RGMII)) {
-
                if (!octeon_is_simulation()) {
-
                        union cvmx_gmxx_rxx_int_en gmx_rx_int_en;
                        int interface = INTERFACE(priv->port);
                        int index = INDEX(priv->port);
@@ -283,9 +281,7 @@ void cvm_oct_rgmii_uninit(struct net_device *dev)
        if (((priv->imode == CVMX_HELPER_INTERFACE_MODE_GMII)
             && (priv->port == 0))
            || (priv->imode == CVMX_HELPER_INTERFACE_MODE_RGMII)) {
-
                if (!octeon_is_simulation()) {
-
                        union cvmx_gmxx_rxx_int_en gmx_rx_int_en;
                        int interface = INTERFACE(priv->port);
                        int index = INDEX(priv->port);