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

Commit 48177cd8 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Felipe Balbi
Browse files

usb: gadget: g_serial: split the three possible functions into three bind functions 



This patch factors out the three possible functions into three possible
bind functions which are passed as an argument to usb_add_config(). This
will ease the step by step converting of the individual functions to the
new function registration method.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 05c062c5

drivers/usb/gadget/serial.c

+32 −11
Original line number Diff line number Diff line
@@ -129,19 +129,33 @@ MODULE_PARM_DESC(n_ports, "number of ports to create, default=1"); 


/*-------------------------------------------------------------------------*/



static int __init serial_bind_config(struct usb_configuration *c)

static int __init serial_bind_acm_config(struct usb_configuration *c)

{

	unsigned i;

	int status = 0;



	for (i = 0; i < n_ports && status == 0; i++) {

		if (use_acm)

	for (i = 0; i < n_ports && status == 0; i++)

		status = acm_bind_config(c, i);

		else if (use_obex)

	return status;

}



static int __init serial_bind_obex_config(struct usb_configuration *c)

{

	unsigned i;

	int status = 0;



	for (i = 0; i < n_ports && status == 0; i++)

		status = obex_bind_config(c, i);

		else

			status = gser_bind_config(c, i);

	return status;

}



static int __init serial_bind_gser_config(struct usb_configuration *c)

{

	unsigned i;

	int status = 0;



	for (i = 0; i < n_ports && status == 0; i++)

		status = gser_bind_config(c, i);

	return status;

}
@@ -178,8 +192,15 @@ static int __init gs_bind(struct usb_composite_dev *cdev) 
	}



	/* register our configuration */

	if (use_acm)

		status = usb_add_config(cdev, &serial_config_driver,

				serial_bind_acm_config);

	else if (use_obex)

		status = usb_add_config(cdev, &serial_config_driver,

				serial_bind_obex_config);

	else

		status = usb_add_config(cdev, &serial_config_driver,

			serial_bind_config);

				serial_bind_gser_config);

	if (status < 0)

		goto fail;