From patchwork Tue May 26 13:25:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 6481081 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D1F359F38C for ; Tue, 26 May 2015 13:33:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0EDAF2042C for ; Tue, 26 May 2015 13:33:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D8A9B203F3 for ; Tue, 26 May 2015 13:33:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754469AbbEZN0t (ORCPT ); Tue, 26 May 2015 09:26:49 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:50979 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754375AbbEZN0l (ORCPT ); Tue, 26 May 2015 09:26:41 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id t4QDQPnG001232; Tue, 26 May 2015 08:26:25 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id t4QDQPZ0030289; Tue, 26 May 2015 08:26:25 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.224.2; Tue, 26 May 2015 08:26:25 -0500 Received: from dflp33.itg.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id t4QDQ9bN027427; Tue, 26 May 2015 08:26:21 -0500 From: Peter Ujfalusi To: , CC: , , , , , , , , , , , Greg Kroah-Hartman Subject: [PATCH 03/13] serial: 8250_dma: Support for deferred probing when requesting DMA channels Date: Tue, 26 May 2015 16:25:58 +0300 Message-ID: <1432646768-12532-4-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1432646768-12532-1-git-send-email-peter.ujfalusi@ti.com> References: <1432646768-12532-1-git-send-email-peter.ujfalusi@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Switch to use ma_request_slave_channel_compat_reason() to request the DMA channels. In case of error, return the error code we received including -EPROBE_DEFER Signed-off-by: Peter Ujfalusi CC: Greg Kroah-Hartman --- drivers/tty/serial/8250/8250_dma.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c index 21d01a491405..a617eca4e97d 100644 --- a/drivers/tty/serial/8250/8250_dma.c +++ b/drivers/tty/serial/8250/8250_dma.c @@ -182,21 +182,19 @@ int serial8250_request_dma(struct uart_8250_port *p) dma_cap_set(DMA_SLAVE, mask); /* Get a channel for RX */ - dma->rxchan = dma_request_slave_channel_compat(mask, - dma->fn, dma->rx_param, - p->port.dev, "rx"); - if (!dma->rxchan) - return -ENODEV; + dma->rxchan = dma_request_slave_channel_compat_reason(mask, dma->fn, + dma->rx_param, p->port.dev, "rx"); + if (IS_ERR(dma->rxchan)) + return PTR_ERR(dma->rxchan); dmaengine_slave_config(dma->rxchan, &dma->rxconf); /* Get a channel for TX */ - dma->txchan = dma_request_slave_channel_compat(mask, - dma->fn, dma->tx_param, - p->port.dev, "tx"); - if (!dma->txchan) { + dma->txchan = dma_request_slave_channel_compat_reason(mask, dma->fn, + dma->tx_param, p->port.dev, "tx"); + if (IS_ERR(dma->txchan)) { dma_release_channel(dma->rxchan); - return -ENODEV; + return PTR_ERR(dma->txchan); } dmaengine_slave_config(dma->txchan, &dma->txconf);