aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2016-09-12 10:40:49 -0400
committerLee Jones <lee.jones@linaro.org>2016-10-04 10:48:03 -0400
commit0a589167b3be9aa1b2c46d5013f147ca97fab7f3 (patch)
treeba2819d112d07abf1a008245b17e1bb9ef50d519
parentdea9c730e568e86063a85df355d5ad7c1cdda895 (diff)
mfd: altera-a10sr: Make it explicitly non-modular
The Kconfig currently controlling compilation of this code is: drivers/mfd/Kconfig:config MFD_ALTERA_A10SR drivers/mfd/Kconfig: bool "Altera Arria10 DevKit System Resource chip" ...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 builtin_driver() uses the same init level priority as module_spi_driver() the init ordering remains unchanged with this commit. [Note that there is no builtin_spi_driver macro, so we open-code what it would be via builtin_driver().] 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: Thor Thayer <tthayer@opensource.altera.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--drivers/mfd/altera-a10sr.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/mfd/altera-a10sr.c b/drivers/mfd/altera-a10sr.c
index 40ed65e5fb2a..06e1f7fc5605 100644
--- a/drivers/mfd/altera-a10sr.c
+++ b/drivers/mfd/altera-a10sr.c
@@ -1,4 +1,8 @@
1/* 1/*
2 * Altera Arria10 DevKit System Resource MFD Driver
3 *
4 * Author: Thor Thayer <tthayer@opensource.altera.com>
5 *
2 * Copyright Intel Corporation (C) 2014-2016. All Rights Reserved 6 * Copyright Intel Corporation (C) 2014-2016. All Rights Reserved
3 * 7 *
4 * This program is free software; you can redistribute it and/or modify it 8 * This program is free software; you can redistribute it and/or modify it
@@ -20,7 +24,7 @@
20 24
21#include <linux/mfd/altera-a10sr.h> 25#include <linux/mfd/altera-a10sr.h>
22#include <linux/mfd/core.h> 26#include <linux/mfd/core.h>
23#include <linux/module.h> 27#include <linux/init.h>
24#include <linux/of.h> 28#include <linux/of.h>
25#include <linux/spi/spi.h> 29#include <linux/spi/spi.h>
26 30
@@ -152,7 +156,6 @@ static const struct of_device_id altr_a10sr_spi_of_match[] = {
152 { .compatible = "altr,a10sr" }, 156 { .compatible = "altr,a10sr" },
153 { }, 157 { },
154}; 158};
155MODULE_DEVICE_TABLE(of, altr_a10sr_spi_of_match);
156 159
157static struct spi_driver altr_a10sr_spi_driver = { 160static struct spi_driver altr_a10sr_spi_driver = {
158 .probe = altr_a10sr_spi_probe, 161 .probe = altr_a10sr_spi_probe,
@@ -161,9 +164,4 @@ static struct spi_driver altr_a10sr_spi_driver = {
161 .of_match_table = of_match_ptr(altr_a10sr_spi_of_match), 164 .of_match_table = of_match_ptr(altr_a10sr_spi_of_match),
162 }, 165 },
163}; 166};
164 167builtin_driver(altr_a10sr_spi_driver, spi_register_driver)
165module_spi_driver(altr_a10sr_spi_driver);
166
167MODULE_LICENSE("GPL v2");
168MODULE_AUTHOR("Thor Thayer <tthayer@opensource.altera.com>");
169MODULE_DESCRIPTION("Altera Arria10 DevKit System Resource MFD Driver");