From patchwork Mon Aug 17 15:15:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 266150 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24ED5C433E1 for ; Mon, 17 Aug 2020 18:48:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F1CD72072E for ; Mon, 17 Aug 2020 18:48:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597690122; bh=+bzjetun8RNTzJ2/XSVVLY03Knr3lMknX4t/ao13OAQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RBl4z9mxrR9LbfPc/QSz+6b47QNqpXhmmSHvSrZGy2uQdILX4xlnWyTuKaFXb8Ax9 XLsL4V0OLywQV2D7umlhWFODLVKZ+owSI9XOs9MiyKLbV5kjsLu6yCvsECMKyRpR3d EMy4XpKSQCoqRWyVd5XrnLrSR1N66QQF0F5HU5fY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388010AbgHQPy6 (ORCPT ); Mon, 17 Aug 2020 11:54:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:42618 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388006AbgHQPyw (ORCPT ); Mon, 17 Aug 2020 11:54:52 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id ABF4120729; Mon, 17 Aug 2020 15:54:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597679692; bh=+bzjetun8RNTzJ2/XSVVLY03Knr3lMknX4t/ao13OAQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0aS8kqChOpT3dZo/CNxEq9zNeOElRkkB5yCRBeAH1s0m62QglWMJ4OeWzlWSlklv+ dX9gko+hEimrNEHkZMWdy4D5RwyhhB2pDNkyEb6VDJAN5WBIMCy/4Z0+V7/b98f2zQ QuH4YMUGVgkq+TZzsp/Nv34iYxIO7p95TfndanO0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florinel Iordache , "David S. Miller" , Sasha Levin Subject: [PATCH 5.7 302/393] fsl/fman: fix unreachable code Date: Mon, 17 Aug 2020 17:15:52 +0200 Message-Id: <20200817143834.264490780@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143819.579311991@linuxfoundation.org> References: <20200817143819.579311991@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Florinel Iordache [ Upstream commit cc79fd8f557767de90ff199d3b6fb911df43160a ] The parameter 'priority' is incorrectly forced to zero which ultimately induces logically dead code in the subsequent lines. Fixes: 57ba4c9b56d8 ("fsl/fman: Add FMan MAC support") Signed-off-by: Florinel Iordache Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/freescale/fman/fman_memac.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c index a5500ede40703..bb02b37422cc2 100644 --- a/drivers/net/ethernet/freescale/fman/fman_memac.c +++ b/drivers/net/ethernet/freescale/fman/fman_memac.c @@ -852,7 +852,6 @@ int memac_set_tx_pause_frames(struct fman_mac *memac, u8 priority, tmp = ioread32be(®s->command_config); tmp &= ~CMD_CFG_PFC_MODE; - priority = 0; iowrite32be(tmp, ®s->command_config);