reset: berlin: make it explicitly non-modular
The Kconfig currently controlling compilation of this code is: drivers/reset/Kconfig:config RESET_BERLIN drivers/reset/Kconfig: bool "Berlin Reset Driver" if COMPILE_TEST drivers/reset/Kconfig: default ARCH_BERLIN or arch/arm/mach-berlin/Kconfig:menuconfig ARCH_BERLIN arch/arm/mach-berlin/Kconfig: bool "Marvell Berlin SoCs" if ARCH_MULTI_V7 or arch/arm64/Kconfig.platforms:config ARCH_BERLIN arch/arm64/Kconfig.platforms: bool "Marvell Berlin SoC Family" ...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_platform_driver() uses the same init level priority as builtin_platform_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 was (or is now) contained at the top of the file in the comments. Cc: Antoine Tenart <antoine.tenart@free-electrons.com> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Родитель
211bc8c3e5
Коммит
ed4dba99ca
|
@ -1,6 +1,8 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2014 Marvell Technology Group Ltd.
|
* Copyright (C) 2014 Marvell Technology Group Ltd.
|
||||||
*
|
*
|
||||||
|
* Marvell Berlin reset driver
|
||||||
|
*
|
||||||
* Antoine Tenart <antoine.tenart@free-electrons.com>
|
* Antoine Tenart <antoine.tenart@free-electrons.com>
|
||||||
* Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
|
* Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
|
||||||
*
|
*
|
||||||
|
@ -12,7 +14,7 @@
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/mfd/syscon.h>
|
#include <linux/mfd/syscon.h>
|
||||||
#include <linux/module.h>
|
#include <linux/init.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
#include <linux/of_address.h>
|
#include <linux/of_address.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
|
@ -91,7 +93,6 @@ static const struct of_device_id berlin_reset_dt_match[] = {
|
||||||
{ .compatible = "marvell,berlin2-reset" },
|
{ .compatible = "marvell,berlin2-reset" },
|
||||||
{ },
|
{ },
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, berlin_reset_dt_match);
|
|
||||||
|
|
||||||
static struct platform_driver berlin_reset_driver = {
|
static struct platform_driver berlin_reset_driver = {
|
||||||
.probe = berlin2_reset_probe,
|
.probe = berlin2_reset_probe,
|
||||||
|
@ -100,9 +101,4 @@ static struct platform_driver berlin_reset_driver = {
|
||||||
.of_match_table = berlin_reset_dt_match,
|
.of_match_table = berlin_reset_dt_match,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
module_platform_driver(berlin_reset_driver);
|
builtin_platform_driver(berlin_reset_driver);
|
||||||
|
|
||||||
MODULE_AUTHOR("Antoine Tenart <antoine.tenart@free-electrons.com>");
|
|
||||||
MODULE_AUTHOR("Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>");
|
|
||||||
MODULE_DESCRIPTION("Marvell Berlin reset driver");
|
|
||||||
MODULE_LICENSE("GPL");
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче