]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
net: mvpp2: do not bypass the mvpp22_port_mii_set function
authorAntoine Ténart <antoine.tenart@free-electrons.com>
Wed, 7 Jun 2017 06:17:50 +0000 (08:17 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Jun 2017 19:08:10 +0000 (15:08 -0400)
The mvpp22_port_mii_set() function was added by 2697582144dd, but the
function directly returns without doing anything. This return was used
when debugging and wasn't removed before sending the patch. Fix this.

Fixes: 2697582144dd ("net: mvpp2: handle misc PPv2.1/PPv2.2 differences")
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/marvell/mvpp2.c

index 9b875d776b296d165c4ae3a994bd527a8dafb698..70bca2a6fb024ab788d3f85b0f8f9768ab2b51f5 100644 (file)
@@ -4186,8 +4186,6 @@ static void mvpp22_port_mii_set(struct mvpp2_port *port)
 {
        u32 val;
 
-       return;
-
        /* Only GOP port 0 has an XLG MAC */
        if (port->gop_id == 0) {
                val = readl(port->base + MVPP22_XLG_CTRL3_REG);