From 0a589167b3be9aa1b2c46d5013f147ca97fab7f3 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Mon, 12 Sep 2016 10:40:49 -0400 Subject: 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 Signed-off-by: Paul Gortmaker Signed-off-by: Lee Jones --- drivers/mfd/altera-a10sr.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'drivers/mfd/altera-a10sr.c') 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 @@ /* + * Altera Arria10 DevKit System Resource MFD Driver + * + * Author: Thor Thayer + * * Copyright Intel Corporation (C) 2014-2016. All Rights Reserved * * This program is free software; you can redistribute it and/or modify it @@ -20,7 +24,7 @@ #include #include -#include +#include #include #include @@ -152,7 +156,6 @@ static const struct of_device_id altr_a10sr_spi_of_match[] = { { .compatible = "altr,a10sr" }, { }, }; -MODULE_DEVICE_TABLE(of, altr_a10sr_spi_of_match); static struct spi_driver altr_a10sr_spi_driver = { .probe = altr_a10sr_spi_probe, @@ -161,9 +164,4 @@ static struct spi_driver altr_a10sr_spi_driver = { .of_match_table = of_match_ptr(altr_a10sr_spi_of_match), }, }; - -module_spi_driver(altr_a10sr_spi_driver); - -MODULE_LICENSE("GPL v2"); -MODULE_AUTHOR("Thor Thayer "); -MODULE_DESCRIPTION("Altera Arria10 DevKit System Resource MFD Driver"); +builtin_driver(altr_a10sr_spi_driver, spi_register_driver) -- cgit v1.2.3