From patchwork Thu Dec 12 13:55:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 181490 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp802629och; Thu, 12 Dec 2019 05:56:26 -0800 (PST) X-Google-Smtp-Source: APXvYqxBpn198KK0qCy6GDwVy1qYA0hX1H4k04QlPT+qts5/vyl38tFmUS8lNeqdSLjz86tnA0Mu X-Received: by 2002:a9d:554f:: with SMTP id h15mr8623674oti.338.1576158986327; Thu, 12 Dec 2019 05:56:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576158986; cv=none; d=google.com; s=arc-20160816; b=DvZ7xfBPSXxPyAZNHtHTIHdWJXbSMXMI0pkgzd/vHV3hgh79BvBtjnTDOOnd5+f+pK lZ9sB4jDuch/CynlnjyM1UChB2Q/JWK4inzZLbni5xz8JLmBxwDV4qqOVeFPCHbQ8YUy BDyWILnTDPPURC4YbBrDe85orHHNIl5k7agJF5f7dn4v7EPQ+c3QNxf3j+z0GaiIBWxZ rozM+F+tbWNUWVoSsamUJ3v1Dy3Ydy/4L5bAc0sbE0jhKqnUd3zuU4IelsGrNi+/mW5N KMmly3bJKX0NYs6YC5V3/ePeGZ77+2d+9hc9w+oWXmE5xoDRH1Rth2sJwP4GRRPwRzJD kcgQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=N84nicFtZRDOC4if/LtlJxXAd3jsAQdvY5Hn/7Nnaa8=; b=o8p1ODwcspKuV5XisFtoCzag8bredNIiXaM7TkdYKnV+vdtGU1yIkjY+H3AX/s32Ix GaWBcs3LQMWxRMhSXrHWwTNFBWGVq7vHZbSK3JccqfS6wdgi5qwddQTXsb+9vlIWJicE JvwEjXdyV/TAf2IIN+ub2B/K8O9FG92/r5YA0NrCDTSzGc6Pqtyae9VZkAY9AGIUJOQK Muxmscfr12530kdQqOBZzmnQvbNXHwlCWOi0j6AxpJWlUW5C7Zy1vp50/p61QobznZJy cCnVNp5SXpqByO0Ijktem2GKtI4m7fFFqNZL8YXxE4loFAdNPUbWBV8IEZO0n+kUzjnN 1Bew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=UAjuQ6Dk; spf=pass (google.com: best guess record for domain of linux-spi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-spi-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 o206si873701oih.143.2019.12.12.05.56.26; Thu, 12 Dec 2019 05:56:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-spi-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=UAjuQ6Dk; spf=pass (google.com: best guess record for domain of linux-spi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-spi-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 S1729627AbfLLN4Z (ORCPT + 2 others); Thu, 12 Dec 2019 08:56:25 -0500 Received: from fllv0015.ext.ti.com ([198.47.19.141]:49790 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729619AbfLLN4Y (ORCPT ); Thu, 12 Dec 2019 08:56:24 -0500 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id xBCDuBoE122342; Thu, 12 Dec 2019 07:56:11 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1576158971; bh=N84nicFtZRDOC4if/LtlJxXAd3jsAQdvY5Hn/7Nnaa8=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=UAjuQ6DkrcsHCfp0NM1sS9F1OhDfnnaDg9e5p07XmCXAQM3kXTIxymohXQYJ5TlsE 3zpH8/VlKyo8rzPxoP5I/FzqBMMt73l1SSOsBZnoeX2kp9oqjYu9u41HcDK055OUSA sywEIQE37EumheCoSUdZ4Xnv5oPE6nstjs5CtIZQ= Received: from DFLE100.ent.ti.com (dfle100.ent.ti.com [10.64.6.21]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTP id xBCDuBR9117127; Thu, 12 Dec 2019 07:56:11 -0600 Received: from DFLE101.ent.ti.com (10.64.6.22) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3; Thu, 12 Dec 2019 07:56:11 -0600 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE101.ent.ti.com (10.64.6.22) 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; Thu, 12 Dec 2019 07:56:11 -0600 Received: from feketebors.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id xBCDtdqX048444; Thu, 12 Dec 2019 07:56:07 -0600 From: Peter Ujfalusi To: , , , , , , , , , CC: , , , , , Subject: [PATCH 7/9] spi: spi-fsl-dspi: Use dma_request_chan() instead dma_request_slave_channel() Date: Thu, 12 Dec 2019 15:55:48 +0200 Message-ID: <20191212135550.4634-8-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191212135550.4634-1-peter.ujfalusi@ti.com> References: <20191212135550.4634-1-peter.ujfalusi@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@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/spi/spi-fsl-dspi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 442cff71a0d2..52ccd8397c35 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -395,17 +395,17 @@ static int dspi_request_dma(struct fsl_dspi *dspi, phys_addr_t phy_addr) if (!dma) return -ENOMEM; - dma->chan_rx = dma_request_slave_channel(dev, "rx"); - if (!dma->chan_rx) { + dma->chan_rx = dma_request_chan(dev, "rx"); + if (IS_ERR(dma->chan_rx)) { dev_err(dev, "rx dma channel not available\n"); - ret = -ENODEV; + ret = PTR_ERR(dma->chan_rx); return ret; } - dma->chan_tx = dma_request_slave_channel(dev, "tx"); - if (!dma->chan_tx) { + dma->chan_tx = dma_request_chan(dev, "tx"); + if (IS_ERR(dma->chan_tx)) { dev_err(dev, "tx dma channel not available\n"); - ret = -ENODEV; + ret = PTR_ERR(dma->chan_tx); goto err_tx_channel; }