]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
tty: serial: remove redundant likely annotation
authorChengguang Xu <cgxu519@gmx.com>
Mon, 18 Feb 2019 08:31:04 +0000 (16:31 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 19 Feb 2019 12:42:07 +0000 (13:42 +0100)
unlikely has already included in IS_ERR(),
so just remove redundant likely annotation.

Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/serial_core.c

index 556f50aa1b586ce9876d61ca35d95b0a4568b088..351843f847c0a80ca2f27a8ab7a2c5074dcaf218 100644 (file)
@@ -2844,7 +2844,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
         */
        tty_dev = tty_port_register_device_attr_serdev(port, drv->tty_driver,
                        uport->line, uport->dev, port, uport->tty_groups);
-       if (likely(!IS_ERR(tty_dev))) {
+       if (!IS_ERR(tty_dev)) {
                device_set_wakeup_capable(tty_dev, 1);
        } else {
                dev_err(uport->dev, "Cannot register tty device on line %d\n",