From patchwork Wed Jun 7 06:17:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 9770589 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7C7D860364 for ; Wed, 7 Jun 2017 06:18:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67FD9284A6 for ; Wed, 7 Jun 2017 06:18:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5CB1B284D2; Wed, 7 Jun 2017 06:18:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E9D5E284A6 for ; Wed, 7 Jun 2017 06:18:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=jAJt3VJ8fo8BLC1wKTatdAZuP8AylxmNaALNldAeFmA=; b=nMD 2gxOCXLxCZt9+LsxBC8+zZ+e0UELIpg50Px9/BYmJ3xlmLS78V63cNBQosut8nqo0UD2sb+66d3Q0 Ef/Ra+zHB1LUDVbn+m6DwRLKWx7bmcwglT5H4En7It5wo7PjhVLLi9VdIdG/yFDFFFwOYZHnsMtB+ sejVR8VNH3dttLz7N1g6PUqoyhJtNiavxoJ7zk7VoM7XqWEL+CUofaKvTtWyLHdUql1qi4x2RNztO hRkXVdI8SXDsbOtyhQGV4FIETam/2MTkm4ElUiGhzlnpSIq03L7aAN/dUbyeKz/cKNwwqdda/bMZ7 3YdmPf75XCAb+jemMk1srTcgZ8gWF6Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dIUIT-000148-MB; Wed, 07 Jun 2017 06:18:25 +0000 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dIUIQ-00011o-EY for linux-arm-kernel@lists.infradead.org; Wed, 07 Jun 2017 06:18:24 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id B903621CFB; Wed, 7 Jun 2017 08:18:00 +0200 (CEST) Received: from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 8FD9720E86; Wed, 7 Jun 2017 08:18:00 +0200 (CEST) From: Antoine Tenart To: davem@davemloft.net, netdev@vger.kernel.org, thomas.petazzoni@free-electrons.com Subject: [PATCH v2] net: mvpp2: do not bypass the mvpp22_port_mii_set function Date: Wed, 7 Jun 2017 08:17:50 +0200 Message-Id: <20170607061750.28516-1-antoine.tenart@free-electrons.com> X-Mailer: git-send-email 2.9.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170606_231822_637606_687B0CA7 X-CRM114-Status: UNSURE ( 9.34 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: gregory.clement@free-electrons.com, Antoine Tenart , mw@semihalf.com, linux@armlinux.org.uk, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Thomas Petazzoni --- Since v1: - Added the Fixes tag. - Added Thomas' Acked-by. drivers/net/ethernet/marvell/mvpp2.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index 9b875d776b29..70bca2a6fb02 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -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);