From mboxrd@z Thu Jan 1 00:00:00 1970 From: broonie@kernel.org (Mark Brown) Date: Tue, 9 Jun 2015 11:39:51 +0100 Subject: [PATCH 2/3] spi: mediatek: Add spi bus for Mediatek MT8173 In-Reply-To: <1433844321.16178.6.camel@mtksdaap41> References: <1431075343-7887-1-git-send-email-leilk.liu@mediatek.com> <1431075343-7887-3-git-send-email-leilk.liu@mediatek.com> <20150508175306.GG2761@sirena.org.uk> <1431434356.2128.9.camel@mhfsdcap03> <20150512160540.GB3066@sirena.org.uk> <1431675522.2128.13.camel@mhfsdcap03> <20150515092543.GY2761@sirena.org.uk> <1433758546.19786.16.camel@mtksdaap41> <20150608175927.GO14071@sirena.org.uk> <1433844321.16178.6.camel@mtksdaap41> Message-ID: <20150609103951.GA14071@sirena.org.uk> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Jun 09, 2015 at 06:05:21PM +0800, Eddie Huang wrote: > --- a/drivers/spi/spi.c > +++ b/drivers/spi/spi.c > @@ -539,8 +539,8 @@ static int __spi_map_msg(struct spi_master *master, > struct spi_message *msg) > if (!master->can_dma) > return 0; > - tx_dev = master->dma_tx->device->dev; > - rx_dev = master->dma_rx->device->dev; > + tx_dev = master->dma_tx ? master->dma_tx->device->dev : > master->dev; > + rx_dev = master->dma_rx ? master->dma_rx->device->dev : master- > Is this what you want ? Actually, I don't like first one at all. Not quite what I'd been thinking of - we can't just pick the device in the core safely, the device might be a MFD or have some other restriction that needs us to use a separate struct device. However most of those cases are likely to point towards implementing a dmaengine device so probably the above will work for most cases and is fine. Can you send a proper patch please? Please don't use the ternery operator, though. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 473 bytes Desc: Digital signature URL: