From patchwork Tue Dec 17 11:26:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 11297317 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8FD9C17F0 for ; Tue, 17 Dec 2019 11:26:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6DF5B207FF for ; Tue, 17 Dec 2019 11:26:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="YQBtTtAV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726496AbfLQL0V (ORCPT ); Tue, 17 Dec 2019 06:26:21 -0500 Received: from lelv0142.ext.ti.com ([198.47.23.249]:53846 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726487AbfLQL0V (ORCPT ); Tue, 17 Dec 2019 06:26:21 -0500 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id xBHBQEun095573; Tue, 17 Dec 2019 05:26:14 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1576581974; bh=TV6DPLpiJbdeCxYibVSSrCGCWxCe2/84Mhd8qwzutDw=; h=From:To:CC:Subject:Date; b=YQBtTtAVRR7QsrrvHWEnGNlid+N7hKrIwIlzQ4jtbHJJ9uNkNRAhid95vox+hbJ7q 541itjtDyGJof2KMxfZn+ciYPbyNvYYp/O9TF6kaOBQfScxrTPHyg01YyWI7yx2rBh 463MlG662TkPRIfqWvQWSrUfC+d8e3aZW4EhXwuk= Received: from DLEE104.ent.ti.com (dlee104.ent.ti.com [157.170.170.34]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id xBHBQEXp115620 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 17 Dec 2019 05:26:14 -0600 Received: from DLEE107.ent.ti.com (157.170.170.37) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3; Tue, 17 Dec 2019 05:26:12 -0600 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE107.ent.ti.com (157.170.170.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3 via Frontend Transport; Tue, 17 Dec 2019 05:26:12 -0600 Received: from feketebors.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id xBHBQ9Qm086054; Tue, 17 Dec 2019 05:26:10 -0600 From: Peter Ujfalusi To: , , , , CC: , , , , , Subject: [PATCH] mmc: bcm2835: Use dma_request_chan() instead dma_request_slave_channel() Date: Tue, 17 Dec 2019 13:26:25 +0200 Message-ID: <20191217112625.30715-1-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org dma_request_slave_channel() is a wrapper on top of dma_request_chan() eating up the error code. By using dma_request_chan() directly the driver can support deferred probing against DMA. Signed-off-by: Peter Ujfalusi --- drivers/mmc/host/bcm2835.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c index 99f61fd2a658..3821f159d36d 100644 --- a/drivers/mmc/host/bcm2835.c +++ b/drivers/mmc/host/bcm2835.c @@ -1393,7 +1393,15 @@ static int bcm2835_probe(struct platform_device *pdev) host->dma_chan = NULL; host->dma_desc = NULL; - host->dma_chan_rxtx = dma_request_slave_channel(dev, "rx-tx"); + host->dma_chan_rxtx = dma_request_chan(dev, "rx-tx"); + if (IS_ERR(host->dma_chan_rxtx)) { + if (PTR_ERR(host->dma_chan_rxtx) == -EPROBE_DEFER) + return -EPROBE_DEFER; + + /* Ignore errors to fall back to PIO mode */ + host->dma_chan_rxtx = NULL; + } + clk = devm_clk_get(dev, NULL); if (IS_ERR(clk)) {