Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Guo Zhengkui <guozhengkui@vivo.com>
To:     Tomi Valkeinen <tomba@kernel.org>, David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        Neil Armstrong <narmstrong@baylibre.com>,
        Benoit Parrot <bparrot@ti.com>,
        Cai Huoqing <cai.huoqing@linux.dev>,
        Arnd Bergmann <arnd@arndb.de>,
        Guo Zhengkui <guozhengkui@vivo.com>,
        dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR TI OMAP),
        linux-kernel@vger.kernel.org (open list)
Cc:     zhengkui_guo@outlook.com
Subject: [PATCH] drm: omapdrm: dss: replace ternary operator with max()
Date:   Tue, 17 May 2022 13:02:06 +0800
Message-Id: <20220517050208.121488-1-guozhengkui@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UFe9WSTgTFZeSVuYvLVADmRYHjKN/9MtMX4QtHvbdRJJSO0+nNdn+6iAhMde?=
 =?us-ascii?Q?FINd2iWsmkFdw6JTau3XsVHevHLfq5fIw1g5g8l7aq0OsLcrl1C25A3t7E3W?=
 =?us-ascii?Q?9WX4xenv7g0vP1V8sI8/McEa/pbASOprS49O7GSQy+3tHHPVvJjIc0Jeg8Dy?=
 =?us-ascii?Q?Da0Jf8aY5HsVUXO9ZFcQz3jKHMTW5cDZVT7TfTk/zcWrpul0/j3r4wg0kALc?=
 =?us-ascii?Q?LKnj9q+wr8UjzIzm7xrOlYIRxXiT2nlJSxZZ/bYjSeUlAickXIp0HEOwOaSJ?=
 =?us-ascii?Q?13v+XMiu4UGdXB/Sj59RFtfyKjr6BSCwFHEz4RlOwgvT1gXPBX1xGCQZ6Jb7?=
 =?us-ascii?Q?KranogsUSpMGzSW2q5f3UjSA5A+Af3Kqu8gIJZytJXaTxD1AgsCkFsHbPRBL?=
 =?us-ascii?Q?Ea+U0gmBu7YJoNVMlctIIfEi8D8gS+ntOttNAEec7d/JUuNbUc8ORUisQLL4?=
 =?us-ascii?Q?wP/f7BHVi1Sqe8OdOV6VbcFWI/0PUBkGWQ9Typok50k93EWILBJFN7an4I2z?=
 =?us-ascii?Q?WoMnBeL5BPjq6oH/hh8xdi58O33NZkvSoDVAQpNSGOdzQ1Dy4cYtqcvlR6oQ?=
 =?us-ascii?Q?+d4M36Lr9kazt8/HfqWi4leZchxydqzVmvNExgGAJ/UpumNitGbsuY93BOhK?=
 =?us-ascii?Q?eFEVcM1z+f6gd8ijobs5hF7lfjdjJIOTwJI2GKrLtqF07rrOEhTRQs+6Yo/L?=
 =?us-ascii?Q?Nhts2h5x9xb0/Y1/hHiD4/YjoxkN7mnKa+J3IRATbRAaNXMlNwOzNYJvr3gZ?=
 =?us-ascii?Q?flgeSZMaV1gDPf+Hzx+iH2ba2YLm4plX59Z7OR+0o8NRnLkVBNyWD3BlJQog?=
 =?us-ascii?Q?1sD9XVHCx23Rd15kZxcSZFLqQqHLf4y0u4/JofL/nt0Bw83wycxg5CyRD6XP?=
 =?us-ascii?Q?p8P09oqk5o/uPvOm4oQCLfR0Dq6+KLpAUtnHbWWt+fa9X7doA0o2hvOoOiDo?=
 =?us-ascii?Q?C6GZjgXYGo14U5zWFpcAX1lJVl+SjKTOnAN+ecUyrVV+c4UeuXAbex8qnYrC?=
 =?us-ascii?Q?a2ybf/7xfCeua8yXU7kVHMPakBYX6iihpRuGg+FS/8smZdDiL5CdFLS2iDIm?=
 =?us-ascii?Q?0d75d90z3JyMMXZLdEPTtettZ3sOPSxrcsVsyqytcTGKM4Fn8oC+khGzmgFb?=
 =?us-ascii?Q?0yUy0U3Ilfm/SQWb8pmEumf/v0nixr1UiCAhxOMjNrelaYJ+IRUhkURgpgVT?=
 =?us-ascii?Q?RPr9BH2Q2Bdf9COMtYwOO/VCnv2Z+ZyPxywXRpELengVz9OD2d5Mxs/UaSrH?=
 =?us-ascii?Q?o/ALRpwv1bahsIB22oyjbF57Nvcc7sHb1I2RA8iAeMhzjoKHx/oPgnSdifoN?=
 =?us-ascii?Q?DFeR1KphL6DUadrMkCO4aBxbDmmnCuIj6dzU2/Kvo06pZHFYKI9cqZz640Dq?=
 =?us-ascii?Q?XhNYg1FNR5ZOueyrJtv5Zdo0Q9fN9l2w9H5ZUAi2PbhaG9wugU39eJbpep+E?=
 =?us-ascii?Q?xloWKb8uMtAbWItSFQ+wXlOispgCLiuWSNSankl8s+nJtzbBFLsRUeCUk5O1?=
 =?us-ascii?Q?ZMmPds8ZZ9IgdMBORNDfqYuRRzbiDAGBp8YGoeMD/hoWzoDFIYULernvoEEx?=
 =?us-ascii?Q?jpo0m7vl1bh4ro3Xo6ikAbu6SwWlSWnVicNSzH4CRlFNSHU/urjAr/EZsXLl?=
 =?us-ascii?Q?nSnDV1OtHR4s8e661KFRArD8o0uw90Cnylvt3yWqeq2oA7scC3Inhh8x+2Vs?=
 =?us-ascii?Q?FS59RbS0iknhTyKloWGLQUmQOndh5JhM7Zna6AAEMSDu8V5s+JUObpJRhHIN?=
 =?us-ascii?Q?IYCbyOx6sg=3D=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5c5d489d-e7ca-4b1a-0dfa-08da37c2737e
X-MS-Exchange-CrossTenant-AuthSource: HK2PR06MB3492.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2022 05:02:33.0295
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: nPIRnp0pQ52ydT20qNfPpjxIGGliNysNPWcmbuFUmiWYqPOrZ9HOdt/ccuZMwqf0OVQrzAulFow7VoFRv+H2sQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB4235
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Fix the following coccicheck warning:

drivers/gpu/drm/omapdrm/dss/dispc.c:2454:21-22: WARNING opportunity for max()

Signed-off-by: Guo Zhengkui <guozhengkui@vivo.com>
---
 drivers/gpu/drm/omapdrm/dss/dispc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index c4de142cc85b..0ee344ebcd1c 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -2451,7 +2451,7 @@ static int dispc_ovl_calc_scaling_44xx(struct dispc_device *dispc,
 
 	*decim_x = DIV_ROUND_UP(width, in_width_max);
 
-	*decim_x = *decim_x > decim_x_min ? *decim_x : decim_x_min;
+	*decim_x = max(*decim_x, decim_x_min);
 	if (*decim_x > *x_predecim)
 		return -EINVAL;
 
-- 
2.20.1