aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2016-10-31 13:42:16 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-10 14:34:27 +0100
commit146b4d5b36b51ce4a86a538e315c89558949b69a (patch)
treeff4e5ff8acd29b9a8160dabc501f739eb7cab777 /drivers/tty
parentserial: 8250_pxa: hide early console setup when disabled (diff)
downloadlinux-146b4d5b36b51ce4a86a538e315c89558949b69a.tar.gz
linux-146b4d5b36b51ce4a86a538e315c89558949b69a.zip
tty: serial: make crisv10 explicitly non-modular
The Kconfig currently controlling compilation of this code is: arch/cris/arch-v10/drivers/Kconfig:config ETRAX_SERIAL arch/cris/arch-v10/drivers/Kconfig: bool "Serial-port support" ...meaning that it currently is not being built as a module by anyone. Lets remove the couple traces of modular infrastructure use, so that when reading the driver there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We don't replace module.h with init.h since the file already has that. Cc: Mikael Starvik <starvik@axis.com> Cc: Jesper Nilsson <jesper.nilsson@axis.com> Cc: Jiri Slaby <jslaby@suse.com> Cc: linux-cris-kernel@axis.com Cc: linux-serial@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/crisv10.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
index 315c84979b18..6450a38cb1aa 100644
--- a/drivers/tty/serial/crisv10.c
+++ b/drivers/tty/serial/crisv10.c
@@ -28,7 +28,6 @@ static char *serial_version = "$Revision: 1.25 $";
#include <linux/bitops.h>
#include <linux/seq_file.h>
#include <linux/delay.h>
-#include <linux/module.h>
#include <linux/uaccess.h>
#include <linux/io.h>
@@ -4098,7 +4097,7 @@ static void show_serial_version(void)
&serial_version[11]); /* "$Revision: x.yy" */
}
-/* rs_init inits the driver at boot (using the module_init chain) */
+/* rs_init inits the driver at boot (using the initcall chain) */
static const struct tty_operations rs_ops = {
.open = rs_open,
@@ -4247,5 +4246,4 @@ static int __init rs_init(void)
}
/* this makes sure that rs_init is called during kernel boot */
-
-module_init(rs_init);
+device_initcall(rs_init);
net: hns3: check NULL pointer before useGuangbin Huang1-1/+2 2019-09-11net: hns3: modify some logs formatGuangbin Huang3-4/+7 2019-09-11net: hns3: fix port setting handle for fibre portGuangbin Huang1-0/+15 2019-09-11net: hns3: fix shaper parameter algorithmYonglong Liu1-7/+4 2019-09-11net: hns3: revert to old channel when setting new channel num failPeng Li1-14/+37 2019-09-11net: hns3: add ethtool_ops.set_channels support for HNS3 VF driverGuangbin Huang2-5/+79 2019-09-11mac80211_hwsim: Register support for HE meshpointSven Eckelmann1-94/+189 2019-09-11nl80211: Fix possible Spectre-v1 for CQM RSSI thresholdsMasashi Honma1-1/+3 2019-09-11mac80211: allow drivers to set max MTUWen Gong3-1/+5 2019-09-11cfg80211: Do not compare with boolean in nl80211_common_reg_change_eventzhong jiang1-5/+3 2019-09-11mac80211: IBSS: send deauth when expiring inactive STAsJohannes Berg4-8/+19 2019-09-11mac80211: don't check if key is NULL in ieee80211_key_link()Luca Coelho1-1/+1 2019-09-11mac80211: clear crypto tx tailroom counter upon keys enableLior Cohen3-35/+15 2019-09-11mac80211: remove unnecessary key conditionJohannes Berg1-3/+3 2019-09-11mac80211: list features in WEP/TKIP disable in better orderJohannes Berg1-1/+1 2019-09-11cfg80211: always shut down on HW rfkillJohannes Berg3-9/+11 2019-09-11mac80211: vht: add support VHT EXT NSS BW in parsing VHTMordechay Goodstein1-1/+9 2019-09-11cfg80211: fix boundary value in ieee80211_frequency_to_channel()Arend van Spriel1-1/+1 2019-09-10net/mlx5: FWTrace, Reduce stack usageSaeed Mahameed1-3/+4 2019-09-10net/mlx5: Fix addr's type in mlx5dr_icm_dmNathan Chancellor1-1/+1 2019-09-10net/mlx5: Fix rt's type in dr_action_create_reformat_actionNathan Chancellor1-1/+1