From patchwork Wed Oct 31 10:57:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Esmil X-Patchwork-Id: 10662417 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A5E1B14DE for ; Wed, 31 Oct 2018 10:58:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9167E2A313 for ; Wed, 31 Oct 2018 10:58:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85A382A39C; Wed, 31 Oct 2018 10:58:43 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 209052A313 for ; Wed, 31 Oct 2018 10:58:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=i2jdKDaUbSyiHNmHFxMznNTYYUfqK3ir4QFu2hMfzsc=; b=WEYf9yEOC65Gau 1hDl/3LmYLwMLPLcGGcQqElegrE34do+xYXV6X4Q4T320Y8VpXPDZXsZtKyP07zDi4HDmBjIvQoSU DD8NguVtSa4Q+IAlfgvpVIkW3cFTh6zQYmWemVt6bQOOSrRwa73LX+AAKJXK/lXS5rXYIl5ny09S9 /DqYOKjLsdPvHhjI+pdJvxZZNDtwvJS1zmxO931zN+BHIWvFsA40Ixt8/jKkEIt7ZjYQKENMYsVLW a8h2AmQCeNsc08dUvEAS4xMdJauA/FaRanJeb86wXM2Mlshtgfd7Cxi+VThIIXPOljUZj2g9wHXj0 KXT/i1PPEgqb6BDUUyZA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gHoCq-0008CD-F6; Wed, 31 Oct 2018 10:58:36 +0000 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gHoCR-0007ol-92; Wed, 31 Oct 2018 10:58:20 +0000 Received: by mail-ed1-x542.google.com with SMTP id x31-v6so13204132edd.8; Wed, 31 Oct 2018 03:58:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uG/xPakQDGOY9YPMCZ7pYvd1ZBnUY9UsEppY+TSPajo=; b=XGx3WDoM4Rk+WhuH9O40Y4RRg8l3d4hd2P97Pj/GzVe1h189uWhlP6j0Y+NO6AABj+ DPylhXzQuxhMKu8vvp6HsANUxhBzptPwZhSarcm/s+2bzVEcYoc8sGWjmw8pUYf4k0gV 5WX/wsc6bL1CU7YrosTAHl2iyQyIXiHKngTUO5GugHFx4PFYfyZBzIwevanifmaziUbP cVDnu88e+0+zxbvV03VdeQCBTwRoJYgzIwyCEAs7nu03OmKlG8OysHdouI3Z9fvcv8xE 3kDJ9xM4+w6QQu913Gbk0IGxo183nFECkd4b2FOmnLdaEnopYYvqnDv6CDe7y9tAa4em rm9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=uG/xPakQDGOY9YPMCZ7pYvd1ZBnUY9UsEppY+TSPajo=; b=PAHfIYjTHbj+KGKBBkRg/N8w0X7hrfmPavPf5T11GyfmsgrQ5CZHGX1QqeaNZS1yfr dy3HMpXjaOnnT9SDfkKriNOpHJiWEHJkrxYenlq7XizMWy2Xw4FxJANnzoAtTMHzprf+ nsI9bWvHoWeEQs93l6fWKmKHL7ni/KLHR1Oa1MZvWjalKycr8AS8rCOprP03RhObZ4ur krM+DIcslLrbXAcIRwZ3fmOdUFNSWdz/z1Id/08BbxlDg6gU5q0WRI+B8BlGdZ5X1/Qu tqWYW7LICd3k7ypoC/5BGCdoS+GabfvogXoa2TyS8MBm/gYK/zuoIJZp9iqGsVnbcawT JSlw== X-Gm-Message-State: AGRZ1gJIz+eSC+X4qmdb/IWm0Ma2pAW9TNC5FuqChwTs/QaRJAegp3LA Bq3ejlnqA79WBLODvBw3qw8= X-Google-Smtp-Source: AJdET5csXFh0pqMdQhcegMeilGEg2H5FFBGjTwlAS9nYeEVuOQPyDKUJ6nxxIefpGHurU40hWPAwZQ== X-Received: by 2002:a50:86ac:: with SMTP id r41-v6mr1626897eda.186.1540983489826; Wed, 31 Oct 2018 03:58:09 -0700 (PDT) Received: from localhost.localdomain ([5.57.50.195]) by smtp.gmail.com with ESMTPSA id a40-v6sm9041108edd.61.2018.10.31.03.58.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Oct 2018 03:58:09 -0700 (PDT) From: Emil Renner Berthing To: linux-spi@vger.kernel.org Subject: [PATCH v1 09/14] spi: rockchip: simplify use_dma logic Date: Wed, 31 Oct 2018 11:57:06 +0100 Message-Id: <20181031105711.19575-10-esmil@mailme.dk> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181031105711.19575-1-esmil@mailme.dk> References: <20181031105711.19575-1-esmil@mailme.dk> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181031_035811_339708_063BA18D X-CRM114-Status: GOOD ( 13.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Addy Ke , Emil Renner Berthing , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Mark Brown , linux-arm-kernel@lists.infradead.org, Heiko Stuebner Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Emil Renner Berthing We only need to know if we're using dma when setting up the transfer, so just use a local variable for that. Signed-off-by: Emil Renner Berthing --- drivers/spi/spi-rockchip.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 45a1479c1a29..ba60cbcd45c2 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -184,8 +184,6 @@ struct rockchip_spi { void *rx_end; bool cs_asserted[ROCKCHIP_SPI_MAX_CS_NUM]; - - bool use_dma; }; static inline void spi_enable_chip(struct rockchip_spi *rs, bool enable) @@ -450,7 +448,8 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs, } static void rockchip_spi_config(struct rockchip_spi *rs, - struct spi_device *spi, struct spi_transfer *xfer) + struct spi_device *spi, struct spi_transfer *xfer, + bool use_dma) { u32 div = 0; u32 dmacr = 0; @@ -471,7 +470,7 @@ static void rockchip_spi_config(struct rockchip_spi *rs, else cr0 |= CR0_XFM_TO << CR0_XFM_OFFSET; - if (rs->use_dma) { + if (use_dma) { if (xfer->tx_buf) dmacr |= TF_DMA_EN; if (xfer->rx_buf) @@ -537,6 +536,7 @@ static int rockchip_spi_transfer_one( struct spi_transfer *xfer) { struct rockchip_spi *rs = spi_master_get_devdata(master); + bool use_dma; WARN_ON(readl_relaxed(rs->regs + ROCKCHIP_SPI_SSIENR) && (readl_relaxed(rs->regs + ROCKCHIP_SPI_SR) & SR_BUSY)); @@ -559,15 +559,11 @@ static int rockchip_spi_transfer_one( rs->rx = xfer->rx_buf; rs->rx_end = rs->rx + xfer->len; - /* we need prepare dma before spi was enabled */ - if (master->can_dma && master->can_dma(master, spi, xfer)) - rs->use_dma = true; - else - rs->use_dma = false; + use_dma = master->can_dma ? master->can_dma(master, spi, xfer) : false; - rockchip_spi_config(rs, spi, xfer); + rockchip_spi_config(rs, spi, xfer, use_dma); - if (rs->use_dma) + if (use_dma) return rockchip_spi_prepare_dma(rs, master, xfer); return rockchip_spi_pio_transfer(rs);