| Message ID | 1438598472-1145-1-git-send-email-jarkko.nikula@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f47da2400e8828eda2ed4208fb312031f8b7d2ae |
| Headers | show |
On Mon, Aug 03, 2015 at 01:41:11PM +0300, Jarkko Nikula wrote: > These became unused by the commit 6356437e65c2 > ("spi: spi-pxa2xx: remove legacy PXA DMA bits"). This doesn't apply against current code, please check and resend.
On 08/03/2015 07:14 PM, Mark Brown wrote: > On Mon, Aug 03, 2015 at 01:41:11PM +0300, Jarkko Nikula wrote: >> These became unused by the commit 6356437e65c2 >> ("spi: spi-pxa2xx: remove legacy PXA DMA bits"). > > This doesn't apply against current code, please check and resend. > Hmm... I'm confused, both patches were done on top of commit 34cadd9c1bcb ("spi: pxa2xx: Add support for Intel Sunrisepoint") in spi/topic/pxa2xx and I see this patch 1/2 applied there and merged into for-next now. Anyway, patch 2/2 should still apply fine.
On Tue, Aug 04, 2015 at 08:54:26AM +0300, Jarkko Nikula wrote: > On 08/03/2015 07:14 PM, Mark Brown wrote: > >This doesn't apply against current code, please check and resend. > Hmm... I'm confused, both patches were done on top of commit 34cadd9c1bcb > ("spi: pxa2xx: Add support for Intel Sunrisepoint") in spi/topic/pxa2xx and > I see this patch 1/2 applied there and merged into for-next now. Anyway, > patch 2/2 should still apply fine. It didn't apply when I tried it yesterday.
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 2c9fa409d2bf..e924710e126c 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1475,8 +1475,6 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) } /* Setup DMA if requested */ - drv_data->tx_channel = -1; - drv_data->rx_channel = -1; if (platform_info->enable_dma) { status = pxa2xx_spi_dma_setup(drv_data); if (status) { diff --git a/drivers/spi/spi-pxa2xx.h b/drivers/spi/spi-pxa2xx.h index 9f01e9c9aa75..3b69c46bfbc9 100644 --- a/drivers/spi/spi-pxa2xx.h +++ b/drivers/spi/spi-pxa2xx.h @@ -37,8 +37,6 @@ struct driver_data { struct pxa2xx_spi_master *master_info; /* PXA private DMA setup stuff */ - int rx_channel; - int tx_channel; u32 *null_dma_buf; /* SSP register addresses */
These became unused by the commit 6356437e65c2 ("spi: spi-pxa2xx: remove legacy PXA DMA bits"). Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> --- drivers/spi/spi-pxa2xx.c | 2 -- drivers/spi/spi-pxa2xx.h | 2 -- 2 files changed, 4 deletions(-)