Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e762e140 authored by Laura Abbott's avatar Laura Abbott Committed by Greg Kroah-Hartman
Browse files

kgdboc: Fix warning with module build 



commit 1cd25cbb2fedbc777f3a8c3cb1ba69b645aeaa64 upstream.

After 2dd453168643 ("kgdboc: Fix restrict error"), kgdboc_option_setup is
now only used when built in, resulting in a warning when compiled as a
module:

drivers/tty/serial/kgdboc.c:134:12: warning: 'kgdboc_option_setup' defined but not used [-Wunused-function]
 static int kgdboc_option_setup(char *opt)
            ^~~~~~~~~~~~~~~~~~~

Move the function under the appropriate ifdef for builtin only.

Fixes: 2dd453168643 ("kgdboc: Fix restrict error")
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5eede3d0

drivers/tty/serial/kgdboc.c

+19 −18
Original line number Diff line number Diff line
@@ -128,24 +128,6 @@ static void kgdboc_unregister_kbd(void) 
#define kgdboc_restore_input()

#endif /* ! CONFIG_KDB_KEYBOARD */



static int kgdboc_option_setup(char *opt)

{

	if (!opt) {

		pr_err("kgdboc: config string not provided\n");

		return -EINVAL;

	}



	if (strlen(opt) >= MAX_CONFIG_LEN) {

		printk(KERN_ERR "kgdboc: config string too long\n");

		return -ENOSPC;

	}

	strcpy(config, opt);



	return 0;

}



__setup("kgdboc=", kgdboc_option_setup);



static void cleanup_kgdboc(void)

{

	if (kgdb_unregister_nmi_console())
@@ -314,6 +296,25 @@ static struct kgdb_io kgdboc_io_ops = { 
};



#ifdef CONFIG_KGDB_SERIAL_CONSOLE

static int kgdboc_option_setup(char *opt)

{

	if (!opt) {

		pr_err("config string not provided\n");

		return -EINVAL;

	}



	if (strlen(opt) >= MAX_CONFIG_LEN) {

		pr_err("config string too long\n");

		return -ENOSPC;

	}

	strcpy(config, opt);



	return 0;

}



__setup("kgdboc=", kgdboc_option_setup);





/* This is only available if kgdboc is a built in for early debugging */

static int __init kgdboc_early_init(char *opt)

{