From patchwork Mon Apr 9 19:38:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karthikeyan Ramasubramanian X-Patchwork-Id: 10331941 X-Patchwork-Delegate: agross@codeaurora.org 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 9E97C6037F for ; Mon, 9 Apr 2018 19:39:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8FE8A28BF0 for ; Mon, 9 Apr 2018 19:39:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 849C028BF2; Mon, 9 Apr 2018 19:39:00 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A8F528BF0 for ; Mon, 9 Apr 2018 19:39:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753982AbeDITi5 (ORCPT ); Mon, 9 Apr 2018 15:38:57 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:42294 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751742AbeDITiz (ORCPT ); Mon, 9 Apr 2018 15:38:55 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 9D07460FA9; Mon, 9 Apr 2018 19:38:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1523302734; bh=PnGAFifEl8K9BlgzDiiiCzvaBGl8oZm1jyiQnL3lga8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kce8bkiXrPSNXsqhd/oqf4cO9wq+LuBv7tbCE5xVFzTNxhc+T4Jx+5inqBNBJ/iS9 gYUeYe9kg5pQfQcgJ24SRwkHVz4OYmnbUGY/OtZc0cfacab+ikfcyOMc8/wl7AZ4/f a4ElW6G0FrSxU8uoD5KpymorCE67tDtIYFLOkJeQ= Received: from codeaurora.org (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: kramasub@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 55ED360F78; Mon, 9 Apr 2018 19:38:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1523302734; bh=PnGAFifEl8K9BlgzDiiiCzvaBGl8oZm1jyiQnL3lga8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kce8bkiXrPSNXsqhd/oqf4cO9wq+LuBv7tbCE5xVFzTNxhc+T4Jx+5inqBNBJ/iS9 gYUeYe9kg5pQfQcgJ24SRwkHVz4OYmnbUGY/OtZc0cfacab+ikfcyOMc8/wl7AZ4/f a4ElW6G0FrSxU8uoD5KpymorCE67tDtIYFLOkJeQ= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 55ED360F78 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=kramasub@codeaurora.org From: Karthikeyan Ramasubramanian To: gregkh@linuxfoundation.org, jslaby@suse.com Cc: Karthikeyan Ramasubramanian , linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, evgreen@chromium.org, acourbot@chromium.org, swboyd@chromium.org, dianders@chromium.org, sdharia@codeaurora.org, girishm@codeaurora.org, festevam@gmail.com Subject: [PATCH v2 3/8] tty: serial: qcom_geni_serial: Use min3 to find minimum of 3 values Date: Mon, 9 Apr 2018 13:38:36 -0600 Message-Id: <1523302721-19439-4-git-send-email-kramasub@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1523302721-19439-1-git-send-email-kramasub@codeaurora.org> References: <1523302721-19439-1-git-send-email-kramasub@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use min3 helper to calculate the minimum value of 3 variables. Signed-off-by: Karthikeyan Ramasubramanian Reviewed-by: Matthias Kaehlcke --- drivers/tty/serial/qcom_geni_serial.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c index ae959d6..21e9160 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -586,11 +586,7 @@ static void qcom_geni_serial_handle_tx(struct uart_port *uport) avail = (port->tx_fifo_depth - port->tx_wm) * port->tx_bytes_pw; tail = (xmit->tail + port->xmit_size) & (UART_XMIT_SIZE - 1); - if (chunk > (UART_XMIT_SIZE - tail)) - chunk = UART_XMIT_SIZE - tail; - if (chunk > avail) - chunk = avail; - + chunk = min3((size_t)chunk, UART_XMIT_SIZE - tail, avail); if (!chunk) goto out_write_wakeup;