Skip to content

Commit

Permalink
spi: dw: Propagate struct device pointer to ->dma_init() callback
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andy Shevchenko authored and Mark Brown committed May 6, 2020
1 parent 37aa8aa commit 6370aba
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/spi/spi-dw-mid.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/spi/spi-dw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/spi/spi-dw.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 6370aba

Please sign in to comment.