From patchwork Mon Aug 17 15:16:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 266260 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 11351C433DF for ; Mon, 17 Aug 2020 18:08:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E8C9120758 for ; Mon, 17 Aug 2020 18:08:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597687715; bh=xG8/kLZ35jqLlqpTwQ2SgV6SH5BSThBWrl/d887Snko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CXAHqJwVepbPr5Vz1P1MORhxmoZCn7yb45ijXUWcmLaeGvFQJi1CnaT9SJtzCL2/t bv8Z6g3pKrASr37b4l7wOfnu5Z0kUzI/U1Jd354XuGmK6ZhwObMB+fjgQc6E65+7Ts mSeZaD+iwkD/4OEaZZlxDk3C2TJfmFId0gJNKtQU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388438AbgHQQIN (ORCPT ); Mon, 17 Aug 2020 12:08:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:55676 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388435AbgHQQIL (ORCPT ); Mon, 17 Aug 2020 12:08:11 -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 61B1022D01; Mon, 17 Aug 2020 16:08:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597680485; bh=xG8/kLZ35jqLlqpTwQ2SgV6SH5BSThBWrl/d887Snko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bxg5987Dv2qTSkXHk4ieOlxbsTDga8qDrqTrcK8Q/Ej9NeyUUk5LuT47oWqmo1Z5q sm9bj3Q8HfVxDHmSkcqemqe6db3IIfJbO2eMvWDWxuEwHFQzAYdspfCRqZqvUELHmh Rlsvo1pF9BXI+tcNseLPAmVOG4Ir4+Ol8uhmmlbU= 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.4 206/270] fsl/fman: fix unreachable code Date: Mon, 17 Aug 2020 17:16:47 +0200 Message-Id: <20200817143806.046192950@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143755.807583758@linuxfoundation.org> References: <20200817143755.807583758@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 e1901874c19f0..08f8b36779ea4 100644 --- a/drivers/net/ethernet/freescale/fman/fman_memac.c +++ b/drivers/net/ethernet/freescale/fman/fman_memac.c @@ -856,7 +856,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);