From patchwork Tue Dec 17 10:46:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 181855 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp5563690ile; Tue, 17 Dec 2019 02:46:25 -0800 (PST) X-Google-Smtp-Source: APXvYqwYe4h/9aMR/k8jeRtqrVPNhbLwnpXAbhlo9vWhRX+NNSi1lz7BPqn/8PMvRwYCfB6DpBCx X-Received: by 2002:a05:6830:15a:: with SMTP id j26mr35485207otp.137.1576579585280; Tue, 17 Dec 2019 02:46:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576579585; cv=none; d=google.com; s=arc-20160816; b=Z1Z118/ZzG9Uto5EkkS9doRuqG80LPoGqhr7ZPZV4g2LCrtsIZeF2ujbm4+NEy9e4H q9A6mS+CY/VfDUrQA6IJmCjE/nzkxvDEX9VPeVU3Zs39DBgOtYSicFPL/FY1Zxbc556K 2crw8HjHWErgfvtmOJGW7y5QAeAkLxTX7wR3lK6o8WzixjBlMbBvNEMuj7F2E1GozzIp ELJyiO7R4sif1P6kHPQtG5EHwaUkcu9b6LEw+FoI9oLL/MwY3CRL1J9YJL/SaVp/iBPQ rNOs0GjUnibKze9qRW5R40LpTS9UZ5GEyyrIMV3C7IwATIkdwBZp9nbBx0FCSkOVjNn2 wwSA== 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=lrWG52vZJWUbatvnVA4RbMRIojZou2X56dG4oPSNdq4=; b=TLDRjG6MnOMyEX47LwRk0AsPrERKxRr1HzS/e4t7DuSNCNoAmSVHWmvZYrOUnYzHqz olXaxUqMoyD55rKifHkZLF3s+WkWL28/7cGG1DvRrpWUTkFFJN2o3T9ZmWLRMFc8N55C mD45qU+ihNuaSESuuosGbLqClYrORnGyjquY3TtOjq7n46WVc2dHCKfW7egPwDP8vOP8 Q0t8+zA7i+EBkU62UhspQpXVkufpw2X29EP7vLdF5V/zs+pVv8JoItF0gg7BnQj6PM8t OnOmHyC4Ab7Y9t7ztNdL61GqLZwZl2IjJJevyXwfQDuYeI31/DBGI02/qZh29wAtX7hn ehPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=svc2K7Ls; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-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 u132si12401916oig.93.2019.12.17.02.46.24; Tue, 17 Dec 2019 02:46:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-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=svc2K7Ls; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-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 S1726275AbfLQKqY (ORCPT + 15 others); Tue, 17 Dec 2019 05:46:24 -0500 Received: from lelv0143.ext.ti.com ([198.47.23.248]:60852 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726784AbfLQKqY (ORCPT ); Tue, 17 Dec 2019 05:46:24 -0500 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id xBHAkH2o116257; Tue, 17 Dec 2019 04:46:17 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1576579577; bh=lrWG52vZJWUbatvnVA4RbMRIojZou2X56dG4oPSNdq4=; h=From:To:CC:Subject:Date; b=svc2K7Ls2jHkrBMO5OIDGFMZV/G6C6mycJe44tRkxAc2wPm2Mo8d5lvvKfx++yMKH N8juaqVcv8RXUeOmcx4e8uep9TJuwn1x/HUawjw3qAQEc1iAA1ejeLcxg3hM2J7hyd kh0JTidg1DCndxyZFUFmZTaNkQZ3sso7NQN0y/hw= Received: from DLEE107.ent.ti.com (dlee107.ent.ti.com [157.170.170.37]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id xBHAkHgL008715 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 17 Dec 2019 04:46:17 -0600 Received: from DLEE100.ent.ti.com (157.170.170.30) 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; Tue, 17 Dec 2019 04:46:16 -0600 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE100.ent.ti.com (157.170.170.30) 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 04:46:16 -0600 Received: from feketebors.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id xBHAkEcg037743; Tue, 17 Dec 2019 04:46:15 -0600 From: Peter Ujfalusi To: , , CC: , , , Subject: [PATCH] slimbus: qcom-ngd-ctrl: Use dma_request_chan() instead dma_request_slave_channel() Date: Tue, 17 Dec 2019 12:46:29 +0200 Message-ID: <20191217104629.24590-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-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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/slimbus/qcom-ngd-ctrl.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index 29fbab55c3b3..e3f5ebc0c05e 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -666,10 +666,12 @@ static int qcom_slim_ngd_init_rx_msgq(struct qcom_slim_ngd_ctrl *ctrl) struct device *dev = ctrl->dev; int ret, size; - ctrl->dma_rx_channel = dma_request_slave_channel(dev, "rx"); - if (!ctrl->dma_rx_channel) { - dev_err(dev, "Failed to request dma channels"); - return -EINVAL; + ctrl->dma_rx_channel = dma_request_chan(dev, "rx"); + if (IS_ERR(ctrl->dma_rx_channel)) { + dev_err(dev, "Failed to request RX dma channel"); + ret = PTR_ERR(ctrl->dma_rx_channel); + ctrl->dma_rx_channel = NULL; + return ret; } size = QCOM_SLIM_NGD_DESC_NUM * SLIM_MSGQ_BUF_LEN; @@ -703,10 +705,12 @@ static int qcom_slim_ngd_init_tx_msgq(struct qcom_slim_ngd_ctrl *ctrl) int ret = 0; int size; - ctrl->dma_tx_channel = dma_request_slave_channel(dev, "tx"); - if (!ctrl->dma_tx_channel) { - dev_err(dev, "Failed to request dma channels"); - return -EINVAL; + ctrl->dma_tx_channel = dma_request_chan(dev, "tx"); + if (IS_ERR(ctrl->dma_tx_channel)) { + dev_err(dev, "Failed to request TX dma channel"); + ret = PTR_ERR(ctrl->dma_tx_channel); + ctrl->dma_tx_channel = NULL; + return ret; } size = ((QCOM_SLIM_NGD_DESC_NUM + 1) * SLIM_MSGQ_BUF_LEN);