From: Amelie Delaunay <amelie.delaunay@st.com> To: Vinod Koul <vkoul@kernel.org>, Dan Williams <dan.j.williams@intel.com>, Maxime Coquelin <mcoquelin.stm32@gmail.com>, Alexandre Torgue <alexandre.torgue@st.com> Cc: <dmaengine@vger.kernel.org>, <linux-stm32@st-md-mailman.stormreply.com>, <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org>, Amelie Delaunay <amelie.delaunay@st.com>, Pierre-Yves MORDRET <pierre-yves.mordret@st.com> Subject: [PATCH 2/6] dmaengine: stm32-mdma: use reset controller only at probe time Date: Mon, 27 Jan 2020 09:53:30 +0100 [thread overview] Message-ID: <20200127085334.13163-3-amelie.delaunay@st.com> (raw) In-Reply-To: <20200127085334.13163-1-amelie.delaunay@st.com> From: Etienne Carriere <etienne.carriere@st.com> Remove reset controller reference from device instance since it is used only at probe time. Signed-off-by: Etienne Carriere <etienne.carriere@st.com> Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com> --- drivers/dma/stm32-mdma.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c index 2898411941d5..a0fb80dfb2e9 100644 --- a/drivers/dma/stm32-mdma.c +++ b/drivers/dma/stm32-mdma.c @@ -273,7 +273,6 @@ struct stm32_mdma_device { void __iomem *base; struct clk *clk; int irq; - struct reset_control *rst; u32 nr_channels; u32 nr_requests; u32 nr_ahb_addr_masks; @@ -1532,6 +1531,7 @@ static int stm32_mdma_probe(struct platform_device *pdev) struct dma_device *dd; struct device_node *of_node; struct resource *res; + struct reset_control *rst; u32 nr_channels, nr_requests; int i, count, ret; @@ -1590,11 +1590,11 @@ static int stm32_mdma_probe(struct platform_device *pdev) return ret; } - dmadev->rst = devm_reset_control_get(&pdev->dev, NULL); - if (!IS_ERR(dmadev->rst)) { - reset_control_assert(dmadev->rst); + rst = devm_reset_control_get(&pdev->dev, NULL); + if (!IS_ERR(rst)) { + reset_control_assert(rst); udelay(2); - reset_control_deassert(dmadev->rst); + reset_control_deassert(rst); } dd = &dmadev->ddev; -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Amelie Delaunay <amelie.delaunay@st.com> To: Vinod Koul <vkoul@kernel.org>, Dan Williams <dan.j.williams@intel.com>, Maxime Coquelin <mcoquelin.stm32@gmail.com>, Alexandre Torgue <alexandre.torgue@st.com> Cc: Amelie Delaunay <amelie.delaunay@st.com>, linux-kernel@vger.kernel.org, Pierre-Yves MORDRET <pierre-yves.mordret@st.com>, dmaengine@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/6] dmaengine: stm32-mdma: use reset controller only at probe time Date: Mon, 27 Jan 2020 09:53:30 +0100 [thread overview] Message-ID: <20200127085334.13163-3-amelie.delaunay@st.com> (raw) In-Reply-To: <20200127085334.13163-1-amelie.delaunay@st.com> From: Etienne Carriere <etienne.carriere@st.com> Remove reset controller reference from device instance since it is used only at probe time. Signed-off-by: Etienne Carriere <etienne.carriere@st.com> Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com> --- drivers/dma/stm32-mdma.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c index 2898411941d5..a0fb80dfb2e9 100644 --- a/drivers/dma/stm32-mdma.c +++ b/drivers/dma/stm32-mdma.c @@ -273,7 +273,6 @@ struct stm32_mdma_device { void __iomem *base; struct clk *clk; int irq; - struct reset_control *rst; u32 nr_channels; u32 nr_requests; u32 nr_ahb_addr_masks; @@ -1532,6 +1531,7 @@ static int stm32_mdma_probe(struct platform_device *pdev) struct dma_device *dd; struct device_node *of_node; struct resource *res; + struct reset_control *rst; u32 nr_channels, nr_requests; int i, count, ret; @@ -1590,11 +1590,11 @@ static int stm32_mdma_probe(struct platform_device *pdev) return ret; } - dmadev->rst = devm_reset_control_get(&pdev->dev, NULL); - if (!IS_ERR(dmadev->rst)) { - reset_control_assert(dmadev->rst); + rst = devm_reset_control_get(&pdev->dev, NULL); + if (!IS_ERR(rst)) { + reset_control_assert(rst); udelay(2); - reset_control_deassert(dmadev->rst); + reset_control_deassert(rst); } dd = &dmadev->ddev; -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-01-27 8:54 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-27 8:53 [PATCH 0/6] STM32 MDMA driver fixes and improvements Amelie Delaunay 2020-01-27 8:53 ` Amelie Delaunay 2020-01-27 8:53 ` [PATCH 1/6] dmaengine: stm32-mdma: add suspend/resume power management support Amelie Delaunay 2020-01-27 8:53 ` Amelie Delaunay 2020-01-27 8:53 ` Amelie Delaunay [this message] 2020-01-27 8:53 ` [PATCH 2/6] dmaengine: stm32-mdma: use reset controller only at probe time Amelie Delaunay 2020-01-27 8:53 ` [PATCH 3/6] dmaengine: stm32-mdma: disable clock in case of error during probe Amelie Delaunay 2020-01-27 8:53 ` Amelie Delaunay 2020-01-27 8:53 ` [PATCH 4/6] dmaengine: stm32-mdma: driver defers probe for clock and reset Amelie Delaunay 2020-01-27 8:53 ` Amelie Delaunay 2020-01-27 8:53 ` [PATCH 5/6] dmaengine: stm32-mdma: enable descriptor_reuse Amelie Delaunay 2020-01-27 8:53 ` Amelie Delaunay 2020-01-27 8:53 ` [PATCH 6/6] dmaengine: stm32-mdma: use vchan_terminate_vdesc() in .terminate_all Amelie Delaunay 2020-01-27 8:53 ` Amelie Delaunay 2020-02-24 16:50 ` [PATCH 0/6] STM32 MDMA driver fixes and improvements Vinod Koul 2020-02-24 16:50 ` Vinod Koul
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200127085334.13163-3-amelie.delaunay@st.com \ --to=amelie.delaunay@st.com \ --cc=alexandre.torgue@st.com \ --cc=dan.j.williams@intel.com \ --cc=dmaengine@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-stm32@st-md-mailman.stormreply.com \ --cc=mcoquelin.stm32@gmail.com \ --cc=pierre-yves.mordret@st.com \ --cc=vkoul@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.