From patchwork Tue Dec 17 11:29:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 181865 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp5565874och; Tue, 17 Dec 2019 03:29:29 -0800 (PST) X-Google-Smtp-Source: APXvYqwzyON0Se+qjit1Xyu+ELFQLcCzeji0A1whRnRDLtGm+HNU/tAbyjPyJYfblcEKXxgs6VZm X-Received: by 2002:a9d:7495:: with SMTP id t21mr37864155otk.86.1576582168991; Tue, 17 Dec 2019 03:29:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576582168; cv=none; d=google.com; s=arc-20160816; b=tjzg02YWyfIFPcRrNb+a4cPgNyZJ1NOiUxjmb54aljUYJMX3VhkTiO5mLPySlpp1xM Wk5ORn26eISuglK5WeS0zr28weFKuhYXd6ew9YyOZ1r7DDHvJug6rMCHmSfqy1DT/1JW owgujs96XBKOpwauFiGB05eFVbK9d0D/uaKK02Hsj3XvGv/y90hQFt4exnb6E2GXw0nu ghWIaOEC0adk7rgHJiIR6fH9dlDUy1NYSDDom7Gyqh08hcO4aHuy4ZKT/1+1FXKvPIiA gQWtssJZaJZozJqdvn68YWYHz1ecunUL/koH6mcucix3PALC1BkoAcylyMl95lNbulxG ACqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=YMjqbdZ7feS6rSPFo/YDw8Ybu6WZRw8uBRkH3/RHM08=; b=ij5GnInommlo5HF2OA74E+mxDkQh5tJwszt0Dxsm+FP7r+Uwqtzd6BxBYTm96lUaEL KE5AAXUNVN/Cw6L7qxVlhtn/Dv9NrSuC7P7CUjxO1Fzh4Iag36tKEnosADqB9kp80DpG FlDNfc7CGLQCM8PefdtqabTqY2eMTxug+ebbynfSg8jN0ugYE0aHb0snBWQvv5CtzlwV K14UwxeaMOqv3rxwibzs7vo0CUyNUcKDkNCuBSjPkNr+BSXTnbspWi7l2JtN2+7MY8Ip kpqCNDA33yuarx90n7QlzMJtaaRY1nlgVWnTAGbyeEf/h6qxAxJKNU2O/9+kiq9rCJtc WWkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=DiNootKC; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m24si966506otn.67.2019.12.17.03.29.28; Tue, 17 Dec 2019 03:29:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=DiNootKC; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727241AbfLQL32 (ORCPT + 5 others); Tue, 17 Dec 2019 06:29:28 -0500 Received: from fllv0016.ext.ti.com ([198.47.19.142]:51638 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726496AbfLQL32 (ORCPT ); Tue, 17 Dec 2019 06:29:28 -0500 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id xBHBTMbJ034984; Tue, 17 Dec 2019 05:29:22 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1576582162; bh=YMjqbdZ7feS6rSPFo/YDw8Ybu6WZRw8uBRkH3/RHM08=; h=From:To:CC:Subject:Date; b=DiNootKCbH0XSHisoQzvEs/p+jaIWIoGKDMPTkc1Pt7lWdor5D9/7fIFkk+KF6LnF 4abtsPjN4mmFT4i/SJ12YmPB8S9sTIux6hEzfFWEOsaN5Lvqn4b5bo1B31LCKnITup gf7rMBc0sFfiPeat2+AAd3fFJeLrt6CDhFRX0LLY= Received: from DLEE102.ent.ti.com (dlee102.ent.ti.com [157.170.170.32]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id xBHBTMWv020496 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 17 Dec 2019 05:29:22 -0600 Received: from DLEE104.ent.ti.com (157.170.170.34) by DLEE102.ent.ti.com (157.170.170.32) 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:29:21 -0600 Received: from fllv0039.itg.ti.com (10.64.41.19) 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 via Frontend Transport; Tue, 17 Dec 2019 05:29:21 -0600 Received: from feketebors.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id xBHBTIsx087111; Tue, 17 Dec 2019 05:29:19 -0600 From: Peter Ujfalusi To: , CC: , , , , Subject: [PATCH] mmc: owl-mmc: Use dma_request_chan() instead dma_request_slave_channel() Date: Tue, 17 Dec 2019 13:29:34 +0200 Message-ID: <20191217112934.31535-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/owl-mmc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki diff --git a/drivers/mmc/host/owl-mmc.c b/drivers/mmc/host/owl-mmc.c index 771e3d00f1bb..01ffe51f413d 100644 --- a/drivers/mmc/host/owl-mmc.c +++ b/drivers/mmc/host/owl-mmc.c @@ -616,10 +616,10 @@ static int owl_mmc_probe(struct platform_device *pdev) pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; - owl_host->dma = dma_request_slave_channel(&pdev->dev, "mmc"); - if (!owl_host->dma) { + owl_host->dma = dma_request_chan(&pdev->dev, "mmc"); + if (IS_ERR(owl_host->dma)) { dev_err(owl_host->dev, "Failed to get external DMA channel.\n"); - ret = -ENXIO; + ret = PTR_ERR(owl_host->dma); goto err_free_host; }