From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Gortmaker Subject: [PATCH 6/6] drivers/dma: make tegra20-apb-dma.c explicitly non-modular Date: Wed, 9 Dec 2015 18:22:02 -0500 Message-ID: <1449703322-17762-7-git-send-email-paul.gortmaker@windriver.com> References: <1449703322-17762-1-git-send-email-paul.gortmaker@windriver.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1449703322-17762-1-git-send-email-paul.gortmaker@windriver.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: Paul Gortmaker , Laxman Dewangan , Dan Williams , Vinod Koul , Stephen Warren , Thierry Reding , Alexandre Courbot , dmaengine@vger.kernel.org, linux-tegra@vger.kernel.org List-Id: linux-tegra@vger.kernel.org The Kconfig currently controlling compilation of this code is: drivers/dma/Kconfig:config TEGRA20_APB_DMA drivers/dma/Kconfig: bool "NVIDIA Tegra20 APB DMA support" ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. We explicitly disallow a driver unbind, since that doesn't have a sensible use case anyway, and it allows us to drop the ".remove" code for non-modular drivers. Since module_platform_driver() uses the same init level priority as builtin_platform_driver() the init ordering remains unchanged with this commit. We don't replace module.h with init.h since the file already has that. Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. We also delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments. Cc: Laxman Dewangan Cc: Dan Williams Cc: Vinod Koul Cc: Stephen Warren Cc: Thierry Reding Cc: Alexandre Courbot Cc: dmaengine@vger.kernel.org Cc: linux-tegra@vger.kernel.org Signed-off-by: Paul Gortmaker --- drivers/dma/tegra20-apb-dma.c | 35 ++++------------------------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c index 935da8192f59..eee783cee45b 100644 --- a/drivers/dma/tegra20-apb-dma.c +++ b/drivers/dma/tegra20-apb-dma.c @@ -3,6 +3,8 @@ * * Copyright (c) 2012-2013, NVIDIA CORPORATION. All rights reserved. * + * Author: Laxman Dewangan + * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, * version 2, as published by the Free Software Foundation. @@ -26,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -1309,7 +1310,6 @@ static const struct of_device_id tegra_dma_of_match[] = { }, { }, }; -MODULE_DEVICE_TABLE(of, tegra_dma_of_match); static int tegra_dma_probe(struct platform_device *pdev) { @@ -1488,27 +1488,6 @@ err_irq: return ret; } -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); - tasklet_kill(&tdc->tasklet); - } - - pm_runtime_disable(&pdev->dev); - if (!pm_runtime_status_suspended(&pdev->dev)) - tegra_dma_runtime_suspend(&pdev->dev); - - return 0; -} - static int tegra_dma_runtime_suspend(struct device *dev) { struct tegra_dma *tdma = dev_get_drvdata(dev); @@ -1616,15 +1595,9 @@ static struct platform_driver tegra_dmac_driver = { .driver = { .name = "tegra-apbdma", .pm = &tegra_dma_dev_pm_ops, + .suppress_bind_attrs = true, .of_match_table = tegra_dma_of_match, }, .probe = tegra_dma_probe, - .remove = tegra_dma_remove, }; - -module_platform_driver(tegra_dmac_driver); - -MODULE_ALIAS("platform:tegra20-apbdma"); -MODULE_DESCRIPTION("NVIDIA Tegra APB DMA Controller driver"); -MODULE_AUTHOR("Laxman Dewangan "); -MODULE_LICENSE("GPL v2"); +builtin_platform_driver(tegra_dmac_driver); -- 2.6.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754304AbbLIX1b (ORCPT ); Wed, 9 Dec 2015 18:27:31 -0500 Received: from mail5.windriver.com ([192.103.53.11]:55887 "EHLO mail5.wrs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753954AbbLIXXu (ORCPT ); Wed, 9 Dec 2015 18:23:50 -0500 From: Paul Gortmaker To: CC: Paul Gortmaker , Laxman Dewangan , Dan Williams , Vinod Koul , Stephen Warren , Thierry Reding , Alexandre Courbot , , Subject: [PATCH 6/6] drivers/dma: make tegra20-apb-dma.c explicitly non-modular Date: Wed, 9 Dec 2015 18:22:02 -0500 Message-ID: <1449703322-17762-7-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1449703322-17762-1-git-send-email-paul.gortmaker@windriver.com> References: <1449703322-17762-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Kconfig currently controlling compilation of this code is: drivers/dma/Kconfig:config TEGRA20_APB_DMA drivers/dma/Kconfig: bool "NVIDIA Tegra20 APB DMA support" ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. We explicitly disallow a driver unbind, since that doesn't have a sensible use case anyway, and it allows us to drop the ".remove" code for non-modular drivers. Since module_platform_driver() uses the same init level priority as builtin_platform_driver() the init ordering remains unchanged with this commit. We don't replace module.h with init.h since the file already has that. Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. We also delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments. Cc: Laxman Dewangan Cc: Dan Williams Cc: Vinod Koul Cc: Stephen Warren Cc: Thierry Reding Cc: Alexandre Courbot Cc: dmaengine@vger.kernel.org Cc: linux-tegra@vger.kernel.org Signed-off-by: Paul Gortmaker --- drivers/dma/tegra20-apb-dma.c | 35 ++++------------------------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c index 935da8192f59..eee783cee45b 100644 --- a/drivers/dma/tegra20-apb-dma.c +++ b/drivers/dma/tegra20-apb-dma.c @@ -3,6 +3,8 @@ * * Copyright (c) 2012-2013, NVIDIA CORPORATION. All rights reserved. * + * Author: Laxman Dewangan + * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, * version 2, as published by the Free Software Foundation. @@ -26,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -1309,7 +1310,6 @@ static const struct of_device_id tegra_dma_of_match[] = { }, { }, }; -MODULE_DEVICE_TABLE(of, tegra_dma_of_match); static int tegra_dma_probe(struct platform_device *pdev) { @@ -1488,27 +1488,6 @@ err_irq: return ret; } -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); - tasklet_kill(&tdc->tasklet); - } - - pm_runtime_disable(&pdev->dev); - if (!pm_runtime_status_suspended(&pdev->dev)) - tegra_dma_runtime_suspend(&pdev->dev); - - return 0; -} - static int tegra_dma_runtime_suspend(struct device *dev) { struct tegra_dma *tdma = dev_get_drvdata(dev); @@ -1616,15 +1595,9 @@ static struct platform_driver tegra_dmac_driver = { .driver = { .name = "tegra-apbdma", .pm = &tegra_dma_dev_pm_ops, + .suppress_bind_attrs = true, .of_match_table = tegra_dma_of_match, }, .probe = tegra_dma_probe, - .remove = tegra_dma_remove, }; - -module_platform_driver(tegra_dmac_driver); - -MODULE_ALIAS("platform:tegra20-apbdma"); -MODULE_DESCRIPTION("NVIDIA Tegra APB DMA Controller driver"); -MODULE_AUTHOR("Laxman Dewangan "); -MODULE_LICENSE("GPL v2"); +builtin_platform_driver(tegra_dmac_driver); -- 2.6.1