Commit aebe5fc3 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

n_hdlc: put init/exit strings directly to prints 



These strings were put aside from prints to save some bytes after module
load or when built-in -- they were freed after module load (__init ones) or
when the driver is selected as built-in (__exit ones).

The savings are negligible, but the code readability is worse by the
order of magnitude. So put the strings where they belong. Note that it
also used to make little sense putting const data in .data (the __exit
case).

While at it, switch to pr_info, pr_err, not using the KERN_INFO and _ERR
directly.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200219084118.26491-4-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f3c2e277

drivers/tty/n_hdlc.c

+6 −22
Original line number Diff line number Diff line
@@ -889,13 +889,6 @@ static struct n_hdlc_buf *n_hdlc_buf_get(struct n_hdlc_buf_list *buf_list) 
	return buf;

}	/* end of n_hdlc_buf_get() */



static const char hdlc_banner[] __initconst =

	KERN_INFO "HDLC line discipline maxframe=%u\n";

static const char hdlc_register_ok[] __initconst =

	KERN_INFO "N_HDLC line discipline registered.\n";

static const char hdlc_register_fail[] __initconst =

	KERN_ERR "error registering line discipline: %d\n";



static int __init n_hdlc_init(void)

{

	int status;
@@ -906,37 +899,28 @@ static int __init n_hdlc_init(void) 
	else if (maxframe > 65535)

		maxframe = 65535;



	printk(hdlc_banner, maxframe);

	pr_info("HDLC line discipline maxframe=%d\n", maxframe);



	status = tty_register_ldisc(N_HDLC, &n_hdlc_ldisc);

	if (!status)

		printk(hdlc_register_ok);

		pr_info("N_HDLC line discipline registered.\n");

	else

		printk(hdlc_register_fail, status);

		pr_err("error registering line discipline: %d\n", status);



	return status;

	

}	/* end of init_module() */



#ifdef CONFIG_SPARC

#undef __exitdata

#define __exitdata

#endif



static const char hdlc_unregister_ok[] __exitdata =

	KERN_INFO "N_HDLC: line discipline unregistered\n";

static const char hdlc_unregister_fail[] __exitdata =

	KERN_ERR "N_HDLC: can't unregister line discipline (err = %d)\n";



static void __exit n_hdlc_exit(void)

{

	/* Release tty registration of line discipline */

	int status = tty_unregister_ldisc(N_HDLC);



	if (status)

		printk(hdlc_unregister_fail, status);

		pr_err("N_HDLC: can't unregister line discipline (err = %d)\n",

				status);

	else

		printk(hdlc_unregister_ok);

		pr_info("N_HDLC: line discipline unregistered\n");

}



module_init(n_hdlc_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE