diff mbox

[1/2] ASoC: Intel: Remove support for Intel MID DMA from firmware loader

Message ID 1426666040-1727-1-git-send-email-jarkko.nikula@linux.intel.com (mailing list archive)
State Accepted
Commit 06ac0cd1c4e4e51fa84f866ef69b518488ffa05f
Headers show

Commit Message

Jarkko Nikula March 18, 2015, 8:07 a.m. UTC
Intel MID DMA driver is going to be removed by the coming commit
36111da7838e ("dmaengine: intel-mid-dma: remove the driver") in spi.git
tree. Since there are no users for SST_DMA_TYPE_MID type the support for it
can be removed from here in advance.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
 sound/soc/intel/sst-dsp.h      | 1 -
 sound/soc/intel/sst-firmware.c | 3 ---
 2 files changed, 4 deletions(-)

Comments

Mark Brown March 18, 2015, 11:43 a.m. UTC | #1
On Wed, Mar 18, 2015 at 10:07:19AM +0200, Jarkko Nikula wrote:
> Intel MID DMA driver is going to be removed by the coming commit
> 36111da7838e ("dmaengine: intel-mid-dma: remove the driver") in spi.git
> tree. Since there are no users for SST_DMA_TYPE_MID type the support for it
> can be removed from here in advance.

So "only user" wasn't exactly true there then...
Andy Shevchenko March 18, 2015, 11:54 a.m. UTC | #2
On Wed, 2015-03-18 at 11:43 +0000, Mark Brown wrote:
> On Wed, Mar 18, 2015 at 10:07:19AM +0200, Jarkko Nikula wrote:
> > Intel MID DMA driver is going to be removed by the coming commit
> > 36111da7838e ("dmaengine: intel-mid-dma: remove the driver") in spi.git
> > tree. Since there are no users for SST_DMA_TYPE_MID type the support for it
> > can be removed from here in advance.
> 
> So "only user" wasn't exactly true there then...

SST has support of both intel_mid_dma and dw_dmac for a while, but SPI
DW hasn't. That's why the only user.
Mark Brown March 18, 2015, 1:59 p.m. UTC | #3
On Wed, Mar 18, 2015 at 01:54:00PM +0200, Andy Shevchenko wrote:
> On Wed, 2015-03-18 at 11:43 +0000, Mark Brown wrote:
> > On Wed, Mar 18, 2015 at 10:07:19AM +0200, Jarkko Nikula wrote:

> > > Intel MID DMA driver is going to be removed by the coming commit
> > > 36111da7838e ("dmaengine: intel-mid-dma: remove the driver") in spi.git
> > > tree. Since there are no users for SST_DMA_TYPE_MID type the support for it
> > > can be removed from here in advance.

> > So "only user" wasn't exactly true there then...

> SST has support of both intel_mid_dma and dw_dmac for a while, but SPI
> DW hasn't. That's why the only user.

OK, so that's "only thing that relies on it" or something rather than
only user - only user suggests there's no need to worry about cleanup of
dependencies and users elsewhere.
Andy Shevchenko March 18, 2015, 2:10 p.m. UTC | #4
On Wed, 2015-03-18 at 13:59 +0000, Mark Brown wrote:
> On Wed, Mar 18, 2015 at 01:54:00PM +0200, Andy Shevchenko wrote:
> > On Wed, 2015-03-18 at 11:43 +0000, Mark Brown wrote:
> > > On Wed, Mar 18, 2015 at 10:07:19AM +0200, Jarkko Nikula wrote:
> 
> > > > Intel MID DMA driver is going to be removed by the coming commit
> > > > 36111da7838e ("dmaengine: intel-mid-dma: remove the driver") in spi.git
> > > > tree. Since there are no users for SST_DMA_TYPE_MID type the support for it
> > > > can be removed from here in advance.
> 
> > > So "only user" wasn't exactly true there then...
> 
> > SST has support of both intel_mid_dma and dw_dmac for a while, but SPI
> > DW hasn't. That's why the only user.
> 
> OK, so that's "only thing that relies on it" or something rather than
> only user - only user suggests there's no need to worry about cleanup of
> dependencies and users elsewhere.

Noted, that's right. Thanks.
diff mbox

Patch

diff --git a/sound/soc/intel/sst-dsp.h b/sound/soc/intel/sst-dsp.h
index f291e32f0077..3412474083ff 100644
--- a/sound/soc/intel/sst-dsp.h
+++ b/sound/soc/intel/sst-dsp.h
@@ -28,7 +28,6 @@ 
 
 /* Supported SST DMA Devices */
 #define SST_DMA_TYPE_DW		1
-#define SST_DMA_TYPE_MID	2
 
 /* autosuspend delay 5s*/
 #define SST_RUNTIME_SUSPEND_DELAY	(5 * 1000)
diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c
index 5e5800897da2..38881f1fb990 100644
--- a/sound/soc/intel/sst-firmware.c
+++ b/sound/soc/intel/sst-firmware.c
@@ -277,9 +277,6 @@  int sst_dma_new(struct sst_dsp *sst)
 	case SST_DMA_TYPE_DW:
 		dma_dev_name = "dw_dmac";
 		break;
-	case SST_DMA_TYPE_MID:
-		dma_dev_name = "Intel MID DMA";
-		break;
 	default:
 		dev_err(sst->dev, "error: invalid DMA engine %d\n",
 			sst->pdata->dma_engine);