Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932099AbaDBK3q (ORCPT ); Wed, 2 Apr 2014 06:29:46 -0400 Received: from cantor2.suse.de ([195.135.220.15]:34315 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758057AbaDBK3o (ORCPT ); Wed, 2 Apr 2014 06:29:44 -0400 From: Takashi Iwai To: Arnd Bergmann Cc: Greg Kroah-Hartman , Jean Delvare , Struan Bartlett , Andreas Schwab , gnomes@lxorguk.ukuu.org.uk, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ttyprintk: Allow built as a module Date: Wed, 2 Apr 2014 12:29:42 +0200 Message-Id: <1396434582-30799-2-git-send-email-tiwai@suse.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1396434582-30799-1-git-send-email-tiwai@suse.de> References: <1396434582-30799-1-git-send-email-tiwai@suse.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The driver is well written to be used as a module, just the exit call is missing. Signed-off-by: Takashi Iwai --- drivers/char/Kconfig | 2 +- drivers/char/ttyprintk.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 1386749b48ff..97816b133c7f 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -40,7 +40,7 @@ config SGI_MBCS source "drivers/tty/serial/Kconfig" config TTY_PRINTK - bool "TTY driver to output user messages via printk" + tristate "TTY driver to output user messages via printk" depends on EXPERT && TTY default n ---help--- diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c index 2a39c5790364..73606eaaba71 100644 --- a/drivers/char/ttyprintk.c +++ b/drivers/char/ttyprintk.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include struct ttyprintk_port { struct tty_port port; @@ -214,4 +214,15 @@ error: tty_port_destroy(&tpk_port.port); return ret; } + +static void ttyprintk_exit(void) +{ + tty_unregister_driver(ttyprintk_driver); + put_tty_driver(ttyprintk_driver); + tty_port_destroy(&tpk_port.port); +} + device_initcall(ttyprintk_init); +module_exit(ttyprintk_exit); + +MODULE_LICENSE("GPL"); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/