From patchwork Tue Dec 17 10:42:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 181854 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp5559705ile; Tue, 17 Dec 2019 02:42:29 -0800 (PST) X-Google-Smtp-Source: APXvYqwpzrPtKhwIO6Ih/W0yicUb4ldIbJpU+PZgnqiljrLWCMf1np08og1X+quY8DxU5BS4h3d3 X-Received: by 2002:a9d:53cb:: with SMTP id i11mr38026502oth.158.1576579349722; Tue, 17 Dec 2019 02:42:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576579349; cv=none; d=google.com; s=arc-20160816; b=q+259Yqg0dkXSAZt0Wha8THL1nf2PmbwVVt1qulVslj5PAFPptj8v2KmXHL0DR0Vhy x5SVhH4kZQiteGbeClqZjEFC25vahX6sh1FpVCRDKZ9jD/8xiE4WZ7EHGh1bwT3iUHU0 xK3NXcTZ3E2aO0AqIA2g3Fg5vlkzfvmeUbIoGApBSvoqb1JYfjNgs9USW5/YJdqUwdNL hdH/j2+zl6bidNADdL1GGmaw3RkLNs6ccY5mI195gMdp+bdQQUe6kxwNwg+xinb2/nip pyzPudlvu0CBJg5YsAYhGYZCTSU9jB6IJm2codzBWMwdQFQnUtdzR5XAo1UQO7y24ARt kMRw== 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=fDofURBq9Eb9DDOYst82dcthleb8beiEcdL2epzCLQg=; b=MemUqU107l9zVRJPRTB2A0w2Fv+Kf58mZ3qZCzOe4zk5iWXQcNLFC7olqZwizKhTiB 5tfpA/Y1JXp3PH4YoMzSpP2ss8oxlcxLyvF/LVV7GSSIiUi27cqb/7wTLkg+jvDfEydG FkrhvR857SqoZaNaakVty/j4W8lnUYCqZM50INtkRXEIJ3EwnSfWQEnCwy92WSRkT8BM cWGglbKTD8wklws2zJ0e6o7pCIzBCDVVQSnF9qGjz1/c3Cro+Paad3GE4LPAcS4xdQT0 BKWXnCirh4uWY8NfQymcVNzo7PvuisjuBAL7Bd/HDfla1pyiyQiVigeVdm0nuVMKxR9U b1Fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=FBjDPNTi; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-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 d62si12762925oib.144.2019.12.17.02.42.29; Tue, 17 Dec 2019 02:42:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-media-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=FBjDPNTi; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-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 S1726787AbfLQKm2 (ORCPT + 4 others); Tue, 17 Dec 2019 05:42:28 -0500 Received: from lelv0142.ext.ti.com ([198.47.23.249]:49430 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725940AbfLQKm2 (ORCPT ); Tue, 17 Dec 2019 05:42:28 -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 xBHAgN2h079889; Tue, 17 Dec 2019 04:42:23 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1576579343; bh=fDofURBq9Eb9DDOYst82dcthleb8beiEcdL2epzCLQg=; h=From:To:CC:Subject:Date; b=FBjDPNTif+F8tDWkOYsZPsriiNAnieZ69EQRm7zHCgAtcN1dPUrH8dIwdV0RFpOSx DE0JqI7O8iA5MgLBRkq3T8J0dxbg+Z9JilFH8dsJsbNQOTWsFHcHSM50DRRzruz5uv zluHZ6UFzdU9lF2zaS58yc6rnTupVwjEaibf79/Y= Received: from DFLE107.ent.ti.com (dfle107.ent.ti.com [10.64.6.28]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id xBHAgN9g054058 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 17 Dec 2019 04:42:23 -0600 Received: from DFLE101.ent.ti.com (10.64.6.22) by DFLE107.ent.ti.com (10.64.6.28) 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:42:23 -0600 Received: from fllv0039.itg.ti.com (10.64.41.19) 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; Tue, 17 Dec 2019 04:42:22 -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 xBHAgKPU005635; Tue, 17 Dec 2019 04:42:20 -0600 From: Peter Ujfalusi To: , , CC: , , , , Subject: [PATCH] media: xilinx: Use dma_request_chan() instead dma_request_slave_channel() Date: Tue, 17 Dec 2019 12:42:35 +0200 Message-ID: <20191217104235.23771-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-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@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/media/platform/xilinx/xilinx-dma.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/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c index b211380a11f2..9ce515ff9c0a 100644 --- a/drivers/media/platform/xilinx/xilinx-dma.c +++ b/drivers/media/platform/xilinx/xilinx-dma.c @@ -725,10 +725,10 @@ int xvip_dma_init(struct xvip_composite_device *xdev, struct xvip_dma *dma, /* ... and the DMA channel. */ snprintf(name, sizeof(name), "port%u", port); - dma->dma = dma_request_slave_channel(dma->xdev->dev, name); - if (dma->dma == NULL) { + dma->dma = dma_request_chan(dma->xdev->dev, name); + if (IS_ERR(dma->dma)) { dev_err(dma->xdev->dev, "no VDMA channel found\n"); - ret = -ENODEV; + ret = PTR_ERR(dma->dma); goto error; }