From mboxrd@z Thu Jan 1 00:00:00 1970 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=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 E957EC432C0 for ; Thu, 21 Nov 2019 09:15:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C0D8E2071C for ; Thu, 21 Nov 2019 09:15:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="wzjjjIH4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726980AbfKUJPo (ORCPT ); Thu, 21 Nov 2019 04:15:44 -0500 Received: from lelv0142.ext.ti.com ([198.47.23.249]:33664 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726170AbfKUJPo (ORCPT ); Thu, 21 Nov 2019 04:15:44 -0500 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id xAL9Fd2u031365; Thu, 21 Nov 2019 03:15:39 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1574327739; bh=TYVBy6Tk3leIZ8H84OqG00U58URHFHS9xywXu8X9b8Q=; h=Subject:From:To:CC:References:Date:In-Reply-To; b=wzjjjIH4DzNkOcVeaOM5ocrtSxlhFbLsJ04GmNjMtc5PDpoJDP6shfB1mHcMGzCqP C9X7Y3rbcUlhwczy0QAlEecy0aOFk29/Vq7XOPlRx22A1W3Cmc8ib6SY0y2faDkMZy OxLw0s+9prXnaNoxpRQwXlGCXJKZGfxioGUHTx3s= Received: from DLEE113.ent.ti.com (dlee113.ent.ti.com [157.170.170.24]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id xAL9Fd57046209 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 21 Nov 2019 03:15:39 -0600 Received: from DLEE105.ent.ti.com (157.170.170.35) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3; Thu, 21 Nov 2019 03:15:38 -0600 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE105.ent.ti.com (157.170.170.35) 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, 21 Nov 2019 03:15:38 -0600 Received: from [192.168.2.6] (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id xAL9Fabs012510; Thu, 21 Nov 2019 03:15:37 -0600 Subject: Re: [PATCH v2] spi: pic32: Retire dma_request_slave_channel_compat() From: Peter Ujfalusi To: , CC: , , References: <20191121091405.28384-1-peter.ujfalusi@ti.com> Message-ID: <93edc6b2-e85c-140c-ac65-05155007ae06@ti.com> Date: Thu, 21 Nov 2019 11:15:36 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20191121091405.28384-1-peter.ujfalusi@ti.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 8bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 21/11/2019 11.14, Peter Ujfalusi wrote: > There is no reason to use the dma_request_slave_channel_compat() as no > filter function and parameter is provided. > > Switch the driver to use dma_request_chan() instead and add support for > deferred probing against DMA channel. > > Signed-off-by: Peter Ujfalusi > --- > Hi, > > Changes since v1: > - Handle deferred probing against DMA channel request. > > Trying to crack down on the use of dma_request_slave_channel_compat() in the > tree... > > Only compile tested! > > Regards, > Peter > > drivers/spi/spi-pic32.c | 46 +++++++++++++++++++++++++++-------------- > 1 file changed, 30 insertions(+), 16 deletions(-) > > diff --git a/drivers/spi/spi-pic32.c b/drivers/spi/spi-pic32.c > index 69f517ec59c6..bb6a6643bcd3 100644 > --- a/drivers/spi/spi-pic32.c > +++ b/drivers/spi/spi-pic32.c > @@ -606,25 +606,30 @@ static void pic32_spi_cleanup(struct spi_device *spi) > gpio_direction_output(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH)); > } > > -static void pic32_spi_dma_prep(struct pic32_spi *pic32s, struct device *dev) > +static int pic32_spi_dma_prep(struct pic32_spi *pic32s, struct device *dev) > { > struct spi_master *master = pic32s->master; > - dma_cap_mask_t mask; > + int ret = 0; > > - dma_cap_zero(mask); > - dma_cap_set(DMA_SLAVE, mask); > + master->dma_rx = dma_request_chan(dev, "spi-rx"); > + if (IS_ERR(master->dma_rx)) { > + if (PTR_ERR(master->dma_rx) == -EPROBE_DEFER) > + ret = -EPROBE_DEFER; > + else > + dev_warn(dev, "RX channel not found.\n"); > > - master->dma_rx = dma_request_slave_channel_compat(mask, NULL, NULL, > - dev, "spi-rx"); > - if (!master->dma_rx) { > - dev_warn(dev, "RX channel not found.\n"); > + master->dma_rx = NULL; > goto out_err; > } > > - master->dma_tx = dma_request_slave_channel_compat(mask, NULL, NULL, > - dev, "spi-tx"); > - if (!master->dma_tx) { > - dev_warn(dev, "TX channel not found.\n"); > + master->dma_tx = dma_request_chan(dev, "spi-tx"); > + if (IS_ERR(master->dma_tx)) { > + if (PTR_ERR(master->dma_tx) == -EPROBE_DEFER) > + ret = -EPROBE_DEFER; > + else > + dev_warn(dev, "RX channel not found.\n"); Sigh, copy-paste :( s/RX/TX > + > + master->dma_tx = NULL; > goto out_err; > } > > @@ -634,14 +639,20 @@ static void pic32_spi_dma_prep(struct pic32_spi *pic32s, struct device *dev) > /* DMA chnls allocated and prepared */ > set_bit(PIC32F_DMA_PREP, &pic32s->flags); > > - return; > + return 0; > > out_err: > - if (master->dma_rx) > + if (master->dma_rx) { > dma_release_channel(master->dma_rx); > + master->dma_rx = NULL; > + } > > - if (master->dma_tx) > + if (master->dma_tx) { > dma_release_channel(master->dma_tx); > + master->dma_tx = NULL; > + } > + > + return ret; > } > > static void pic32_spi_dma_unprep(struct pic32_spi *pic32s) > @@ -776,7 +787,10 @@ static int pic32_spi_probe(struct platform_device *pdev) > master->unprepare_transfer_hardware = pic32_spi_unprepare_hardware; > > /* optional DMA support */ > - pic32_spi_dma_prep(pic32s, &pdev->dev); > + ret = pic32_spi_dma_prep(pic32s, &pdev->dev); > + if (ret) > + goto err_bailout; > + > if (test_bit(PIC32F_DMA_PREP, &pic32s->flags)) > master->can_dma = pic32_spi_can_dma; > > - Péter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki