From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [3/7] dmaengine: stm32-dma: fix typo and reported checkpatch warnings From: Joel Fernandes Message-Id: <20181009054752.145978-4-joel@joelfernandes.org> Date: Mon, 8 Oct 2018 22:47:48 -0700 To: stable@vger.kernel.org Cc: Pierre Yves MORDRET , Vinod Koul , gregkh@linuxfoundation.org, Alexandre Torgue , Dan Williams , dmaengine@vger.kernel.org, "Joel Fernandes (Google)" , "moderated list:ARM/STM32 ARCHITECTURE" , linux-kernel@vger.kernel.org, Maxime Coquelin List-ID: RnJvbTogUGllcnJlIFl2ZXMgTU9SRFJFVCA8cGllcnJlLXl2ZXMubW9yZHJldEBzdC5jb20+CgpG aXggdHlwbyBpbiBhIGNvbW1lbnQgYW5kIHNvbHZlZCByZXBvcnRlZCBjaGVja3BhdGNoIHdhcm5p bmdzLgoKU2lnbmVkLW9mZi1ieTogUGllcnJlLVl2ZXMgTU9SRFJFVCA8cGllcnJlLXl2ZXMubW9y ZHJldEBzdC5jb20+ClNpZ25lZC1vZmYtYnk6IFZpbm9kIEtvdWwgPHZpbm9kLmtvdWxAaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZG1hL3N0bTMyLWRtYS5jIHwgMTEgKysrKysrLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9kbWEvc3RtMzItZG1hLmMgYi9kcml2ZXJzL2RtYS9zdG0zMi1kbWEuYwppbmRleCBm YWU3ZGU1NGYwMGEuLmI2NGUxNGE4M2RlYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9kbWEvc3RtMzIt ZG1hLmMKKysrIGIvZHJpdmVycy9kbWEvc3RtMzItZG1hLmMKQEAgLTYwLDcgKzYwLDggQEAKICNk ZWZpbmUgU1RNMzJfRE1BX1NDUl9QSU5DCQlCSVQoOSkgLyogUGVyaXBoZXJhbCBpbmNyZW1lbnQg bW9kZSAqLwogI2RlZmluZSBTVE0zMl9ETUFfU0NSX0NJUkMJCUJJVCg4KSAvKiBDaXJjdWxhciBt b2RlICovCiAjZGVmaW5lIFNUTTMyX0RNQV9TQ1JfUEZDVFJMCQlCSVQoNSkgLyogUGVyaXBoZXJh bCBGbG93IENvbnRyb2xsZXIgKi8KLSNkZWZpbmUgU1RNMzJfRE1BX1NDUl9UQ0lFCQlCSVQoNCkg LyogVHJhbnNmZXIgQ3BsZXRlIEludCBFbmFibGUqLworI2RlZmluZSBTVE0zMl9ETUFfU0NSX1RD SUUJCUJJVCg0KSAvKiBUcmFuc2ZlciBDb21wbGV0ZSBJbnQgRW5hYmxlCisJCQkJCQkqLwogI2Rl ZmluZSBTVE0zMl9ETUFfU0NSX1RFSUUJCUJJVCgyKSAvKiBUcmFuc2ZlciBFcnJvciBJbnQgRW5h YmxlICovCiAjZGVmaW5lIFNUTTMyX0RNQV9TQ1JfRE1FSUUJCUJJVCgxKSAvKiBEaXJlY3QgTW9k ZSBFcnIgSW50IEVuYWJsZSAqLwogI2RlZmluZSBTVE0zMl9ETUFfU0NSX0VOCQlCSVQoMCkgLyog U3RyZWFtIEVuYWJsZSAqLwpAQCAtOTE4LDcgKzkxOSw3IEBAIHN0YXRpYyBlbnVtIGRtYV9zdGF0 dXMgc3RtMzJfZG1hX3R4X3N0YXR1cyhzdHJ1Y3QgZG1hX2NoYW4gKmMsCiAJdTMyIHJlc2lkdWUg PSAwOwogCiAJc3RhdHVzID0gZG1hX2Nvb2tpZV9zdGF0dXMoYywgY29va2llLCBzdGF0ZSk7Ci0J aWYgKChzdGF0dXMgPT0gRE1BX0NPTVBMRVRFKSB8fCAoIXN0YXRlKSkKKwlpZiAoc3RhdHVzID09 IERNQV9DT01QTEVURSB8fCAhc3RhdGUpCiAJCXJldHVybiBzdGF0dXM7CiAKIAlzcGluX2xvY2tf aXJxc2F2ZSgmY2hhbi0+dmNoYW4ubG9jaywgZmxhZ3MpOwpAQCAtOTgyLDcgKzk4Myw3IEBAIHN0 YXRpYyB2b2lkIHN0bTMyX2RtYV9kZXNjX2ZyZWUoc3RydWN0IHZpcnRfZG1hX2Rlc2MgKnZkZXNj KQogfQogCiBzdGF0aWMgdm9pZCBzdG0zMl9kbWFfc2V0X2NvbmZpZyhzdHJ1Y3Qgc3RtMzJfZG1h X2NoYW4gKmNoYW4sCi0JCQkgIHN0cnVjdCBzdG0zMl9kbWFfY2ZnICpjZmcpCisJCQkJIHN0cnVj dCBzdG0zMl9kbWFfY2ZnICpjZmcpCiB7CiAJc3RtMzJfZG1hX2NsZWFyX3JlZygmY2hhbi0+Y2hh bl9yZWcpOwogCkBAIC0xMDE1LDggKzEwMTYsOCBAQCBzdGF0aWMgc3RydWN0IGRtYV9jaGFuICpz dG0zMl9kbWFfb2ZfeGxhdGUoc3RydWN0IG9mX3BoYW5kbGVfYXJncyAqZG1hX3NwZWMsCiAJY2Zn LnN0cmVhbV9jb25maWcgPSBkbWFfc3BlYy0+YXJnc1syXTsKIAljZmcuZmVhdHVyZXMgPSBkbWFf c3BlYy0+YXJnc1szXTsKIAotCWlmICgoY2ZnLmNoYW5uZWxfaWQgPj0gU1RNMzJfRE1BX01BWF9D SEFOTkVMUykgfHwKLQkgICAgKGNmZy5yZXF1ZXN0X2xpbmUgPj0gU1RNMzJfRE1BX01BWF9SRVFV RVNUX0lEKSkgeworCWlmIChjZmcuY2hhbm5lbF9pZCA+PSBTVE0zMl9ETUFfTUFYX0NIQU5ORUxT IHx8CisJICAgIGNmZy5yZXF1ZXN0X2xpbmUgPj0gU1RNMzJfRE1BX01BWF9SRVFVRVNUX0lEKSB7 CiAJCWRldl9lcnIoZGV2LCAiQmFkIGNoYW5uZWwgYW5kL29yIHJlcXVlc3QgaWRcbiIpOwogCQly ZXR1cm4gTlVMTDsKIAl9Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DBDBC64EAD for ; Tue, 9 Oct 2018 05:48:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 411B021479 for ; Tue, 9 Oct 2018 05:48:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=joelfernandes.org header.i=@joelfernandes.org header.b="OAnb0LOL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 411B021479 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=joelfernandes.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726649AbeJINDX (ORCPT ); Tue, 9 Oct 2018 09:03:23 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:38536 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726496AbeJINDX (ORCPT ); Tue, 9 Oct 2018 09:03:23 -0400 Received: by mail-pl1-f194.google.com with SMTP id b5-v6so247032plr.5 for ; Mon, 08 Oct 2018 22:48:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3RJ/t1zGSm3UfjNE8WI2rEcf5JWxo9DPt72JtaWe1nc=; b=OAnb0LOLsek/oBjbd/RvEDOLwPnxFi8khlKDc7dtNbTDodJRo3hJcQ3+RGL0hlVXUS MeT3As4Err6QRj2bqtj2/AxIeyoiykDcUoyFJnxD0IPlsY0Zn3JArlnbHZKIUqgkjwcO DRNZhYjaAiDXac4oXb/whaGEkY6Vlt1BFkxbQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3RJ/t1zGSm3UfjNE8WI2rEcf5JWxo9DPt72JtaWe1nc=; b=b2KvUeY3VGkeVSHNkLiQ8er5ItMUHVTckZZZNTjBatE/xDP/8PyVTJREoFpYnnfnlb XhLmdc/NOPzsLc0wwik8tsreBT6n4ebejxpLRLEut7iUuR2tXwPS+uxIBe9N8w3GwjCM CSGcEyMPoMJTifgVdUbBavRyx7wocuGAZb26je26dQMOnYS/ciisAYI7nAeS0sxRPVx0 Cq68GAIjtW3fc8pIgWoX1SqDWY4iI+30iuqR3XT52oBgf9n1gwQ3HvO6KsNs4KPaH6hN kBDOulhoQLBnB7vRBpV1EYXPxe/FbGZ1PSdbY8Gn3TqsnKGMfnF57vOoG4lQhb4iSERW VIAg== X-Gm-Message-State: ABuFfoihsBmYCODbP0H6qRWDqVA1S96CJhoc9+k7SXvS+64vOKyJhZz2 rfB7Va9L1R4tns+ejs4xIWpI7Q== X-Google-Smtp-Source: ACcGV61hNIYMAw/1MXI+AVlnFVRjyLQUhIq8EqHXyT+gawh5a79FLEuK6O6RcAeZ/xrFtwE5xRCgKw== X-Received: by 2002:a17:902:d715:: with SMTP id w21-v6mr26370555ply.143.1539064090437; Mon, 08 Oct 2018 22:48:10 -0700 (PDT) Received: from joelaf.mtv.corp.google.com ([2620:0:1000:1601:3aef:314f:b9ea:889f]) by smtp.gmail.com with ESMTPSA id a15-v6sm16886234pff.8.2018.10.08.22.48.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Oct 2018 22:48:09 -0700 (PDT) From: "Joel Fernandes (Google)" To: stable@vger.kernel.org Cc: Pierre Yves MORDRET , Vinod Koul , gregkh@linuxfoundation.org, Alexandre Torgue , Dan Williams , dmaengine@vger.kernel.org, "Joel Fernandes (Google)" , linux-arm-kernel@lists.infradead.org (moderated list:ARM/STM32 ARCHITECTURE), linux-kernel@vger.kernel.org, Maxime Coquelin Subject: [PATCH 3/7] dmaengine: stm32-dma: fix typo and reported checkpatch warnings Date: Mon, 8 Oct 2018 22:47:48 -0700 Message-Id: <20181009054752.145978-4-joel@joelfernandes.org> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog In-Reply-To: <20181009054752.145978-1-joel@joelfernandes.org> References: <20181009054752.145978-1-joel@joelfernandes.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pierre Yves MORDRET Fix typo in a comment and solved reported checkpatch warnings. Signed-off-by: Pierre-Yves MORDRET Signed-off-by: Vinod Koul --- drivers/dma/stm32-dma.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/dma/stm32-dma.c b/drivers/dma/stm32-dma.c index fae7de54f00a..b64e14a83dec 100644 --- a/drivers/dma/stm32-dma.c +++ b/drivers/dma/stm32-dma.c @@ -60,7 +60,8 @@ #define STM32_DMA_SCR_PINC BIT(9) /* Peripheral increment mode */ #define STM32_DMA_SCR_CIRC BIT(8) /* Circular mode */ #define STM32_DMA_SCR_PFCTRL BIT(5) /* Peripheral Flow Controller */ -#define STM32_DMA_SCR_TCIE BIT(4) /* Transfer Cplete Int Enable*/ +#define STM32_DMA_SCR_TCIE BIT(4) /* Transfer Complete Int Enable + */ #define STM32_DMA_SCR_TEIE BIT(2) /* Transfer Error Int Enable */ #define STM32_DMA_SCR_DMEIE BIT(1) /* Direct Mode Err Int Enable */ #define STM32_DMA_SCR_EN BIT(0) /* Stream Enable */ @@ -918,7 +919,7 @@ static enum dma_status stm32_dma_tx_status(struct dma_chan *c, u32 residue = 0; status = dma_cookie_status(c, cookie, state); - if ((status == DMA_COMPLETE) || (!state)) + if (status == DMA_COMPLETE || !state) return status; spin_lock_irqsave(&chan->vchan.lock, flags); @@ -982,7 +983,7 @@ static void stm32_dma_desc_free(struct virt_dma_desc *vdesc) } static void stm32_dma_set_config(struct stm32_dma_chan *chan, - struct stm32_dma_cfg *cfg) + struct stm32_dma_cfg *cfg) { stm32_dma_clear_reg(&chan->chan_reg); @@ -1015,8 +1016,8 @@ static struct dma_chan *stm32_dma_of_xlate(struct of_phandle_args *dma_spec, cfg.stream_config = dma_spec->args[2]; cfg.features = dma_spec->args[3]; - if ((cfg.channel_id >= STM32_DMA_MAX_CHANNELS) || - (cfg.request_line >= STM32_DMA_MAX_REQUEST_ID)) { + if (cfg.channel_id >= STM32_DMA_MAX_CHANNELS || + cfg.request_line >= STM32_DMA_MAX_REQUEST_ID) { dev_err(dev, "Bad channel and/or request id\n"); return NULL; } -- 2.19.0.605.g01d371f741-goog From mboxrd@z Thu Jan 1 00:00:00 1970 From: joel@joelfernandes.org (Joel Fernandes (Google)) Date: Mon, 8 Oct 2018 22:47:48 -0700 Subject: [PATCH 3/7] dmaengine: stm32-dma: fix typo and reported checkpatch warnings In-Reply-To: <20181009054752.145978-1-joel@joelfernandes.org> References: <20181009054752.145978-1-joel@joelfernandes.org> Message-ID: <20181009054752.145978-4-joel@joelfernandes.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Pierre Yves MORDRET Fix typo in a comment and solved reported checkpatch warnings. Signed-off-by: Pierre-Yves MORDRET Signed-off-by: Vinod Koul --- drivers/dma/stm32-dma.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/dma/stm32-dma.c b/drivers/dma/stm32-dma.c index fae7de54f00a..b64e14a83dec 100644 --- a/drivers/dma/stm32-dma.c +++ b/drivers/dma/stm32-dma.c @@ -60,7 +60,8 @@ #define STM32_DMA_SCR_PINC BIT(9) /* Peripheral increment mode */ #define STM32_DMA_SCR_CIRC BIT(8) /* Circular mode */ #define STM32_DMA_SCR_PFCTRL BIT(5) /* Peripheral Flow Controller */ -#define STM32_DMA_SCR_TCIE BIT(4) /* Transfer Cplete Int Enable*/ +#define STM32_DMA_SCR_TCIE BIT(4) /* Transfer Complete Int Enable + */ #define STM32_DMA_SCR_TEIE BIT(2) /* Transfer Error Int Enable */ #define STM32_DMA_SCR_DMEIE BIT(1) /* Direct Mode Err Int Enable */ #define STM32_DMA_SCR_EN BIT(0) /* Stream Enable */ @@ -918,7 +919,7 @@ static enum dma_status stm32_dma_tx_status(struct dma_chan *c, u32 residue = 0; status = dma_cookie_status(c, cookie, state); - if ((status == DMA_COMPLETE) || (!state)) + if (status == DMA_COMPLETE || !state) return status; spin_lock_irqsave(&chan->vchan.lock, flags); @@ -982,7 +983,7 @@ static void stm32_dma_desc_free(struct virt_dma_desc *vdesc) } static void stm32_dma_set_config(struct stm32_dma_chan *chan, - struct stm32_dma_cfg *cfg) + struct stm32_dma_cfg *cfg) { stm32_dma_clear_reg(&chan->chan_reg); @@ -1015,8 +1016,8 @@ static struct dma_chan *stm32_dma_of_xlate(struct of_phandle_args *dma_spec, cfg.stream_config = dma_spec->args[2]; cfg.features = dma_spec->args[3]; - if ((cfg.channel_id >= STM32_DMA_MAX_CHANNELS) || - (cfg.request_line >= STM32_DMA_MAX_REQUEST_ID)) { + if (cfg.channel_id >= STM32_DMA_MAX_CHANNELS || + cfg.request_line >= STM32_DMA_MAX_REQUEST_ID) { dev_err(dev, "Bad channel and/or request id\n"); return NULL; } -- 2.19.0.605.g01d371f741-goog