| Message ID | 1528729173-28684-5-git-send-email-yibin.gong@nxp.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Mon, Jun 11, 2018 at 10:59:31PM +0800, Robin Gong wrote: > No need anymore for 'lock' now since virtual dma will provide > the common lock instead. This can be merged into the last patch, maybe rephrasing the commit message from "revert..." to what is being done. To me "revert" sounds like the commit was wrong, but it wasn't at that time. Sascha > > Signed-off-by: Robin Gong <yibin.gong@nxp.com> > --- > drivers/dma/imx-sdma.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c > index e0af8ee..f150b38 100644 > --- a/drivers/dma/imx-sdma.c > +++ b/drivers/dma/imx-sdma.c > @@ -349,7 +349,6 @@ struct sdma_channel { > unsigned long event_mask[2]; > unsigned long watermark_level; > u32 shp_addr, per_addr; > - spinlock_t lock; > enum dma_status status; > struct imx_dma_data data; > }; > @@ -1907,7 +1906,6 @@ static int sdma_probe(struct platform_device *pdev) > struct sdma_channel *sdmac = &sdma->channel[i]; > > sdmac->sdma = sdma; > - spin_lock_init(&sdmac->lock); > > sdmac->channel = i; > sdmac->vc.desc_free = sdma_desc_free; > -- > 2.7.4 > >
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index e0af8ee..f150b38 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -349,7 +349,6 @@ struct sdma_channel { unsigned long event_mask[2]; unsigned long watermark_level; u32 shp_addr, per_addr; - spinlock_t lock; enum dma_status status; struct imx_dma_data data; }; @@ -1907,7 +1906,6 @@ static int sdma_probe(struct platform_device *pdev) struct sdma_channel *sdmac = &sdma->channel[i]; sdmac->sdma = sdma; - spin_lock_init(&sdmac->lock); sdmac->channel = i; sdmac->vc.desc_free = sdma_desc_free;
No need anymore for 'lock' now since virtual dma will provide the common lock instead. Signed-off-by: Robin Gong <yibin.gong@nxp.com> --- drivers/dma/imx-sdma.c | 2 -- 1 file changed, 2 deletions(-)