Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753365AbbFIKkT (ORCPT ); Tue, 9 Jun 2015 06:40:19 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:49891 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751372AbbFIKkK (ORCPT ); Tue, 9 Jun 2015 06:40:10 -0400 Date: Tue, 9 Jun 2015 11:39:51 +0100 From: Mark Brown To: Eddie Huang Cc: Leilk Liu =?utf-8?B?KOWImOejiik=?= , Mark Rutland , Matthias Brugger , Rob Herring , Pawel Moll , Ian Campbell , Kumar Gala , Catalin Marinas , Will Deacon , HongZhou Yang , Sascha Hauer , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-spi@vger.kernel.org" , "linux-mediatek@lists.infradead.org" , srv_heupstream , Sascha Hauer Message-ID: <20150609103951.GA14071@sirena.org.uk> 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> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="iQbDWBcONlRwAlo5" Content-Disposition: inline In-Reply-To: <1433844321.16178.6.camel@mtksdaap41> X-Cookie: The end of labor is to gain leisure. User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: 94.175.94.161 X-SA-Exim-Mail-From: broonie@sirena.org.uk Subject: Re: [PATCH 2/3] spi: mediatek: Add spi bus for Mediatek MT8173 X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1976 Lines: 53 --iQbDWBcONlRwAlo5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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. --iQbDWBcONlRwAlo5 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJVdsJ2AAoJECTWi3JdVIfQuvcH/2nAjxSuuvyXRnHpTly6A3ZK MnZMpBkuR2KTbdMCyvc/8D8P+DOxZI7Y26L5kBMbcatJxCvXm4Xrk5IXhBQrYlzj cLssiLm4HKiWApcKhXBPGXPqhgcAsh2ryxCu9qlnjau8KDga1UNbsksDh0INN/CN WuF6pUzZop07TLCBnT8/YfC7+MKUsjkrz4pmvhavvIO5Gn1f7UVICc9hGR5nCp3N x29u7GW54a4+oXYSn4mN3qxhhcCGNbwlz/m9xbUWYBRaVdfZ3Z7KMk/lDIhhd7pd aRW9Z5qx2jA/oURYJhRvUGQdF/d5BjXzf+waSGIKW5dJjjlDbArB+sXQrL5mknQ= =HgGY -----END PGP SIGNATURE----- --iQbDWBcONlRwAlo5-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/