From patchwork Wed Oct 19 09:11:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 4971 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp226970wrs; Wed, 19 Oct 2022 02:47:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6FK8xAYEYKuX792ybXkZT7NF6TOKix7g8Z49Y62MlmVzsGuBd32MhPYefwTZ6vKbB9VowW X-Received: by 2002:a65:6148:0:b0:458:88cd:f46 with SMTP id o8-20020a656148000000b0045888cd0f46mr6410808pgv.303.1666172848356; Wed, 19 Oct 2022 02:47:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666172848; cv=none; d=google.com; s=arc-20160816; b=UklkR/abUMFQDXUXjCsHpaxsZU4M/NLtAldwvM+BT6LQD9zVCroVS+eDJstM5aYD0v DzrDOpvwo6O6C6dT5BxRBciPx7E3KL/0ggOSCocXjNhaO+Ti3Pob0X4YD5JrfaXaqh6+ bWGxV9xa0+goDzJ50widIieURlcxyc3LC0aqGpdNGaKEYcuwtVCMOVFYRXb6E8EmpVJN QehImUykh+DgnyjtsvUm9bkwVNiPIiMQmQg5WXj1O7R9003zyRFxTEsOPvttl+FU3brq CxQ+8WkSO4yCsDxY+fb5GEsOgj6kAjoykAjwVCJiM0bOaOF0gAdcFctIpO8GO0IL4kgO IFow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=myOg0sHFlZSV36tqAZ4559T98rjt8yZsmInObyAYMeE=; b=q9aVKglNK9fJCYwllNLgmdu6hggW0T+YrbJaPc03qtwuLaax2OLSnxE72tG20JgC27 JCMymUCgGKLJWIdBITLLIUwbA90rbjwd2MRuVyqEXijT2O63YBeYhLgemPabtWuLPDxU VQIC02MJgduHTrS1DRdE7pPkY07pvnSAnBuqGqMVVc3yVS8oQYfnXo9yWDht4qEfcOnX CeJUEq2jcGhxc0rRiAT2g5wq4+rfflge1+2WiIAoTeOvToVVtQz2ayRjsDjCznctTb4G XUXSKC7RbuBnby/HwFD0pb73bNts2UZ6i1vfbR0bLAl6U0pQgr4Eh9Owh0nBpA3IuRKQ LaFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UlSQzY64; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q13-20020a63f94d000000b0046265702353si17920041pgk.203.2022.10.19.02.47.14; Wed, 19 Oct 2022 02:47:28 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UlSQzY64; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234077AbiJSJiJ (ORCPT + 99 others); Wed, 19 Oct 2022 05:38:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233748AbiJSJb4 (ORCPT ); Wed, 19 Oct 2022 05:31:56 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 814323BC5E; Wed, 19 Oct 2022 02:14:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666170871; x=1697706871; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4ObBwRuWrJK1g3IrqjFMLSUzxYAzEx+HCgNSGf3jLYM=; b=UlSQzY64Pp0+6M14RIovJM6PSDpMrmWXA4U84Kz6MPUHRVwIZ4IG5Zts AKD+yZpfoqEY9oqfOl8mXEbhXMwne++JOAWgNcknNeAtgjKysjSjQyh5/ Nfg5aZr8NNEL40GkmMxIMn15n1PW60PqaNm4rNr9IgBiNAK5z5phC5RY+ 670Ud0PnkOPJbuGYb00CvqYaj3cqcCeZXqXe8j+0z89ESvE7TD6XFn2Aw e7ZvdvpP5R/WcjeFsqg2pPVcbmzGAkn1CAIR9wRfmDEmVPTaj/0D+Lmin hgnkst4fNYZLIotX2EwgkvLxm5UDGvmg95G4vpqMDJY3bFwojA4kuQ2oW w==; X-IronPort-AV: E=McAfee;i="6500,9779,10504"; a="332910963" X-IronPort-AV: E=Sophos;i="5.95,195,1661842800"; d="scan'208";a="332910963" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2022 02:13:13 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10504"; a="734118786" X-IronPort-AV: E=Sophos;i="5.95,195,1661842800"; d="scan'208";a="734118786" Received: from sponnura-mobl1.amr.corp.intel.com (HELO ijarvine-MOBL2.ger.corp.intel.com) ([10.251.214.35]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2022 02:13:10 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: linux-serial@vger.kernel.org, Greg KH , Jiri Slaby , linux-kernel@vger.kernel.org Cc: Andy Shevchenko , =?utf-8?q?Ilpo_J?= =?utf-8?q?=C3=A4rvinen?= Subject: [PATCH 16/44] serial: fsl_lpuart: Use uart_xmit_advance() Date: Wed, 19 Oct 2022 12:11:23 +0300 Message-Id: <20221019091151.6692-17-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221019091151.6692-1-ilpo.jarvinen@linux.intel.com> References: <20221019091151.6692-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747108860513852728?= X-GMAIL-MSGID: =?utf-8?q?1747108860513852728?= Take advantage of the new uart_xmit_advance() helper. Signed-off-by: Ilpo Järvinen --- drivers/tty/serial/fsl_lpuart.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 67fa113f77d4..1c9c9f5e3610 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -535,9 +535,7 @@ static void lpuart_dma_tx_complete(void *arg) dma_unmap_sg(chan->device->dev, sgl, sport->dma_tx_nents, DMA_TO_DEVICE); - xmit->tail = (xmit->tail + sport->dma_tx_bytes) & (UART_XMIT_SIZE - 1); - - sport->port.icount.tx += sport->dma_tx_bytes; + uart_xmit_advance(&sport->port, sport->dma_tx_bytes); sport->dma_tx_in_progress = false; spin_unlock_irqrestore(&sport->port.lock, flags); @@ -792,8 +790,7 @@ static inline void lpuart32_transmit_buffer(struct lpuart_port *sport) txcnt &= UARTWATER_COUNT_MASK; while (!uart_circ_empty(xmit) && (txcnt < sport->txfifo_size)) { lpuart32_write(&sport->port, xmit->buf[xmit->tail], UARTDATA); - xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); - sport->port.icount.tx++; + uart_xmit_advance(&sport->port, 1); txcnt = lpuart32_read(&sport->port, UARTWATER); txcnt = txcnt >> UARTWATER_TXCNT_OFF; txcnt &= UARTWATER_COUNT_MASK;