mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: <linux-kernel@vger.kernel.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>,
	Vinod Koul <vinod.koul@intel.com>,
	Dan Williams <dan.j.williams@intel.com>,
	<dmaengine@vger.kernel.org>
Subject: [PATCH 5/6] drivers/dma: make sh/shdma-*.c explicitly non-modular
Date: Wed, 9 Dec 2015 18:22:01 -0500	[thread overview]
Message-ID: <1449703322-17762-6-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1449703322-17762-1-git-send-email-paul.gortmaker@windriver.com>

The Kconfig currently controlling compilation of these files is:

config SH_DMAE_BASE
     bool "Renesas SuperH DMA Engine 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.

In one file, we explicitly disallow a driver unbind, since that
doesn't have a sensible use case anyway, and there was not a
".remove" code assigned in the struct for it either.

Since module_init translates to device_initcall in the non-modular
case, the init ordering remains unchanged with this commit.

Similarly builtin_platform_driver and module_platform_driver use
device_initcall, so the init ordering remains unchanged there too.

In one file, We replace module.h with moduleparam.h since the file does
have one module_param already.

We also delete the MODULE_LICENSE tag etc. since all that information
is already contained at the top of the file in the comments.

Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: dmaengine@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/dma/sh/shdma-base.c | 14 ++------------
 drivers/dma/sh/shdma-of.c   | 11 +++--------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
index 10fcabad80f3..69097a860fc8 100644
--- a/drivers/dma/sh/shdma-base.c
+++ b/drivers/dma/sh/shdma-base.c
@@ -18,7 +18,7 @@
 #include <linux/dmaengine.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
@@ -1051,14 +1051,4 @@ static int __init shdma_enter(void)
 		return -ENOMEM;
 	return 0;
 }
-module_init(shdma_enter);
-
-static void __exit shdma_exit(void)
-{
-	kfree(shdma_slave_used);
-}
-module_exit(shdma_exit);
-
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("SH-DMA driver base library");
-MODULE_AUTHOR("Guennadi Liakhovetski <g.liakhovetski@gmx.de>");
+device_initcall(shdma_enter);
diff --git a/drivers/dma/sh/shdma-of.c b/drivers/dma/sh/shdma-of.c
index f999f9b0d314..888bd8761333 100644
--- a/drivers/dma/sh/shdma-of.c
+++ b/drivers/dma/sh/shdma-of.c
@@ -10,7 +10,7 @@
  */
 
 #include <linux/dmaengine.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/of.h>
 #include <linux/of_dma.h>
 #include <linux/of_platform.h>
@@ -62,18 +62,13 @@ static const struct of_device_id shdma_of_match[] = {
 	{ .compatible = "renesas,shdma-mux", },
 	{ }
 };
-MODULE_DEVICE_TABLE(of, sh_dmae_of_match);
 
 static struct platform_driver shdma_of = {
 	.driver		= {
 		.name	= "shdma-of",
+		.suppress_bind_attrs = true,
 		.of_match_table = shdma_of_match,
 	},
 	.probe		= shdma_of_probe,
 };
-
-module_platform_driver(shdma_of);
-
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("SH-DMA driver DT glue");
-MODULE_AUTHOR("Guennadi Liakhovetski <g.liakhovetski@gmx.de>");
+builtin_platform_driver(shdma_of);
-- 
2.6.1


  parent reply	other threads:[~2015-12-09 23:23 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-09 23:21 [PATCH 0/6] drivers/dma: drop modular code from non modular drivers Paul Gortmaker
2015-12-09 23:21 ` [PATCH 1/6] drivers/dma: make edma.c explicitly non-modular Paul Gortmaker
2015-12-09 23:21 ` [PATCH 2/6] drivers/dma: make mmp_pdma.c " Paul Gortmaker
2015-12-09 23:21 ` [PATCH 3/6] drivers/dma: make mmp_tdma.c " Paul Gortmaker
2015-12-09 23:22 ` [PATCH 4/6] drivers/dma: make pxa_dma.c " Paul Gortmaker
2015-12-09 23:22 ` Paul Gortmaker [this message]
2015-12-10  9:46   ` [PATCH 5/6] drivers/dma: make sh/shdma-*.c " Geert Uytterhoeven
2015-12-09 23:22 ` [PATCH 6/6] drivers/dma: make tegra20-apb-dma.c " Paul Gortmaker
2015-12-09 23:29 ` [PATCH 0/6] drivers/dma: drop modular code from non modular drivers Arnd Bergmann
2015-12-10  0:17   ` Paul Gortmaker
2015-12-10  3:12     ` Vinod Koul
2015-12-10  9:01     ` Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449703322-17762-6-git-send-email-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=dan.j.williams@intel.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=vinod.koul@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome