Commit 4064771d authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Greg Kroah-Hartman

staging/media: make atomisp vlv2_plat_clock explicitly non-modular

The Makefile / Kconfig currently controlling compilation of this code is:

clock/Makefile:obj-$(CONFIG_INTEL_ATOMISP)     += vlv2_plat_clock.o

atomisp/Kconfig:menuconfig INTEL_ATOMISP
atomisp/Kconfig:        bool "Enable support to Intel MIPI camera drivers"

...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.

Since module_init was already not in use by this driver, the init
ordering remains unchanged with this commit.

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
is already contained at the top of the file in the comments.

Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Alan Cox <alan@linux.intel.com>
Cc: linux-media@vger.kernel.org
Cc: devel@driverdev.osuosl.org
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cf3112e9
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h> #include <linux/init.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include "../../include/linux/vlv2_plat_clock.h" #include "../../include/linux/vlv2_plat_clock.h"
...@@ -205,18 +205,10 @@ static int vlv2_plat_clk_probe(struct platform_device *pdev) ...@@ -205,18 +205,10 @@ static int vlv2_plat_clk_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int vlv2_plat_clk_remove(struct platform_device *pdev)
{
iounmap(pmc_base);
pmc_base = NULL;
return 0;
}
static const struct platform_device_id vlv2_plat_clk_id[] = { static const struct platform_device_id vlv2_plat_clk_id[] = {
{"vlv2_plat_clk", 0}, {"vlv2_plat_clk", 0},
{} {}
}; };
MODULE_DEVICE_TABLE(platform, vlv2_plat_clk_id);
static int vlv2_resume(struct device *device) static int vlv2_resume(struct device *device)
{ {
...@@ -241,7 +233,6 @@ static const struct dev_pm_ops vlv2_pm_ops = { ...@@ -241,7 +233,6 @@ static const struct dev_pm_ops vlv2_pm_ops = {
static struct platform_driver vlv2_plat_clk_driver = { static struct platform_driver vlv2_plat_clk_driver = {
.probe = vlv2_plat_clk_probe, .probe = vlv2_plat_clk_probe,
.remove = vlv2_plat_clk_remove,
.id_table = vlv2_plat_clk_id, .id_table = vlv2_plat_clk_id,
.driver = { .driver = {
.name = "vlv2_plat_clk", .name = "vlv2_plat_clk",
...@@ -254,13 +245,3 @@ static int __init vlv2_plat_clk_init(void) ...@@ -254,13 +245,3 @@ static int __init vlv2_plat_clk_init(void)
return platform_driver_register(&vlv2_plat_clk_driver); return platform_driver_register(&vlv2_plat_clk_driver);
} }
arch_initcall(vlv2_plat_clk_init); arch_initcall(vlv2_plat_clk_init);
static void __exit vlv2_plat_clk_exit(void)
{
platform_driver_unregister(&vlv2_plat_clk_driver);
}
module_exit(vlv2_plat_clk_exit);
MODULE_AUTHOR("Asutosh Pathak <asutosh.pathak@intel.com>");
MODULE_DESCRIPTION("Intel VLV2 platform clock driver");
MODULE_LICENSE("GPL v2");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment