aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorPaulius Zaleckas <paulius.zaleckas@teltonika.lt>2008-06-25 08:25:13 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-03 11:39:57 -0400
commitf7def13ed0775ee506c62a8612a124dce1776ac2 (patch)
treeef5dbefc1df0378a10e44971de083d46695ba694 /drivers/spi
parent60a752ef34e23be5e6c91c0734d30447ce15b63b (diff)
[ARM] 5122/1: imx_dma_request_by_prio simpilfication
imx_dma_request_by_prio can return channel number by itself. No need to supply variable address through parameters. Also converted all drivers using this function. Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi_imx.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index c730d05bfeb6..547e30298278 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -1526,24 +1526,24 @@ static int __init spi_imx_probe(struct platform_device *pdev)
1526 drv_data->rx_channel = -1; 1526 drv_data->rx_channel = -1;
1527 if (platform_info->enable_dma) { 1527 if (platform_info->enable_dma) {
1528 /* Get rx DMA channel */ 1528 /* Get rx DMA channel */
1529 status = imx_dma_request_by_prio(&drv_data->rx_channel, 1529 drv_data->rx_channel = imx_dma_request_by_prio("spi_imx_rx",
1530 "spi_imx_rx", DMA_PRIO_HIGH); 1530 DMA_PRIO_HIGH);
1531 if (status < 0) { 1531 if (drv_data->rx_channel < 0) {
1532 dev_err(dev, 1532 dev_err(dev,
1533 "probe - problem (%d) requesting rx channel\n", 1533 "probe - problem (%d) requesting rx channel\n",
1534 status); 1534 drv_data->rx_channel);
1535 goto err_no_rxdma; 1535 goto err_no_rxdma;
1536 } else 1536 } else
1537 imx_dma_setup_handlers(drv_data->rx_channel, NULL, 1537 imx_dma_setup_handlers(drv_data->rx_channel, NULL,
1538 dma_err_handler, drv_data); 1538 dma_err_handler, drv_data);
1539 1539
1540 /* Get tx DMA channel */ 1540 /* Get tx DMA channel */
1541 status = imx_dma_request_by_prio(&drv_data->tx_channel, 1541 drv_data->tx_channel = imx_dma_request_by_prio("spi_imx_tx",
1542 "spi_imx_tx", DMA_PRIO_MEDIUM); 1542 DMA_PRIO_MEDIUM);
1543 if (status < 0) { 1543 if (drv_data->tx_channel < 0) {
1544 dev_err(dev, 1544 dev_err(dev,
1545 "probe - problem (%d) requesting tx channel\n", 1545 "probe - problem (%d) requesting tx channel\n",
1546 status); 1546 drv_data->tx_channel);
1547 imx_dma_free(drv_data->rx_channel); 1547 imx_dma_free(drv_data->rx_channel);
1548 goto err_no_txdma; 1548 goto err_no_txdma;
1549 } else 1549 } else