Commit 96a83c95 authored by Johan Hovold's avatar Johan Hovold
Browse files

USB: serial: clean up core error labels 



Clean up the core error labels by consistently naming them after what
they do rather than after from where they are jumped to.

Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent e4e737bb

drivers/usb/serial/usb-serial.c

+16 −18
Original line number Original line Diff line number Diff line
@@ -225,17 +225,17 @@ static int serial_install(struct tty_driver *driver, struct tty_struct *tty) 




	serial = port->serial;

	serial = port->serial;

	if (!try_module_get(serial->type->driver.owner))

	if (!try_module_get(serial->type->driver.owner))

		goto error_module_get;

		goto err_put_serial;





	retval = usb_autopm_get_interface(serial->interface);

	retval = usb_autopm_get_interface(serial->interface);

	if (retval)

	if (retval)

		goto error_get_interface;

		goto err_put_module;





	init_termios = (driver->termios[idx] == NULL);

	init_termios = (driver->termios[idx] == NULL);





	retval = tty_standard_install(driver, tty);

	retval = tty_standard_install(driver, tty);

	if (retval)

	if (retval)

		goto error_init_termios;

		goto err_put_autopm;





	mutex_unlock(&serial->disc_mutex);

	mutex_unlock(&serial->disc_mutex);
@@ -247,11 +247,11 @@ static int serial_install(struct tty_driver *driver, struct tty_struct *tty) 




	return retval;

	return retval;





 error_init_termios:

err_put_autopm:

	usb_autopm_put_interface(serial->interface);

	usb_autopm_put_interface(serial->interface);

 error_get_interface:

err_put_module:

	module_put(serial->type->driver.owner);

	module_put(serial->type->driver.owner);

 error_module_get:

err_put_serial:

	usb_serial_put(serial);

	usb_serial_put(serial);

	mutex_unlock(&serial->disc_mutex);

	mutex_unlock(&serial->disc_mutex);

	return retval;

	return retval;
@@ -1328,7 +1328,7 @@ static int __init usb_serial_init(void) 
	result = bus_register(&usb_serial_bus_type);

	result = bus_register(&usb_serial_bus_type);

	if (result) {

	if (result) {

		pr_err("%s - registering bus driver failed\n", __func__);

		pr_err("%s - registering bus driver failed\n", __func__);

		goto exit_bus;

		goto err_put_driver;

	}

	}





	usb_serial_tty_driver->driver_name = "usbserial";

	usb_serial_tty_driver->driver_name = "usbserial";
@@ -1346,25 +1346,23 @@ static int __init usb_serial_init(void) 
	result = tty_register_driver(usb_serial_tty_driver);

	result = tty_register_driver(usb_serial_tty_driver);

	if (result) {

	if (result) {

		pr_err("%s - tty_register_driver failed\n", __func__);

		pr_err("%s - tty_register_driver failed\n", __func__);

		goto exit_reg_driver;

		goto err_unregister_bus;

	}

	}





	/* register the generic driver, if we should */

	/* register the generic driver, if we should */

	result = usb_serial_generic_register();

	result = usb_serial_generic_register();

	if (result < 0) {

	if (result < 0) {

		pr_err("%s - registering generic driver failed\n", __func__);

		pr_err("%s - registering generic driver failed\n", __func__);

		goto exit_generic;

		goto err_unregister_driver;

	}

	}





	return result;

	return result;





exit_generic:

err_unregister_driver:

	tty_unregister_driver(usb_serial_tty_driver);

	tty_unregister_driver(usb_serial_tty_driver);



err_unregister_bus:

exit_reg_driver:

	bus_unregister(&usb_serial_bus_type);

	bus_unregister(&usb_serial_bus_type);



err_put_driver:

exit_bus:

	pr_err("%s - returning with error %d\n", __func__, result);

	pr_err("%s - returning with error %d\n", __func__, result);

	tty_driver_kref_put(usb_serial_tty_driver);

	tty_driver_kref_put(usb_serial_tty_driver);

	return result;

	return result;
@@ -1509,13 +1507,13 @@ int usb_serial_register_drivers(struct usb_serial_driver *const serial_drivers[] 




	rc = usb_register(udriver);

	rc = usb_register(udriver);

	if (rc)

	if (rc)

		goto failed_usb_register;

		goto err_free_driver;





	for (sd = serial_drivers; *sd; ++sd) {

	for (sd = serial_drivers; *sd; ++sd) {

		(*sd)->usb_driver = udriver;

		(*sd)->usb_driver = udriver;

		rc = usb_serial_register(*sd);

		rc = usb_serial_register(*sd);

		if (rc)

		if (rc)

			goto failed;

			goto err_deregister_drivers;

	}

	}





	/* Now set udriver's id_table and look for matches */

	/* Now set udriver's id_table and look for matches */
@@ -1523,11 +1521,11 @@ int usb_serial_register_drivers(struct usb_serial_driver *const serial_drivers[] 
	rc = driver_attach(&udriver->drvwrap.driver);

	rc = driver_attach(&udriver->drvwrap.driver);

	return 0;

	return 0;





 failed:

err_deregister_drivers:

	while (sd-- > serial_drivers)

	while (sd-- > serial_drivers)

		usb_serial_deregister(*sd);

		usb_serial_deregister(*sd);

	usb_deregister(udriver);

	usb_deregister(udriver);

failed_usb_register:

err_free_driver:

	kfree(udriver);

	kfree(udriver);

	return rc;

	return rc;

}

}