diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2020-05-06 17:30:24 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-05-06 19:11:35 +0200 |
| commit | 6370ababce81911576d7c96663ae64fb84820c7b (patch) | |
| tree | 7516b9ba8c9f1db0f25a22ae93052a3c96a45f23 /drivers/spi | |
| parent | spi: dw: Add 'mfld' suffix to Intel Medfield related routines (diff) | |
| download | linux-6370ababce81911576d7c96663ae64fb84820c7b.tar.xz linux-6370ababce81911576d7c96663ae64fb84820c7b.zip | |
spi: dw: Propagate struct device pointer to ->dma_init() callback
In some cases, one of which is coming soon, we would like to have
a struct device pointer to request DMA channel. For this purpose
propagate it to ->dma_init() callback in DMA ops.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200506153025.21441-7-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-dw-mid.c | 2 | ||||
| -rw-r--r-- | drivers/spi/spi-dw.c | 2 | ||||
| -rw-r--r-- | drivers/spi/spi-dw.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-dw-mid.c b/drivers/spi/spi-dw-mid.c index 13b548915c8f..d73aa4ae644d 100644 --- a/drivers/spi/spi-dw-mid.c +++ b/drivers/spi/spi-dw-mid.c @@ -34,7 +34,7 @@ static bool mid_spi_dma_chan_filter(struct dma_chan *chan, void *param) return true; } -static int mid_spi_dma_init_mfld(struct dw_spi *dws) +static int mid_spi_dma_init_mfld(struct device *dev, struct dw_spi *dws) { struct pci_dev *dma_dev; struct dw_dma_slave *tx = dws->dma_tx; diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c index 6e56a64ccc55..b9f651e9ca02 100644 --- a/drivers/spi/spi-dw.c +++ b/drivers/spi/spi-dw.c @@ -506,7 +506,7 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws) spi_hw_init(dev, dws); if (dws->dma_ops && dws->dma_ops->dma_init) { - ret = dws->dma_ops->dma_init(dws); + ret = dws->dma_ops->dma_init(dev, dws); if (ret) { dev_warn(dev, "DMA init failed\n"); dws->dma_inited = 0; diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h index b7e3f0ebba44..642f0be642e5 100644 --- a/drivers/spi/spi-dw.h +++ b/drivers/spi/spi-dw.h @@ -100,7 +100,7 @@ enum dw_ssi_type { struct dw_spi; struct dw_spi_dma_ops { - int (*dma_init)(struct dw_spi *dws); + int (*dma_init)(struct device *dev, struct dw_spi *dws); void (*dma_exit)(struct dw_spi *dws); int (*dma_setup)(struct dw_spi *dws, struct spi_transfer *xfer); bool (*can_dma)(struct spi_controller *master, struct spi_device *spi, |