Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp848516pja; Wed, 1 Apr 2020 09:47:36 -0700 (PDT) X-Google-Smtp-Source: APiQypKsw5RUNxMftSqopeRm8LmtvGTGtkrzuj/PM2GJpy6PtoB+KvzicMT56Ibq1YL07QKT1/W4 X-Received: by 2002:aca:d64f:: with SMTP id n76mr3380425oig.48.1585759656590; Wed, 01 Apr 2020 09:47:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759656; cv=none; d=google.com; s=arc-20160816; b=xUoIzZLgEpHlK2a7ChdTVRzTqO17oIU6Wuy1rfrBr25r/5XjgCVQQ+Wz4kUCbZyBEY zV5XiQmXFunoOP9gOCCVhDunACwGzsxzprnGHMvtN4OirhAKHaUbusB6ZKcvwPniv8hJ UAcKvcIh2O5QaI+nmEtHsitZ5QB8XxDiwX0XgT7z16nH9xldigevgrX9dPgt1tYBRQwg q1OM/Iyg33dlvZi3cveOfIsMyK0CSWBIWGeilUBQ4J0P3+c5g+uL59NVJIIFR5IZs5CQ UbMLISKuPH2faJPtTG0NeXEo6KJ1SqLQNfAp2rEyZN9WuXhQ3OKdGRsvvqHKsZtgjlCA zZxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VYTyjW0KBdUymFvcSGU9QXFZmERZsw7Z0/GrJLd/coE=; b=i89whgegp6c7riYsgZ+hM3/sHufHFsjyj9R04Ma9tn/Ns6aAXdgYcfqa0u3zIbZDoS ABNjbFC/ddeuz6/C1xScVZBM0PhQZ8X41+S45KAxsPW32MLDlKvslpNCMQAIGIFCyhPV MsxAVzz7QV/5HJO8uWvAfWoLNcOWgqG8OUhBoxHcqDyEM5NIMA5uTXCW8/qgVUlRQTOi Ezag7U1k49TNwepQET1etE94Oqb/2qThBYnHL5l1a6h9j94M7LUYfJFfP9yUb/RLRU+Q hpyN3yKyqKA1Gxqxqk4KG9NsF1RkCsdOCwAjzBAJrVAWxekm4uk5FsuewC5upuxd/mWH a0Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VATjR6NI; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q196si1096440oic.143.2020.04.01.09.47.22; Wed, 01 Apr 2020 09:47:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VATjR6NI; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389924AbgDAQqT (ORCPT + 99 others); Wed, 1 Apr 2020 12:46:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:47664 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389919AbgDAQqT (ORCPT ); Wed, 1 Apr 2020 12:46:19 -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 2FB912063A; Wed, 1 Apr 2020 16:46:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759578; bh=I2oYdk8F22AfoJfmc1204FRw4JaaneDeqgX+3KuBpV0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VATjR6NIEdur4e8tN1CRm7fwDviWhBO7KpfDCri8pY5ynDad0pevDOzBjYeK4lNC3 RMJnCQ+xJ6nATMRsFHERd81CVoLX5mXu/StuiPfErR1Z7jmAaMM6wsqeyFCqmOrDbE EZ/cGNflSxcUKcn9MXX9joAF5LUeLREjLASN08zs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nathan Chancellor , Madalin Bucur , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 083/148] dpaa_eth: Remove unnecessary boolean expression in dpaa_get_headroom Date: Wed, 1 Apr 2020 18:17:55 +0200 Message-Id: <20200401161601.126682785@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nathan Chancellor [ Upstream commit 7395f62d95aafacdb9bd4996ec2f95b4a655d7e6 ] Clang warns: drivers/net/ethernet/freescale/dpaa/dpaa_eth.c:2860:9: warning: converting the result of '?:' with integer constants to a boolean always evaluates to 'true' [-Wtautological-constant-compare] return DPAA_FD_DATA_ALIGNMENT ? ALIGN(headroom, ^ drivers/net/ethernet/freescale/dpaa/dpaa_eth.c:131:34: note: expanded from macro 'DPAA_FD_DATA_ALIGNMENT' \#define DPAA_FD_DATA_ALIGNMENT (fman_has_errata_a050385() ? 64 : 16) ^ 1 warning generated. This was exposed by commit 3c68b8fffb48 ("dpaa_eth: FMan erratum A050385 workaround") even though it appears to have been an issue since the introductory commit 9ad1a3749333 ("dpaa_eth: add support for DPAA Ethernet") since DPAA_FD_DATA_ALIGNMENT has never been able to be zero. Just replace the whole boolean expression with the true branch, as it is always been true. Link: https://github.com/ClangBuiltLinux/linux/issues/928 Signed-off-by: Nathan Chancellor Reviewed-by: Madalin Bucur Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c index 39b8b6730e77c..67246d42c3d9f 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c @@ -2646,9 +2646,7 @@ static inline u16 dpaa_get_headroom(struct dpaa_buffer_layout *bl) headroom = (u16)(bl->priv_data_size + DPAA_PARSE_RESULTS_SIZE + DPAA_TIME_STAMP_SIZE + DPAA_HASH_RESULTS_SIZE); - return DPAA_FD_DATA_ALIGNMENT ? ALIGN(headroom, - DPAA_FD_DATA_ALIGNMENT) : - headroom; + return ALIGN(headroom, DPAA_FD_DATA_ALIGNMENT); } static int dpaa_eth_probe(struct platform_device *pdev) -- 2.20.1