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

net: caif: inline register_ldisc 



register_ldisc only calls tty_register_ldisc. Inline register_ldisc into
the only caller of register_ldisc, i.e. caif_ser_init. Now,
caif_ser_init is symmetric to caif_ser_exit in this regard.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210302062214.29627-14-jslaby@suse.cz


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

drivers/net/caif/caif_serial.c

+4 −13
Original line number Diff line number Diff line
@@ -389,18 +389,6 @@ static struct tty_ldisc_ops caif_ldisc = { 
	.write_wakeup =	ldisc_tx_wakeup

};



static int register_ldisc(void)

{

	int result;



	result = tty_register_ldisc(N_CAIF, &caif_ldisc);

	if (result < 0) {

		pr_err("cannot register CAIF ldisc=%d err=%d\n", N_CAIF,

			result);

		return result;

	}

	return result;

}

static const struct net_device_ops netdev_ops = {

	.ndo_open = caif_net_open,

	.ndo_stop = caif_net_close,
@@ -443,7 +431,10 @@ static int __init caif_ser_init(void) 
{

	int ret;



	ret = register_ldisc();

	ret = tty_register_ldisc(N_CAIF, &caif_ldisc);

	if (ret < 0)

		pr_err("cannot register CAIF ldisc=%d err=%d\n", N_CAIF, ret);



	debugfsdir = debugfs_create_dir("caif_serial", NULL);

	return ret;

}