From: Russ Gorby <russ.gorby@intel.com>
To: Russ Gorby <russ.gorby@intel.com>,
Greg Kroah-Hartman <gregkh@suse.de>,
linux-kernel@vger.kernel.org
Cc: suhail.ahmed@intel.com
Subject: [PATCH 2/6] serial: ifx6x60: dma_alloc_coherent must use parent dev
Date: Mon, 7 Feb 2011 12:02:28 -0800 [thread overview]
Message-ID: <1297108952-27371-3-git-send-email-russ.gorby@intel.com> (raw)
In-Reply-To: <[PATCH 0/6] IFX6X60 patchset : 02/07/2011>
This driver is a SPI protocol driver and has no DMA ops
associated with the device so the call will fail. Furthermore,
the DMA allocation made here will be used by the SPI
controller driver (parent dev) so it makes sense to
pass that device instead.
Signed-off-by: Russ Gorby <russ.gorby@intel.com>
---
drivers/tty/serial/ifx6x60.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index 972c04d..bb2ff20 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -998,7 +998,7 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
ifx_dev->spi_slave_cts = 0;
/*initialize transfer and dma buffers */
- ifx_dev->tx_buffer = dma_alloc_coherent(&ifx_dev->spi_dev->dev,
+ ifx_dev->tx_buffer = dma_alloc_coherent(ifx_dev->spi_dev->dev.parent,
IFX_SPI_TRANSFER_SIZE,
&ifx_dev->tx_bus,
GFP_KERNEL);
@@ -1007,7 +1007,7 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
ret = -ENOMEM;
goto error_ret;
}
- ifx_dev->rx_buffer = dma_alloc_coherent(&ifx_dev->spi_dev->dev,
+ ifx_dev->rx_buffer = dma_alloc_coherent(ifx_dev->spi_dev->dev.parent,
IFX_SPI_TRANSFER_SIZE,
&ifx_dev->rx_bus,
GFP_KERNEL);
--
1.7.3.4
next prev parent reply other threads:[~2011-02-07 19:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <[PATCH 0/6] IFX6X60 patchset : 02/07/2011>
2011-02-07 20:02 ` [PATCH 0/6] IFX6X60 patchset : 02/07/2011 Russ Gorby
2011-02-07 20:02 ` [PATCH 1/6] serial: ifx6x60: fixed call to tty_port_init Russ Gorby
2011-02-07 20:02 ` Russ Gorby [this message]
2011-02-07 20:02 ` [PATCH 3/6] serial: ifx6x60: changed internal bpw from boolean to int Russ Gorby
2011-02-07 20:02 ` [PATCH 4/6] serial: ifx6x60: set SPI max_speed_hz based on platform type Russ Gorby
2011-02-07 20:02 ` [PATCH 5/6] serial: ifx6x60: probe routine needs to call spi_setup Russ Gorby
2011-02-07 20:02 ` [PATCH 6/6] serial: ifx6x60: minor cleanup Russ Gorby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1297108952-27371-3-git-send-email-russ.gorby@intel.com \
--to=russ.gorby@intel.com \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=suhail.ahmed@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®