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=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 C121DC33C9E for ; Thu, 30 Jan 2020 04:41:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B3B42083E for ; Thu, 30 Jan 2020 04:41:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RFpPF5Dz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727224AbgA3ElY (ORCPT ); Wed, 29 Jan 2020 23:41:24 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:33141 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727266AbgA3ElW (ORCPT ); Wed, 29 Jan 2020 23:41:22 -0500 Received: by mail-wr1-f66.google.com with SMTP id b6so2387072wrq.0; Wed, 29 Jan 2020 20:41:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iIeXeqWybCn0khYUW1LlWp0vQo+B3g3sVK/buP+mLKA=; b=RFpPF5DznAHSJp0561klkZyHiO200bT45AZmhrdwzE1VLCdjlgH/EsQspqMOQoD+DU Splyj7r2JJUnkrsPkw/+NqXnUH/6fdLwE9W55OSE8qZdcdaVDwawRQwT9PST/z2+ky0A XO5oKCA4+UrgX1lw8upBP1wPe70QeGDmmGMrNs+9lP753Acz85Q2sCFc7NbURU2C+KHw o8t2vxWwV3Vt8BspbwMcLc+8SM4H2pVytD5z/wC1n8jlYbMuzc1GfNI+YlfKFXugWsjN rzU+fgOyVYJrHh7C+LxCrsqO46SvOSkiMQdFsanoqMSFYVIRWJbPFnqEK+wDAxLq+3bC 41SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iIeXeqWybCn0khYUW1LlWp0vQo+B3g3sVK/buP+mLKA=; b=gdM/cKd94Nd0qQmrgBVi23YNM5e0bq2ENlgraOJTmcALc/5F3/SliWCCMaGNfe+x2K s1hnBb3HX8T1O52uzF8yoYX5FodmKRDndl0tRjEljZP1FBiFJUp7345qF4YtoO2ek/a9 phAYW/38Ng8H5JpGzsBUmC955Ehbjk+uaLuLpHVNye6evPt8GRXBm0kY8iauz92uRbmn zjUUjRe2eUVTfSSbduD3H46pZW+qWSYLIgJMBbKiDZKOEuqWuWtmG5etE+Y3Z/ePuZax 0gQ3brbwxkPZyLkd/C5H9+xzBhiPYXuQY0vmVYfrV/doPuLlM54+cLizyEugzaqstyQT R+lQ== X-Gm-Message-State: APjAAAXO1cTqkuSqhim6Ut2t2qZog2rqXi3UMxoDgHB7l5W9jEJ/zMyx wI5UgXYVF04ik4a4Hmbi0kk= X-Google-Smtp-Source: APXvYqwQAzv7EiQmNzDsJmkuKtaqk+hMKr6pXBYU2ceXZiFnq/UpTS5BIjVXKX9WSul6pMk4lvusKw== X-Received: by 2002:a5d:6144:: with SMTP id y4mr2666945wrt.367.1580359279429; Wed, 29 Jan 2020 20:41:19 -0800 (PST) Received: from localhost.localdomain (79-139-233-37.dynamic.spd-mgts.ru. [79.139.233.37]) by smtp.gmail.com with ESMTPSA id g128sm4494672wme.47.2020.01.29.20.41.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2020 20:41:19 -0800 (PST) From: Dmitry Osipenko To: Laxman Dewangan , Vinod Koul , Dan Williams , Thierry Reding , Jonathan Hunter , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Cc: dmaengine@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 07/16] dmaengine: tegra-apb: Use devm_request_irq Date: Thu, 30 Jan 2020 07:37:55 +0300 Message-Id: <20200130043804.32243-8-digetx@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20200130043804.32243-1-digetx@gmail.com> References: <20200130043804.32243-1-digetx@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Use resource-managed variant of request_irq for brevity. Acked-by: Jon Hunter Signed-off-by: Dmitry Osipenko --- drivers/dma/tegra20-apb-dma.c | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c index f44291207928..dff21e80ffa4 100644 --- a/drivers/dma/tegra20-apb-dma.c +++ b/drivers/dma/tegra20-apb-dma.c @@ -182,7 +182,6 @@ struct tegra_dma_channel { char name[12]; bool config_init; int id; - int irq; void __iomem *chan_addr; spinlock_t lock; bool busy; @@ -1380,7 +1379,6 @@ static const struct tegra_dma_chip_data tegra148_dma_chip_data = { static int tegra_dma_probe(struct platform_device *pdev) { - struct resource *res; struct tegra_dma *tdma; int ret; int i; @@ -1446,25 +1444,27 @@ static int tegra_dma_probe(struct platform_device *pdev) INIT_LIST_HEAD(&tdma->dma_dev.channels); for (i = 0; i < cdata->nr_channels; i++) { struct tegra_dma_channel *tdc = &tdma->channels[i]; + int irq; tdc->chan_addr = tdma->base_addr + TEGRA_APBDMA_CHANNEL_BASE_ADD_OFFSET + (i * cdata->channel_reg_size); - res = platform_get_resource(pdev, IORESOURCE_IRQ, i); - if (!res) { - ret = -EINVAL; + irq = platform_get_irq(pdev, i); + if (irq < 0) { + ret = irq; dev_err(&pdev->dev, "No irq resource for chan %d\n", i); - goto err_irq; + goto err_pm_disable; } - tdc->irq = res->start; + snprintf(tdc->name, sizeof(tdc->name), "apbdma.%d", i); - ret = request_irq(tdc->irq, tegra_dma_isr, 0, tdc->name, tdc); + ret = devm_request_irq(&pdev->dev, irq, tegra_dma_isr, 0, + tdc->name, tdc); if (ret) { dev_err(&pdev->dev, "request_irq failed with err %d channel %d\n", ret, i); - goto err_irq; + goto err_pm_disable; } tdc->dma_chan.device = &tdma->dma_dev; @@ -1517,7 +1517,7 @@ static int tegra_dma_probe(struct platform_device *pdev) if (ret < 0) { dev_err(&pdev->dev, "Tegra20 APB DMA driver registration failed %d\n", ret); - goto err_irq; + goto err_pm_disable; } ret = of_dma_controller_register(pdev->dev.of_node, @@ -1534,13 +1534,7 @@ static int tegra_dma_probe(struct platform_device *pdev) err_unregister_dma_dev: dma_async_device_unregister(&tdma->dma_dev); -err_irq: - while (--i >= 0) { - struct tegra_dma_channel *tdc = &tdma->channels[i]; - - free_irq(tdc->irq, tdc); - } - +err_pm_disable: pm_runtime_disable(&pdev->dev); if (!pm_runtime_status_suspended(&pdev->dev)) tegra_dma_runtime_suspend(&pdev->dev); @@ -1550,16 +1544,9 @@ static int tegra_dma_probe(struct platform_device *pdev) static int tegra_dma_remove(struct platform_device *pdev) { struct tegra_dma *tdma = platform_get_drvdata(pdev); - int i; - struct tegra_dma_channel *tdc; dma_async_device_unregister(&tdma->dma_dev); - for (i = 0; i < tdma->chip_data->nr_channels; ++i) { - tdc = &tdma->channels[i]; - free_irq(tdc->irq, tdc); - } - pm_runtime_disable(&pdev->dev); if (!pm_runtime_status_suspended(&pdev->dev)) tegra_dma_runtime_suspend(&pdev->dev); -- 2.24.0