From patchwork Fri Oct 23 09:46:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 11852651 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DC0BC388F9 for ; Fri, 23 Oct 2020 09:47:15 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 186CD2192A for ; Fri, 23 Oct 2020 09:47:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ee1C8h6I"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ti.com header.i=@ti.com header.b="c1tHVgdT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 186CD2192A Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=ti.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=L+TEQ0ZNi5piZHs/voYBuOY7o15KfPx0J+m/trHuOzY=; b=ee1C8h6ItkCrk0b8NnkaI9yHN1 ZiQLFmmUlQbH1lWC83dF0SLZ8bqbODWDXDsaUwLskzmZXq8Fc1v6bFFZ6zTd3dpk7QpWqZY37MMX+ rUtCiWd6p5YG5chEdR6k70YsYBZyk80rMHMxzyYrmUQPUESA0lkNGLr4Cksjv1ledE+okgdrJWitt azGNHH4Y0HQHPgs++IE+Q6NV/Qao2exA/LKyyr6/pc+pmXFCi7PN36U2+SqvE4sk+I+STG6gm7ALo TiykaF9yFPhWw4hhAKRLxiExQMKixpYrMkkCs6KxpLb2/wV/Y+fnQ98OeiJlbkrV9HdlWyTut5URN 5Hl+jLPQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVte3-0006wX-Sa; Fri, 23 Oct 2020 09:45:59 +0000 Received: from fllv0015.ext.ti.com ([198.47.19.141]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVtdz-0006qk-IU for linux-arm-kernel@lists.infradead.org; Fri, 23 Oct 2020 09:45:57 +0000 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 09N9jXjC079273; Fri, 23 Oct 2020 04:45:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1603446333; bh=vd/rQ8Z51OitxruTppvHsOzxNO2Z78PVRSBR/5M5zMk=; h=From:To:CC:Subject:Date; b=c1tHVgdTnRhcXT9gX9bvJRksoPbgIC5b1dTUMDWlbmmg/qfB//8HmH6b8NwPPrRpH +x5fA3AEkbGkdmx8dvKTmHPpcFNzmHxeyIsTRxm1yWru6kvwDMGrsgATH+SnWyU/Jp uMZ9pTiBJMoFAJ6xs7dQbZSc2WStqShwA6q4awN8= 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 09N9jXcw091988 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 23 Oct 2020 04:45:33 -0500 Received: from DLEE104.ent.ti.com (157.170.170.34) 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.1979.3; Fri, 23 Oct 2020 04:45:32 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) 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.1979.3 via Frontend Transport; Fri, 23 Oct 2020 04:45:32 -0500 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 09N9jUfl007401; Fri, 23 Oct 2020 04:45:30 -0500 From: Peter Ujfalusi To: , , , Subject: [PATCH] drm: xlnx: Use dma_request_chan for DMA channel request Date: Fri, 23 Oct 2020 12:46:02 +0300 Message-ID: <20201023094602.5630-1-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.29.0 MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201023_054555_757207_FF60E4C7 X-CRM114-Status: GOOD ( 13.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There is no need to use the of_dma_request_slave_channel() directly as dma_request_chan() is going to try to get the channel via OF as well. Signed-off-by: Peter Ujfalusi Reviewed-by: Sam Ravnborg --- drivers/gpu/drm/xlnx/zynqmp_disp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c index 98bd48f13fd1..a4405d081aca 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -1316,8 +1315,7 @@ static int zynqmp_disp_layer_request_dma(struct zynqmp_disp *disp, snprintf(dma_channel_name, sizeof(dma_channel_name), "%s%u", dma_names[layer->id], i); - dma->chan = of_dma_request_slave_channel(disp->dev->of_node, - dma_channel_name); + dma->chan = dma_request_chan(disp->dev, dma_channel_name); if (IS_ERR(dma->chan)) { dev_err(disp->dev, "failed to request dma channel\n"); ret = PTR_ERR(dma->chan);