Commit 57677126 authored by Daniel Starke's avatar Daniel Starke Committed by Greg Kroah-Hartman
Browse files

tty: n_gsm: cleanup gsm_control_command and gsm_control_reply 



There are multiple places in gsm_control_command and gsm_control_reply that
derive the specific DLCI handle directly out of the DLCI table in gsm.

Add a local variable which holds this handle and use it instead to improve
code readability.

Signed-off-by: default avatarDaniel Starke <daniel.starke@siemens.com>
Link: https://lore.kernel.org/r/20230817093231.2317-7-daniel.starke@siemens.com


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

drivers/tty/n_gsm.c

+6 −4
Original line number Diff line number Diff line
@@ -1451,15 +1451,16 @@ static int gsm_control_command(struct gsm_mux *gsm, int cmd, const u8 *data, 
			       int dlen)

{

	struct gsm_msg *msg;

	struct gsm_dlci *dlci = gsm->dlci[0];



	msg = gsm_data_alloc(gsm, 0, dlen + 2, gsm->dlci[0]->ftype);

	msg = gsm_data_alloc(gsm, 0, dlen + 2, dlci->ftype);

	if (msg == NULL)

		return -ENOMEM;



	msg->data[0] = (cmd << 1) | CR | EA;	/* Set C/R */

	msg->data[1] = (dlen << 1) | EA;

	memcpy(msg->data + 2, data, dlen);

	gsm_data_queue(gsm->dlci[0], msg);

	gsm_data_queue(dlci, msg);



	return 0;

}
@@ -1478,14 +1479,15 @@ static void gsm_control_reply(struct gsm_mux *gsm, int cmd, const u8 *data, 
					int dlen)

{

	struct gsm_msg *msg;

	struct gsm_dlci *dlci = gsm->dlci[0];



	msg = gsm_data_alloc(gsm, 0, dlen + 2, gsm->dlci[0]->ftype);

	msg = gsm_data_alloc(gsm, 0, dlen + 2, dlci->ftype);

	if (msg == NULL)

		return;

	msg->data[0] = (cmd & 0xFE) << 1 | EA;	/* Clear C/R */

	msg->data[1] = (dlen << 1) | EA;

	memcpy(msg->data + 2, data, dlen);

	gsm_data_queue(gsm->dlci[0], msg);

	gsm_data_queue(dlci, msg);

}



/**