From nobody Fri Dec 19 20:32:45 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D4BF818B467; Thu, 8 Aug 2024 10:35:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113356; cv=none; b=Xwvam2sx2Qmr+TfLllue7WlC+m5Wo9sPqizBPRuM2dpkLFwHkCJ3lJw6RoNHmLV+Z3Q8FVtyEiaFc/gr8IsNti2kSajE1CxHaAukkyqaZbgZYEqKisNh4TQeBVDGLLR8o4wem495yrkVp3rGxOiLFrk6n3lbkZAaJYjoAFu5JD4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113356; c=relaxed/simple; bh=RXcV0a+kBZVxm5D+WPYM/cDAOg+s5oWBjdfF9Soc7As=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KRf/WKkKbg0vuY12OI/UgstRGMw+/2nn/YIphmjRWErTxgrgtOoExF9O2gmLyGhqDacCYJMuqNYdHlklUdKgi341rU3OxsQWDYQiWhgmEsrjVwa21bLwu2RjG3RbHGvUFkqrN2Vy+9E+RO3nCjbPehU8u+CVpdNoh8rJZmaf60c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XNOfla1L; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XNOfla1L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57100C4AF0E; Thu, 8 Aug 2024 10:35:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723113356; bh=RXcV0a+kBZVxm5D+WPYM/cDAOg+s5oWBjdfF9Soc7As=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XNOfla1L+iXl5mb/RH8wJSedeN79N18cRBmfbZ7l5q/5OCh99u8Tdu+RJ+0C24SL2 ISM8ZzpGF9HB2ElHKCYdLKZJxRcFWI616WdNpcnem7YghffTu24V1Mam/T3AervDrG hz4ZQT0qbOnApVjvMllLr3p8W10hTGSRK6MJfizRPRfMh5kQhGLz8vXL6sGO11H58T tb0mKyI2Y4TQ2Iw11Mxp7rBMMbpTCrgosOpejI9cnXs+ONv/IGjVhf4QRyLd2kh+Dh gr8C82/cfrIlC5iUQ1YmeEFwGzRYU3zcqHhwkAxI1Z1ehA9M/Gn9pyyh80q5ipeHZE FDLugDUsFLqCw== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" Subject: [PATCH v2 01/11] serial: use guards for simple mutex locks Date: Thu, 8 Aug 2024 12:35:37 +0200 Message-ID: <20240808103549.429349-2-jirislaby@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240808103549.429349-1-jirislaby@kernel.org> References: <20240808103549.429349-1-jirislaby@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Guards can help to make the code more readable. So use it wherever they do so. On many places labels and 'ret' locals are eliminated completely. Signed-off-by: Jiri Slaby (SUSE) --- [v2] change also the third goto in uart_suspend_port(). How could this only slip through? --- drivers/tty/serial/serial_core.c | 113 +++++++++++++------------------ 1 file changed, 47 insertions(+), 66 deletions(-) diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_c= ore.c index 61fbc730c01b..d94d73e45fb6 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -1104,21 +1104,19 @@ static int uart_tiocmget(struct tty_struct *tty) struct uart_state *state =3D tty->driver_data; struct tty_port *port =3D &state->port; struct uart_port *uport; - int result =3D -EIO; + int result; + + guard(mutex)(&port->mutex); =20 - mutex_lock(&port->mutex); uport =3D uart_port_check(state); - if (!uport) - goto out; + if (!uport || tty_io_error(tty)) + return -EIO; + + uart_port_lock_irq(uport); + result =3D uport->mctrl; + result |=3D uport->ops->get_mctrl(uport); + uart_port_unlock_irq(uport); =20 - if (!tty_io_error(tty)) { - uart_port_lock_irq(uport); - result =3D uport->mctrl; - result |=3D uport->ops->get_mctrl(uport); - uart_port_unlock_irq(uport); - } -out: - mutex_unlock(&port->mutex); return result; } =20 @@ -1128,20 +1126,16 @@ uart_tiocmset(struct tty_struct *tty, unsigned int = set, unsigned int clear) struct uart_state *state =3D tty->driver_data; struct tty_port *port =3D &state->port; struct uart_port *uport; - int ret =3D -EIO; =20 - mutex_lock(&port->mutex); + guard(mutex)(&port->mutex); + uport =3D uart_port_check(state); - if (!uport) - goto out; + if (!uport || tty_io_error(tty)) + return -EIO; =20 - if (!tty_io_error(tty)) { - uart_update_mctrl(uport, set, clear); - ret =3D 0; - } -out: - mutex_unlock(&port->mutex); - return ret; + uart_update_mctrl(uport, set, clear); + + return 0; } =20 static int uart_break_ctl(struct tty_struct *tty, int break_state) @@ -1149,19 +1143,17 @@ static int uart_break_ctl(struct tty_struct *tty, i= nt break_state) struct uart_state *state =3D tty->driver_data; struct tty_port *port =3D &state->port; struct uart_port *uport; - int ret =3D -EIO; =20 - mutex_lock(&port->mutex); + guard(mutex)(&port->mutex); + uport =3D uart_port_check(state); if (!uport) - goto out; + return -EIO; =20 if (uport->type !=3D PORT_UNKNOWN && uport->ops->break_ctl) uport->ops->break_ctl(uport, break_state); - ret =3D 0; -out: - mutex_unlock(&port->mutex); - return ret; + + return 0; } =20 static int uart_do_autoconfig(struct tty_struct *tty, struct uart_state *s= tate) @@ -1178,17 +1170,14 @@ static int uart_do_autoconfig(struct tty_struct *tt= y, struct uart_state *state) * changing, and hence any extra opens of the port while * we're auto-configuring. */ - if (mutex_lock_interruptible(&port->mutex)) - return -ERESTARTSYS; + scoped_cond_guard(mutex_intr, return -ERESTARTSYS, &port->mutex) { + uport =3D uart_port_check(state); + if (!uport) + return -EIO; =20 - uport =3D uart_port_check(state); - if (!uport) { - ret =3D -EIO; - goto out; - } + if (tty_port_users(port) !=3D 1) + return -EBUSY; =20 - ret =3D -EBUSY; - if (tty_port_users(port) =3D=3D 1) { uart_shutdown(tty, state); =20 /* @@ -1209,14 +1198,15 @@ static int uart_do_autoconfig(struct tty_struct *tt= y, struct uart_state *state) uport->ops->config_port(uport, flags); =20 ret =3D uart_startup(tty, state, true); - if (ret =3D=3D 0) - tty_port_set_initialized(port, true); + if (ret < 0) + return ret; if (ret > 0) - ret =3D 0; + return 0; + + tty_port_set_initialized(port, true); } -out: - mutex_unlock(&port->mutex); - return ret; + + return 0; } =20 static void uart_enable_ms(struct uart_port *uport) @@ -1711,10 +1701,11 @@ static void uart_set_termios(struct tty_struct *tty, unsigned int iflag_mask =3D IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK; bool sw_changed =3D false; =20 - mutex_lock(&state->port.mutex); + guard(mutex)(&state->port.mutex); + uport =3D uart_port_check(state); if (!uport) - goto out; + return; =20 /* * Drivers doing software flow control also need to know @@ -1737,9 +1728,8 @@ static void uart_set_termios(struct tty_struct *tty, tty->termios.c_ospeed =3D=3D old_termios->c_ospeed && tty->termios.c_ispeed =3D=3D old_termios->c_ispeed && ((tty->termios.c_iflag ^ old_termios->c_iflag) & iflag_mask) =3D=3D 0= && - !sw_changed) { - goto out; - } + !sw_changed) + return; =20 uart_change_line_settings(tty, state, old_termios); /* reload cflag from termios; port driver may have overridden flags */ @@ -1756,8 +1746,6 @@ static void uart_set_termios(struct tty_struct *tty, mask |=3D TIOCM_RTS; uart_set_mctrl(uport, mask); } -out: - mutex_unlock(&state->port.mutex); } =20 /* @@ -2051,10 +2039,11 @@ static void uart_line_info(struct seq_file *m, stru= ct uart_driver *drv, int i) unsigned int status; int mmio; =20 - mutex_lock(&port->mutex); + guard(mutex)(&port->mutex); + uport =3D uart_port_check(state); if (!uport) - goto out; + return; =20 mmio =3D uport->iotype >=3D UPIO_MEM; seq_printf(m, "%d: uart:%s %s%08llX irq:%d", @@ -2066,7 +2055,7 @@ static void uart_line_info(struct seq_file *m, struct= uart_driver *drv, int i) =20 if (uport->type =3D=3D PORT_UNKNOWN) { seq_putc(m, '\n'); - goto out; + return; } =20 if (capable(CAP_SYS_ADMIN)) { @@ -2117,8 +2106,6 @@ static void uart_line_info(struct seq_file *m, struct= uart_driver *drv, int i) seq_putc(m, '\n'); #undef STATBIT #undef INFOBIT -out: - mutex_unlock(&port->mutex); } =20 static int uart_proc_show(struct seq_file *m, void *v) @@ -2395,13 +2382,12 @@ int uart_suspend_port(struct uart_driver *drv, stru= ct uart_port *uport) struct device *tty_dev; struct uart_match match =3D {uport, drv}; =20 - mutex_lock(&port->mutex); + guard(mutex)(&port->mutex); =20 tty_dev =3D device_find_child(&uport->port_dev->dev, &match, serial_match= _port); if (tty_dev && device_may_wakeup(tty_dev)) { enable_irq_wake(uport->irq); put_device(tty_dev); - mutex_unlock(&port->mutex); return 0; } put_device(tty_dev); @@ -2419,7 +2405,7 @@ int uart_suspend_port(struct uart_driver *drv, struct= uart_port *uport) uart_port_unlock_irq(uport); } device_set_awake_path(uport->dev); - goto unlock; + return 0; } =20 uport->suspended =3D 1; @@ -2462,8 +2448,6 @@ int uart_suspend_port(struct uart_driver *drv, struct= uart_port *uport) console_stop(uport->cons); =20 uart_change_pm(state, UART_PM_STATE_OFF); -unlock: - mutex_unlock(&port->mutex); =20 return 0; } @@ -2477,14 +2461,13 @@ int uart_resume_port(struct uart_driver *drv, struc= t uart_port *uport) struct uart_match match =3D {uport, drv}; struct ktermios termios; =20 - mutex_lock(&port->mutex); + guard(mutex)(&port->mutex); =20 tty_dev =3D device_find_child(&uport->port_dev->dev, &match, serial_match= _port); if (!uport->suspended && device_may_wakeup(tty_dev)) { if (irqd_is_wakeup_set(irq_get_irq_data((uport->irq)))) disable_irq_wake(uport->irq); put_device(tty_dev); - mutex_unlock(&port->mutex); return 0; } put_device(tty_dev); @@ -2557,8 +2540,6 @@ int uart_resume_port(struct uart_driver *drv, struct = uart_port *uport) tty_port_set_suspended(port, false); } =20 - mutex_unlock(&port->mutex); - return 0; } EXPORT_SYMBOL(uart_resume_port); --=20 2.46.0 From nobody Fri Dec 19 20:32:45 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E97018B47E; Thu, 8 Aug 2024 10:35:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113358; cv=none; b=HYcWpxuSJtMJ09ewhpGjhFWC6GRR82vNU/4exwjk7qtmMQxWcTUb9wdz7vTgRwOItylxpzwfryOjsZVp59ewYff0BBbn8hHPwO34WfjheQPeou1ljxqP0spR2l4UUI8WBkcoUWaxSFFZ/aE4wNCjrLkAmDt2V66kyViapilB8bM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113358; c=relaxed/simple; bh=gJTxTjqmJCVhdU9++PAKLolxpY0IlAQM2n9t5U9kci0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s5tb4E0r3S0wZMxTbfcdPinft1SSe49rxFGZNl2EnDAMHGWyL0R6hQL/Wmp/1gC5F7qbqPJwYpclj7h5VXf0Ah0qpOZBU8h+/HZ8gM+9/KjtM5y9KPRqgkjKZUmV7apQ39EXV9UQc9OVaK4LeaKQZiKAO5ZUm/EQf/UAp8KO3cw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=U8us/cGW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="U8us/cGW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5634C32782; Thu, 8 Aug 2024 10:35:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723113357; bh=gJTxTjqmJCVhdU9++PAKLolxpY0IlAQM2n9t5U9kci0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U8us/cGWgdDVgFmiMzR8gXC4HkXz6ECM6C7sY/ja0yKNPqft2tCyubr9veZGuUSQ8 QVoUKkU39bhttzcXjFzJGwC5jbgIICj3OIdFOJnnxEkaY9KnRi/fTGY0mOpcuAqUW+ Oe6Q79Nh8mMzfZmTgPWqYwW4m6HMK3/NvXcJaK/wzWbdyim6wX/G70ubTFJ0FYHWFb 7voGsoJtACM5gRsEFDBPgq0dAIELu80Z6tD6gh/qnV4ZblOdxE3mwoDw0rNOhyDbSY yb7xJlID4kMojTCmm+YzUw2/xqp0QWgIV0eJHS415DvUYZAV/91zCNYS73BagDX77n 1+YJ1+T4TCLQg== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" Subject: [PATCH v2 02/11] mxser: remove stale comment Date: Thu, 8 Aug 2024 12:35:38 +0200 Message-ID: <20240808103549.429349-3-jirislaby@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240808103549.429349-1-jirislaby@kernel.org> References: <20240808103549.429349-1-jirislaby@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The comment mentions ISA removed long time ago. It also comments on .driver_data pointing to above structures. That is not true either. Remove that. Signed-off-by: Jiri Slaby (SUSE) Cc: Greg Kroah-Hartman --- drivers/tty/mxser.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c index 5b97e420a95f..9a9a67b5afa0 100644 --- a/drivers/tty/mxser.c +++ b/drivers/tty/mxser.c @@ -208,9 +208,6 @@ static const struct { }; #define UART_INFO_NUM ARRAY_SIZE(Gpci_uart_info) =20 - -/* driver_data correspond to the lines in the structure above - see also ISA probe function before you change something */ static const struct pci_device_id mxser_pcibrds[] =3D { { PCI_DEVICE_DATA(MOXA, C168, 8) }, { PCI_DEVICE_DATA(MOXA, C104, 4) }, --=20 2.46.0 From nobody Fri Dec 19 20:32:45 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9A59618C32B; Thu, 8 Aug 2024 10:35:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113359; cv=none; b=QVaOeuuhKD4hyVDwWQboz1lFJHymDjdXj8tRORvJgJgZ5dKV/ndwV/wcxuaCCZXgYjba5fpySoVqsJKzF5ukFGdZpLh3M1nbP7PUy3vEdVM9IfajKxBjPW1I/Nnje4rY3lWd0qhrB2u3d1xYpKSccBMVvqBdOQpOocFMwNZztqo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113359; c=relaxed/simple; bh=snzCKqe+A40N2hgIp+p7f4DkpzeZjbNgpbd31jwyFAg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e5XcCuM5ebldhYm8pVFfsjGX7AEvL1HB7rGpyzX4cnCm/XXA7ek+h9wWBfutycGJADC7NVRRHerOjBKqN2CdNoutrisy/tjWIwZN7EfK8xM9/OtZ1PhkC6shhwObmVGHaMeOIGPiLH0Hz5YN3Knv97dQbk+DpZrfVLS0crqnwl8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mG6MnsmA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mG6MnsmA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5F031C4AF0D; Thu, 8 Aug 2024 10:35:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723113359; bh=snzCKqe+A40N2hgIp+p7f4DkpzeZjbNgpbd31jwyFAg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mG6MnsmAG2rzatOz9brZuHPFBX3y9cKapmapNTGdOD+vkmmiLh5BsZH7tEhAZJIhI 5jjYKmnlJEflr+ioskHQ+CYDt6SKdKjAlXiYzSIDB4vUpOYAXnJuY5e5LNCHT3NCr6 0+kS6M8/WMsDezl+LQ8JmfUg5AKN9rDsppvk/0AwwnmrPKYbu0ZymSS+54wBe4A8H7 0GjKUtOwndkAjzDW9jdVlGmoXEEL3fo8sc0bRlO3YajmHdgZ/ox0XVLzMct1Gj2NtF i1ppb95KmfbpDqUVXa/V26uAYwUz5iotcD7XmYbAExg0wQAvOYHCxBcuAfzQNmkkwT 0Odev3/CYVNsw== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" Subject: [PATCH v2 03/11] mxser: remove doubled sets of close times Date: Thu, 8 Aug 2024 12:35:39 +0200 Message-ID: <20240808103549.429349-4-jirislaby@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240808103549.429349-1-jirislaby@kernel.org> References: <20240808103549.429349-1-jirislaby@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" tty_port::close_delay and ::closing_wait are set in tty_port_init() few lines above already, no need to reset them (to the same values). Signed-off-by: Jiri Slaby (SUSE) Cc: Greg Kroah-Hartman --- drivers/tty/mxser.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c index 9a9a67b5afa0..6cfef88a18e3 100644 --- a/drivers/tty/mxser.c +++ b/drivers/tty/mxser.c @@ -1770,8 +1770,6 @@ static void mxser_initbrd(struct mxser_board *brd, bo= ol high_baud) =20 mxser_process_txrx_fifo(info); =20 - info->port.close_delay =3D 5 * HZ / 10; - info->port.closing_wait =3D 30 * HZ; spin_lock_init(&info->slock); =20 /* before set INT ISR, disable all int */ --=20 2.46.0 From nobody Fri Dec 19 20:32:45 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C3E9B18C357; Thu, 8 Aug 2024 10:36:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113361; cv=none; b=hIQrHrtw3IAUhomVbNtj+pOPRThrKspkYJTPwDHZePYUcsvQ6Dq7Oj+UApL1kR2JPy5HfVZMpPT+ajIey6ynBrXvlZxn1f4w0pVshQ9+XGYz2UOeE0XPKmk0EAlOuN4hqrQ7vSjlrRiLPUmHUhji4K6G0RKpOMxPSGOSuCG7YJY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113361; c=relaxed/simple; bh=X6/kBkEjHc/F/C9MNeI0wvDAMhnS3BamehrQ2Uf7rmc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P9bUk1DEAjWG5c3xcloMB9HGBfgFAj5JwfO5FtEitSTQ6HPXMIS0gex0PFYcpzlYBoTxQHZns6RqlDZLro39GwyLeewS+zbqOToNscAEVbYQbwL1ipEp1PIFl6yxIUzCdMPIjC0952VZ0aGNXTGeDzY3DRkYrbVznnnWsGwfQ/s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Vv4c3W8q; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Vv4c3W8q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6C86C4AF0E; Thu, 8 Aug 2024 10:35:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723113361; bh=X6/kBkEjHc/F/C9MNeI0wvDAMhnS3BamehrQ2Uf7rmc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vv4c3W8qupRyUobgJwFY3BT22gSLSqhPfOrh2ezWbFsDrEI1lE4kp/dfvGtYjpzA7 MGNQaqKDJPTCgLZzXCjlkxDTvIJ9C9i9fENgJuQWCqxTqHWGxx2/j1XP3mb4uXHY7C utG//gZCJ8l7/+bTqFk09SiD3s0hEBCPUir07Ne1CpreO5r4FvuS43DJtx4IpDcKQ3 aWq3qgK/kaWeBxtBV6txESoXabdpxDJiOpFG3b+EbFiP2URVKzUJkR6j3jgdHDMM0K msO74UzQSjicHK8TjDQrbWo5gggEGQmJm4WK3uTnxLv64bw51EQymlBK/WGjoPxpkS aAA274cMhWrfw== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Mathias Nyman , linux-usb@vger.kernel.org Subject: [PATCH v2 04/11] xhci: dbgtty: remove kfifo_out() wrapper Date: Thu, 8 Aug 2024 12:35:40 +0200 Message-ID: <20240808103549.429349-5-jirislaby@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240808103549.429349-1-jirislaby@kernel.org> References: <20240808103549.429349-1-jirislaby@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There is no need to check against kfifo_len() before kfifo_out(). Just ask the latter for data and it tells how much it retrieved. Or returns 0 in case there are no more. Signed-off-by: Jiri Slaby (SUSE) Cc: Mathias Nyman Cc: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org --- drivers/usb/host/xhci-dbgtty.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/usb/host/xhci-dbgtty.c b/drivers/usb/host/xhci-dbgtty.c index b74e98e94393..64ea96494997 100644 --- a/drivers/usb/host/xhci-dbgtty.c +++ b/drivers/usb/host/xhci-dbgtty.c @@ -24,19 +24,6 @@ static inline struct dbc_port *dbc_to_port(struct xhci_d= bc *dbc) return dbc->priv; } =20 -static unsigned int -dbc_send_packet(struct dbc_port *port, char *packet, unsigned int size) -{ - unsigned int len; - - len =3D kfifo_len(&port->write_fifo); - if (len < size) - size =3D len; - if (size !=3D 0) - size =3D kfifo_out(&port->write_fifo, packet, size); - return size; -} - static int dbc_start_tx(struct dbc_port *port) __releases(&port->port_lock) __acquires(&port->port_lock) @@ -49,7 +36,7 @@ static int dbc_start_tx(struct dbc_port *port) =20 while (!list_empty(pool)) { req =3D list_entry(pool->next, struct dbc_request, list_pool); - len =3D dbc_send_packet(port, req->buf, DBC_MAX_PACKET); + len =3D kfifo_out(&port->write_fifo, req->buf, DBC_MAX_PACKET); if (len =3D=3D 0) break; do_tty_wake =3D true; --=20 2.46.0 From nobody Fri Dec 19 20:32:45 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A179E18C924; Thu, 8 Aug 2024 10:36:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113363; cv=none; b=LzBZ1ZEEzkqjvDwvpDkKMTTSMjW0kCwdqKH+wl2CnUuwyRb5eImz4gXtgjUa4CFxFJtq6r0Ugx+eaSK44evNrK08YKgD4+7kl6+aoVVBPfOdzcg1ahnLg0CkZk2KUQCX0nNtAPwejYh0WyA7WErNQIdStCRUzMhIHbLlq97pzzQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113363; c=relaxed/simple; bh=XWddVIUVs64O2VaGFdrKd+syIozG4HiWv3XzURvonsg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sCOfP0Eq2tP+CMdYvnzOsTFC5OnuevdWMnR6Fm3hksURLNPDdolxjDVyiGQELUfJsxppToDkp1uGaIULXaS0v45ljFIcKw3ZTMGHiuKBBQhfX2m3VlOTsWIT6cykRPxhhdzEbL7tDdnsqImMJsH9lOMz5e1IGpcrVqKY3YGjsng= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BWt9A5u0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BWt9A5u0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB9E5C4AF09; Thu, 8 Aug 2024 10:36:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723113363; bh=XWddVIUVs64O2VaGFdrKd+syIozG4HiWv3XzURvonsg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BWt9A5u05MmzjOnl6yls5dC7en3fGxavqAhc7HUdEHE08sqWWSwWYpmve60+lnxD8 bLNtvyufrtHnY1mKYMGxmHbh28XzpGoYTEZZgRalF0xRx1dK5AF7nlBaVYcUO14yEK HM5aOC+J+Vaj2EVD4mKKPjmKrpmpdTRI/G1H62hwpLhBJ/W32Ef0rUheP7VrJ13JJm SbcQ3cJCzpVOxh+SZ3S/8gP8RYugG/m5NLwAnMqMqaZDzNu4zB6cbKu6aUXCup8EMS VVZ2wayV85ORKh3vGZKl9+AzgjYRl0DLNDZYlzgr76qLpVckCK2MnplsajXjrQ3GPC kZYC0gtuHrz/A== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Mathias Nyman , linux-usb@vger.kernel.org Subject: [PATCH v2 05/11] xhci: dbgtty: use kfifo from tty_port struct Date: Thu, 8 Aug 2024 12:35:41 +0200 Message-ID: <20240808103549.429349-6-jirislaby@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240808103549.429349-1-jirislaby@kernel.org> References: <20240808103549.429349-1-jirislaby@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There is no need to define one in a custom structure. The tty_port one is free to use. Signed-off-by: Jiri Slaby (SUSE) Cc: Mathias Nyman Cc: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org --- drivers/usb/host/xhci-dbgcap.h | 1 - drivers/usb/host/xhci-dbgtty.c | 17 +++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/usb/host/xhci-dbgcap.h b/drivers/usb/host/xhci-dbgcap.h index 0118c6288a3c..eab59d921e22 100644 --- a/drivers/usb/host/xhci-dbgcap.h +++ b/drivers/usb/host/xhci-dbgcap.h @@ -110,7 +110,6 @@ struct dbc_port { struct tasklet_struct push; =20 struct list_head write_pool; - struct kfifo write_fifo; =20 bool registered; }; diff --git a/drivers/usb/host/xhci-dbgtty.c b/drivers/usb/host/xhci-dbgtty.c index 64ea96494997..881f5a7e6e0e 100644 --- a/drivers/usb/host/xhci-dbgtty.c +++ b/drivers/usb/host/xhci-dbgtty.c @@ -36,7 +36,7 @@ static int dbc_start_tx(struct dbc_port *port) =20 while (!list_empty(pool)) { req =3D list_entry(pool->next, struct dbc_request, list_pool); - len =3D kfifo_out(&port->write_fifo, req->buf, DBC_MAX_PACKET); + len =3D kfifo_out(&port->port.xmit_fifo, req->buf, DBC_MAX_PACKET); if (len =3D=3D 0) break; do_tty_wake =3D true; @@ -203,7 +203,7 @@ static ssize_t dbc_tty_write(struct tty_struct *tty, co= nst u8 *buf, =20 spin_lock_irqsave(&port->port_lock, flags); if (count) - count =3D kfifo_in(&port->write_fifo, buf, count); + count =3D kfifo_in(&port->port.xmit_fifo, buf, count); dbc_start_tx(port); spin_unlock_irqrestore(&port->port_lock, flags); =20 @@ -217,7 +217,7 @@ static int dbc_tty_put_char(struct tty_struct *tty, u8 = ch) int status; =20 spin_lock_irqsave(&port->port_lock, flags); - status =3D kfifo_put(&port->write_fifo, ch); + status =3D kfifo_put(&port->port.xmit_fifo, ch); spin_unlock_irqrestore(&port->port_lock, flags); =20 return status; @@ -240,7 +240,7 @@ static unsigned int dbc_tty_write_room(struct tty_struc= t *tty) unsigned int room; =20 spin_lock_irqsave(&port->port_lock, flags); - room =3D kfifo_avail(&port->write_fifo); + room =3D kfifo_avail(&port->port.xmit_fifo); spin_unlock_irqrestore(&port->port_lock, flags); =20 return room; @@ -253,7 +253,7 @@ static unsigned int dbc_tty_chars_in_buffer(struct tty_= struct *tty) unsigned int chars; =20 spin_lock_irqsave(&port->port_lock, flags); - chars =3D kfifo_len(&port->write_fifo); + chars =3D kfifo_len(&port->port.xmit_fifo); spin_unlock_irqrestore(&port->port_lock, flags); =20 return chars; @@ -411,7 +411,8 @@ static int xhci_dbc_tty_register_device(struct xhci_dbc= *dbc) goto err_idr; } =20 - ret =3D kfifo_alloc(&port->write_fifo, DBC_WRITE_BUF_SIZE, GFP_KERNEL); + ret =3D kfifo_alloc(&port->port.xmit_fifo, DBC_WRITE_BUF_SIZE, + GFP_KERNEL); if (ret) goto err_exit_port; =20 @@ -440,7 +441,7 @@ static int xhci_dbc_tty_register_device(struct xhci_dbc= *dbc) xhci_dbc_free_requests(&port->read_pool); xhci_dbc_free_requests(&port->write_pool); err_free_fifo: - kfifo_free(&port->write_fifo); + kfifo_free(&port->port.xmit_fifo); err_exit_port: idr_remove(&dbc_tty_minors, port->minor); err_idr: @@ -465,7 +466,7 @@ static void xhci_dbc_tty_unregister_device(struct xhci_= dbc *dbc) idr_remove(&dbc_tty_minors, port->minor); mutex_unlock(&dbc_tty_minors_lock); =20 - kfifo_free(&port->write_fifo); + kfifo_free(&port->port.xmit_fifo); xhci_dbc_free_requests(&port->read_pool); xhci_dbc_free_requests(&port->read_queue); xhci_dbc_free_requests(&port->write_pool); --=20 2.46.0 From nobody Fri Dec 19 20:32:45 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8116718CBEF; Thu, 8 Aug 2024 10:36:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113366; cv=none; b=QHJes9VTvTwFJ19yiSPWZHbudXkW1Ns4VTWptpQkLs+rZsNwHZXoYnvntQ1V2KrDM9SVaJCc4XE0p6Z9n7z9gOg5bNZK2eMLBiqJvWvmeUqur8CUakqCdGgyD/P31kEMCMMTAOQ2uXIl7FWV2AHXOMVe3o6G/8jjbS6KqN5uR1o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113366; c=relaxed/simple; bh=XMtS7BNBLhEAuyOCgzkGacTJE3MPL9++t9/+8In/5Vw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VO/l+y0tr4mdN+BEjvfMmjeUWy3z7qKqNCv0EyTWEGAXVD24Sgo40PAOO9kSlRtZWEF780Uinyp8NoRnjHdWtRI/RlxNFhRy0wqDlMHoxA0ShQ+TnMMSsdNQ9tvUtA3oY1to/npvD0GjPRwKjghUJLmJx/7xUd3FxX7s5sCENVY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jT4hN861; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jT4hN861" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AEB0AC4AF0D; Thu, 8 Aug 2024 10:36:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723113366; bh=XMtS7BNBLhEAuyOCgzkGacTJE3MPL9++t9/+8In/5Vw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jT4hN8619cQ3Q6bDgfAaSHdLt1SK/2IahR36hh7yUXRPGTTjw/TSwkNoT1+ehi562 iFXRTEJRRtyfxaxYOcDpFiKCtlrF+PcvwYuWLLkbe2U/Ulpze+L+MyZkYUgUpL29oO o8I+o/OXIwGpcitCHKIiJb9yk237grDSecLBc7AyOp0Ryez3jLVdxeKwHMg+Amly9e genIxkal3CsuwJPg5HCxIvayLp1CL13RgPK6XEWQ30U4GWc6Sy22QI7/h3Q0tn/q9R 7eoRooIgHPAR6cDKs1hI7eTMy7V110AN3X4JTED6Xu2GTStp23Ajx73sBU1tLcMOYT XXmY/QVSiefsg== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Jeremy Kerr , Matt Johnston , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org Subject: [PATCH v2 06/11] mctp: serial: propagage new tty types Date: Thu, 8 Aug 2024 12:35:42 +0200 Message-ID: <20240808103549.429349-7-jirislaby@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240808103549.429349-1-jirislaby@kernel.org> References: <20240808103549.429349-1-jirislaby@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In tty, u8 is now used for data, ssize_t for sizes (with possible negative error codes). Propagate these types (and use unsigned in next_chunk_len()) to mctp. Signed-off-by: Jiri Slaby (SUSE) Reviewed-by: Jeremy Kerr Cc: Greg Kroah-Hartman Cc: Jeremy Kerr Cc: Matt Johnston Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: netdev@vger.kernel.org --- drivers/net/mctp/mctp-serial.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/net/mctp/mctp-serial.c b/drivers/net/mctp/mctp-serial.c index 5bf6fdff701c..78bd59b0930d 100644 --- a/drivers/net/mctp/mctp-serial.c +++ b/drivers/net/mctp/mctp-serial.c @@ -64,18 +64,18 @@ struct mctp_serial { u16 txfcs, rxfcs, rxfcs_rcvd; unsigned int txlen, rxlen; unsigned int txpos, rxpos; - unsigned char txbuf[BUFSIZE], + u8 txbuf[BUFSIZE], rxbuf[BUFSIZE]; }; =20 -static bool needs_escape(unsigned char c) +static bool needs_escape(u8 c) { return c =3D=3D BYTE_ESC || c =3D=3D BYTE_FRAME; } =20 -static int next_chunk_len(struct mctp_serial *dev) +static unsigned int next_chunk_len(struct mctp_serial *dev) { - int i; + unsigned int i; =20 /* either we have no bytes to send ... */ if (dev->txpos =3D=3D dev->txlen) @@ -99,7 +99,7 @@ static int next_chunk_len(struct mctp_serial *dev) return i; } =20 -static int write_chunk(struct mctp_serial *dev, unsigned char *buf, int le= n) +static ssize_t write_chunk(struct mctp_serial *dev, u8 *buf, size_t len) { return dev->tty->ops->write(dev->tty, buf, len); } @@ -108,9 +108,10 @@ static void mctp_serial_tx_work(struct work_struct *wo= rk) { struct mctp_serial *dev =3D container_of(work, struct mctp_serial, tx_work); - unsigned char c, buf[3]; unsigned long flags; - int len, txlen; + ssize_t txlen; + unsigned int len; + u8 c, buf[3]; =20 spin_lock_irqsave(&dev->lock, flags); =20 @@ -293,7 +294,7 @@ static void mctp_serial_rx(struct mctp_serial *dev) dev->netdev->stats.rx_bytes +=3D dev->rxlen; } =20 -static void mctp_serial_push_header(struct mctp_serial *dev, unsigned char= c) +static void mctp_serial_push_header(struct mctp_serial *dev, u8 c) { switch (dev->rxpos) { case 0: @@ -323,7 +324,7 @@ static void mctp_serial_push_header(struct mctp_serial = *dev, unsigned char c) } } =20 -static void mctp_serial_push_trailer(struct mctp_serial *dev, unsigned cha= r c) +static void mctp_serial_push_trailer(struct mctp_serial *dev, u8 c) { switch (dev->rxpos) { case 0: @@ -347,7 +348,7 @@ static void mctp_serial_push_trailer(struct mctp_serial= *dev, unsigned char c) } } =20 -static void mctp_serial_push(struct mctp_serial *dev, unsigned char c) +static void mctp_serial_push(struct mctp_serial *dev, u8 c) { switch (dev->rxstate) { case STATE_IDLE: @@ -394,7 +395,7 @@ static void mctp_serial_tty_receive_buf(struct tty_stru= ct *tty, const u8 *c, const u8 *f, size_t len) { struct mctp_serial *dev =3D tty->disc_data; - int i; + size_t i; =20 if (!netif_running(dev->netdev)) return; --=20 2.46.0 From nobody Fri Dec 19 20:32:45 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 57CE918CC16; Thu, 8 Aug 2024 10:36:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113369; cv=none; b=S2Jy8sZT4cZgPi7JKFIQxrE1BNnhIkr3v9eTgGPTFynJWeCfvQnMVnZlkacIZvYgx1rJbFYjFKEMDkexS2hwJFuGEi3O9Lxhrs3WwN4WOKI9aJpbMs+ZktryP4CaVAycFky1AiMcGTa+hC2WAGgkVsRmMhQ6Xr0qTitSA7ipmGI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113369; c=relaxed/simple; bh=/O2/TlWp3zMCUKUw2fsXXmxsmDVNGJDzCxv0rpypKf4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D5UfK8X/rj+JEKXXkRP78Ito+4NAQIOQS6SeGxWYvdCkvO3s2QZHJj8ryv/HCZe4sDFWn4Wl7Vrvf1E8GlhoA+9HppQniklE00SK7+Vg4mEl3aCWT0ZIj+AK8Teg+SZUK5qJFkrpcyYSnyae1Yok/VyAA8oJ3lPWo9B3scsIUMA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mdXVePb6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mdXVePb6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DD53C4AF0E; Thu, 8 Aug 2024 10:36:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723113368; bh=/O2/TlWp3zMCUKUw2fsXXmxsmDVNGJDzCxv0rpypKf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mdXVePb6Di/RNjoDYR5nYcSdStYML/nClj+vPvH71JFE8fbx2mLJZxbvmXmj8z4AY HpKn3mjVAD8VdATVmE6XhMdVr5Ow2LEDt12Y6P3zj73fnMwd7expUInpUi1gm35PDj VEJNsUyvWDCbd33bFyqL2BVrqsqTyzoOJQBZKCqVLX1rIP4wfDBSM+txgQocIO99tS bV1tiQdnqag99+u1NySc+u/PdFheuot0f0XvVHMU8/d0I/k7YjTuFCL/G8N8GW8C34 wPIoOb88vIHOQvAWGCpJJnjbV0RXTJ4HslocuTOpJ35W1GZGfPYa0d0LfS03WetjhQ NB0LwL0OGbJog== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Andreas Koensgen , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-hams@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v2 07/11] 6pack: remove sixpack::rbuff Date: Thu, 8 Aug 2024 12:35:43 +0200 Message-ID: <20240808103549.429349-8-jirislaby@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240808103549.429349-1-jirislaby@kernel.org> References: <20240808103549.429349-1-jirislaby@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It's unused (except allocation and free). Signed-off-by: Jiri Slaby (SUSE) Cc: Greg Kroah-Hartman Cc: Andreas Koensgen Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: linux-hams@vger.kernel.org Cc: netdev@vger.kernel.org --- drivers/net/hamradio/6pack.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 6ed38a3cdd73..29906901a734 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c @@ -88,7 +88,6 @@ struct sixpack { struct net_device *dev; /* easy for intr handling */ =20 /* These are pointers to the malloc()ed frame buffers. */ - unsigned char *rbuff; /* receiver buffer */ int rcount; /* received chars counter */ unsigned char *xbuff; /* transmitter buffer */ unsigned char *xhead; /* next byte to XMIT */ @@ -544,7 +543,7 @@ static inline int tnc_init(struct sixpack *sp) */ static int sixpack_open(struct tty_struct *tty) { - char *rbuff =3D NULL, *xbuff =3D NULL; + char *xbuff =3D NULL; struct net_device *dev; struct sixpack *sp; unsigned long len; @@ -574,10 +573,8 @@ static int sixpack_open(struct tty_struct *tty) =20 len =3D dev->mtu * 2; =20 - rbuff =3D kmalloc(len + 4, GFP_KERNEL); xbuff =3D kmalloc(len + 4, GFP_KERNEL); - - if (rbuff =3D=3D NULL || xbuff =3D=3D NULL) { + if (xbuff =3D=3D NULL) { err =3D -ENOBUFS; goto out_free; } @@ -586,7 +583,6 @@ static int sixpack_open(struct tty_struct *tty) =20 sp->tty =3D tty; =20 - sp->rbuff =3D rbuff; sp->xbuff =3D xbuff; =20 sp->mtu =3D AX25_MTU + 73; @@ -631,7 +627,6 @@ static int sixpack_open(struct tty_struct *tty) =20 out_free: kfree(xbuff); - kfree(rbuff); =20 free_netdev(dev); =20 @@ -676,7 +671,6 @@ static void sixpack_close(struct tty_struct *tty) del_timer_sync(&sp->resync_t); =20 /* Free all 6pack frame buffers after unreg. */ - kfree(sp->rbuff); kfree(sp->xbuff); =20 free_netdev(sp->dev); --=20 2.46.0 From nobody Fri Dec 19 20:32:45 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD12618DF83; Thu, 8 Aug 2024 10:36:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113371; cv=none; b=FQ9BtLP0lFPpr8wzaIZt8KCLgf34qYOzzUhQsvt/iAb1lDPHCYOanUJCjDpPed78fXU4Em2F/3kCfJTdOfTyubMV2uikq2nV/t7eV7bTaQ0eCP7REdcnjdaiBFtPQrWjVKm0erYJ69zINfzA4hV9oHxxsfkTbNKrsvefQhFjjNs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113371; c=relaxed/simple; bh=Y/kZ6pKUemi1ebXpTMHlyUEYKL9YeGqV57QiLnAlE98=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V7XcC7JPPNkX+h+z8nHvnkbOOts2AmMUXYjIbPCnqHkn1ekh+5exqtZanFf3U7QQ0ZbJTiP1GTve4Qbh4A2N4gZFEGVhFs6MHGqVuGRgUKUbvF/KmxgseRaNycPRAjUH10G/ajGIb2sG20FXx+yOki5r9Y5NF+wmooGWkIUoXqA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=It5DTZ7l; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="It5DTZ7l" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C7F2C4AF0D; Thu, 8 Aug 2024 10:36:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723113371; bh=Y/kZ6pKUemi1ebXpTMHlyUEYKL9YeGqV57QiLnAlE98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=It5DTZ7l/sA5ueD/unBsBOvGe19RYLsCYi+EtQwfEWNjolcw6/KF8r0KHDJd7S+Ro ObKgy0j2U2OUvPYa2Hag9OSr4mpqjV6i39V/zaQTGH/sCfZA0Fje+JKMElUmWwKgQs MSsNFCtZzX7keFFx+FCh82H9SE41Kko/rZ3TPb3i1fk+vRzb9Yn3S16CuIdt8IRXWa kvcIC4iVZ4J5x2sV4yZNBlva39jbLZjp2/V7hJy9o2iyXhhV2A2TeKxroTzeOtWQ3R UEdGCHD9cNqu0iajGfKB6XI6Fz0xEqLHg5tHazqlq7e7o3rSp0lOSjNoFxznEND7rY xkKAC1+LcBi8w== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Andreas Koensgen , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-hams@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v2 08/11] 6pack: drop sixpack::mtu Date: Thu, 8 Aug 2024 12:35:44 +0200 Message-ID: <20240808103549.429349-9-jirislaby@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240808103549.429349-1-jirislaby@kernel.org> References: <20240808103549.429349-1-jirislaby@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It holds a constant (AX25_MTU + 73), so use that constant in place of the single use directly. And remove the stale comment. Signed-off-by: Jiri Slaby (SUSE) Cc: Greg Kroah-Hartman Cc: Andreas Koensgen Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: linux-hams@vger.kernel.org Cc: netdev@vger.kernel.org --- drivers/net/hamradio/6pack.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 29906901a734..f8235b1b60e9 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c @@ -100,7 +100,6 @@ struct sixpack { unsigned int rx_count_cooked; spinlock_t rxlock; =20 - int mtu; /* Our mtu (to spot changes!) */ int buffsize; /* Max buffers sizes */ =20 unsigned long flags; /* Flag values/ mode etc */ @@ -166,7 +165,7 @@ static void sp_encaps(struct sixpack *sp, unsigned char= *icp, int len) unsigned char *msg, *p =3D icp; int actual, count; =20 - if (len > sp->mtu) { /* sp->mtu =3D AX25_MTU =3D max. PACLEN =3D 256 */ + if (len > AX25_MTU + 73) { msg =3D "oversized transmit packet!"; goto out_drop; } @@ -585,7 +584,6 @@ static int sixpack_open(struct tty_struct *tty) =20 sp->xbuff =3D xbuff; =20 - sp->mtu =3D AX25_MTU + 73; sp->buffsize =3D len; sp->rcount =3D 0; sp->rx_count =3D 0; --=20 2.46.0 From nobody Fri Dec 19 20:32:45 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D60A918E04B; Thu, 8 Aug 2024 10:36:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113375; cv=none; b=SGBoixLieHBlsHQZ5wks7FpARuVdoYsO9glVhLlTd23Tiq4uQhqg+d/ocki3dFPirLUl+gccmRc49XZqL6gnIori7wLBxRWKA+r5CD9vHINwKDLuHJnEZBq6zSipb0uE6R54ODvF0xX32MtFnOoB+9ZMq37/bQfNtMEgwtgWZx0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113375; c=relaxed/simple; bh=/bx8JyDtijw2rJHtb+tZ3h5JPdq8AmW/Z7d+AJaqE4k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YySURA2Fcw+4QL6FKCZSSqByfYEOSQ+ksFJ0G7hFIA0z0IEpQfTSqwS/woD79+aZAxcU7JVktd0Megy2rqEwM8YyIZyuyjDrNPZLzy3y09tLlJExvn4kKW/2OIuUyla+krhtCgX0J9Uf8w/KAF/dofHL+dgl4Fr93eHJML+Z+QA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lWKmgYYM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="lWKmgYYM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1CA52C4AF10; Thu, 8 Aug 2024 10:36:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723113374; bh=/bx8JyDtijw2rJHtb+tZ3h5JPdq8AmW/Z7d+AJaqE4k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lWKmgYYMINBEXwVwfECdApHcr2t7E+C73AZJtQq0SJjGodndd+Tj/eK6GNoirpMzU aDmSf5Vz5isrbjOWEa7ZvLGIfMgzgmTggzgUDPsOYhXuBPBwXSOdG+2AlpBq362IHr NA8qbvYkgSvCIhU5XTxL/7dXfCD4uRohELQz7E7Iu/1BhgG1vD31CuNVfB99l8ACzA 65IzARmQbPCfzGkCgawMAEbce66WAA62jg5JjT9LARLgl4w9Vg2K21g15uqXBNaSdM 7q81tHqALjgcLrX4aX0CLMvBBIKMB80b9ag2pNG7MSOoOcv/0Z5RvSHbSDMa0BYdCv REkggDy4pl3ag== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Andreas Koensgen , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-hams@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v2 09/11] 6pack: drop sixpack::buffsize Date: Thu, 8 Aug 2024 12:35:45 +0200 Message-ID: <20240808103549.429349-10-jirislaby@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240808103549.429349-1-jirislaby@kernel.org> References: <20240808103549.429349-1-jirislaby@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It's never read. Signed-off-by: Jiri Slaby (SUSE) Cc: Greg Kroah-Hartman Cc: Andreas Koensgen Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: linux-hams@vger.kernel.org Cc: netdev@vger.kernel.org --- drivers/net/hamradio/6pack.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index f8235b1b60e9..25d6d2308130 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c @@ -100,8 +100,6 @@ struct sixpack { unsigned int rx_count_cooked; spinlock_t rxlock; =20 - int buffsize; /* Max buffers sizes */ - unsigned long flags; /* Flag values/ mode etc */ unsigned char mode; /* 6pack mode */ =20 @@ -584,7 +582,6 @@ static int sixpack_open(struct tty_struct *tty) =20 sp->xbuff =3D xbuff; =20 - sp->buffsize =3D len; sp->rcount =3D 0; sp->rx_count =3D 0; sp->rx_count_cooked =3D 0; --=20 2.46.0 From nobody Fri Dec 19 20:32:45 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A5D718E76E; Thu, 8 Aug 2024 10:36:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113377; cv=none; b=cUhiG4nPdnUj9bKtl94hK/ADIGJYtfjPoJQv8rVJAKfa9Gi2lwgscVq2FYif0pSY9z3x+imYS9bcXhDElgRmMgpKrHR3yb9n93FSm7ey4xBUFPYOL9jMEFrtVsxo+HGKrDfP0v1ZwAbK+ULBLeNaNqLpUZkvRCGDhcD8Ro7/6F0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113377; c=relaxed/simple; bh=NHQzYLisZFxJp8w+mTR6u58VzbcedQc9/+93I90ZlQo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ud48QEOGK7wOzUUZ6vtGGyC4ilXMmy1ABBH2pg+GY28xk3ethfGGT2znxZhuHn30U6MG47u3yV/GWL6/dYMgTXYgi1mf90boWBlerDMCrAX4580Qinj7oc0AtdNrdjRlvAf+mcGtm9c+wSB0q+3z8pjJPUsj397OP1uGmR4ZeVM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hAb341py; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hAb341py" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF896C4AF09; Thu, 8 Aug 2024 10:36:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723113377; bh=NHQzYLisZFxJp8w+mTR6u58VzbcedQc9/+93I90ZlQo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hAb341pyz+s3nsD9kdJ+a1lrA9XhPOHcA+Q1GrOBSymsTz8PUfOvAX6T688hI92WX a9aqjjM9xLG2A1NCfIDwVTnySxf8vq30c+vrDdZQoiP2hROcp/5ZdMc7CLAGdEpi9X Gr9AroIuK1TUkwayLuMNwhTD5sb8T/bNDe/yafhO2xEyW9wz6QDIuZbQfnT0O0KB3H 4oofAT6T6PDxKF5gAs9+YieGSOWDy/q2m65AgJhL5Exvg8KpuJK+4Y+TbbLE1YoXVm yxGiflXt1NHpNflv3k80wfKuk02g+Px1gHjWdxYQPhSNiPvY/C8U8dtR80geEOucE6 q1JVun6kUN3Zw== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Andreas Koensgen , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-hams@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v2 10/11] 6pack: remove global strings Date: Thu, 8 Aug 2024 12:35:46 +0200 Message-ID: <20240808103549.429349-11-jirislaby@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240808103549.429349-1-jirislaby@kernel.org> References: <20240808103549.429349-1-jirislaby@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" They are __init, so they are freed after init is done. But this obfuscates the code. Provided these days, we usually don't print anything if everything has gone fine, drop the info print completely (along with now unused and always artificial SIXPACK_VERSION). And move the other string into the printk proper (while converting from KERN_ERR to pr_err()). Signed-off-by: Jiri Slaby (SUSE) Cc: Greg Kroah-Hartman Cc: Andreas Koensgen Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: linux-hams@vger.kernel.org Cc: netdev@vger.kernel.org --- drivers/net/hamradio/6pack.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 25d6d2308130..5c47730f5d58 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c @@ -37,8 +37,6 @@ #include #include =20 -#define SIXPACK_VERSION "Revision: 0.3.0" - /* sixpack priority commands */ #define SIXP_SEOF 0x40 /* start and end of a 6pack frame */ #define SIXP_TX_URUN 0x48 /* transmit overrun */ @@ -745,21 +743,14 @@ static struct tty_ldisc_ops sp_ldisc =3D { =20 /* Initialize 6pack control device -- register 6pack line discipline */ =20 -static const char msg_banner[] __initconst =3D KERN_INFO \ - "AX.25: 6pack driver, " SIXPACK_VERSION "\n"; -static const char msg_regfail[] __initconst =3D KERN_ERR \ - "6pack: can't register line discipline (err =3D %d)\n"; - static int __init sixpack_init_driver(void) { int status; =20 - printk(msg_banner); - /* Register the provided line protocol discipline */ status =3D tty_register_ldisc(&sp_ldisc); if (status) - printk(msg_regfail, status); + pr_err("6pack: can't register line discipline (err =3D %d)\n", status); =20 return status; } --=20 2.46.0 From nobody Fri Dec 19 20:32:45 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2CDD918EFE1; Thu, 8 Aug 2024 10:36:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113380; cv=none; b=tioPH1CT/erDfCeqA5tBLyVDHC/9zkyBRG6ZR5rnYUFr20khtx3cW3ZysrNMTACh2BQaTuvPU5jMojiP7siuoEbe5sVAYlJkoxxMoMWPV3GjVf7wj9w9HFCNyV7FhhpkijQ8vtwM3BEUtgVNf3dM3CyUb+zJ1JQFttW1YptmA/0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723113380; c=relaxed/simple; bh=UTNt9b26mQWZHW0TPCLWfErk9+9NMWIJfFgYZHzW/Wc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tCdnhCXImR0+2NhAuAqHGwztqH6Bc7mNlLj863EwuODJCm+5coU4+FufXIEHcXsCEEqIObb61EmZoKvFMhNTU8FF+qvS3+QHIntmAWcmeLuAMDFNR5yWW7me6+YSuqaZzGUqaL3NuHU0tiFkGOemOSW8YNj3HRc9CVmLdwF/Y5k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CUwEiCit; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CUwEiCit" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF329C4AF0D; Thu, 8 Aug 2024 10:36:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723113380; bh=UTNt9b26mQWZHW0TPCLWfErk9+9NMWIJfFgYZHzW/Wc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CUwEiCitYIylr+5M3jrp3Z4J6CVEe0QMsRIGkFBkeQdlaSs3DNpxanZp2rKJpZEAg 86VjNof4pa2exOOEVqzYb+RuhPyrYKTcVE+ybGmXrf/2FEhuqgzq4qqVHef26RYbmD ls5f3rc/QpInIpT77cXA4vBRrEewr0Z/Y+43I6sjwSo92NTIcby/rlEowntvB6qtfF AYgTv4c9xJfx5RBP9Msb1ho8zBhazogkceD4cTnmUfbH0uwONNHregoWOZxdIwJegP U1gsnfOcfcXdZI5lBjCdcF0TZ0ezM3PybP00MtSF9rNVDXx4H0u9ujun5nIhwNSZtX HTVsiJnmLhgCA== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Andreas Koensgen , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-hams@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v2 11/11] 6pack: propagage new tty types Date: Thu, 8 Aug 2024 12:35:47 +0200 Message-ID: <20240808103549.429349-12-jirislaby@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240808103549.429349-1-jirislaby@kernel.org> References: <20240808103549.429349-1-jirislaby@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In tty, u8 is now used for data, ssize_t for sizes (with possible negative error codes). Propagate these types to 6pack. Signed-off-by: Jiri Slaby (SUSE) Cc: Greg Kroah-Hartman Cc: Andreas Koensgen Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: linux-hams@vger.kernel.org Cc: netdev@vger.kernel.org --- drivers/net/hamradio/6pack.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 5c47730f5d58..3bf6785f9057 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c @@ -91,8 +91,8 @@ struct sixpack { unsigned char *xhead; /* next byte to XMIT */ int xleft; /* bytes left in XMIT queue */ =20 - unsigned char raw_buf[4]; - unsigned char cooked_buf[400]; + u8 raw_buf[4]; + u8 cooked_buf[400]; =20 unsigned int rx_count; unsigned int rx_count_cooked; @@ -107,8 +107,8 @@ struct sixpack { unsigned char slottime; unsigned char duplex; unsigned char led_state; - unsigned char status; - unsigned char status1; + u8 status; + u8 status1; unsigned char status2; unsigned char tx_enable; unsigned char tnc_state; @@ -122,7 +122,7 @@ struct sixpack { =20 #define AX25_6PACK_HEADER_LEN 0 =20 -static void sixpack_decode(struct sixpack *, const unsigned char[], int); +static void sixpack_decode(struct sixpack *, const u8 *, size_t); static int encode_sixpack(unsigned char *, unsigned char *, int, unsigned = char); =20 /* @@ -327,7 +327,7 @@ static void sp_bump(struct sixpack *sp, char cmd) { struct sk_buff *skb; int count; - unsigned char *ptr; + u8 *ptr; =20 count =3D sp->rcount + 1; =20 @@ -425,7 +425,7 @@ static void sixpack_receive_buf(struct tty_struct *tty,= const u8 *cp, const u8 *fp, size_t count) { struct sixpack *sp; - int count1; + size_t count1; =20 if (!count) return; @@ -800,9 +800,9 @@ static int encode_sixpack(unsigned char *tx_buf, unsign= ed char *tx_buf_raw, =20 /* decode 4 sixpack-encoded bytes into 3 data bytes */ =20 -static void decode_data(struct sixpack *sp, unsigned char inbyte) +static void decode_data(struct sixpack *sp, u8 inbyte) { - unsigned char *buf; + u8 *buf; =20 if (sp->rx_count !=3D 3) { sp->raw_buf[sp->rx_count++] =3D inbyte; @@ -828,9 +828,9 @@ static void decode_data(struct sixpack *sp, unsigned ch= ar inbyte) =20 /* identify and execute a 6pack priority command byte */ =20 -static void decode_prio_command(struct sixpack *sp, unsigned char cmd) +static void decode_prio_command(struct sixpack *sp, u8 cmd) { - int actual; + ssize_t actual; =20 if ((cmd & SIXP_PRIO_DATA_MASK) !=3D 0) { /* idle ? */ =20 @@ -878,9 +878,9 @@ static void decode_prio_command(struct sixpack *sp, uns= igned char cmd) =20 /* identify and execute a standard 6pack command byte */ =20 -static void decode_std_command(struct sixpack *sp, unsigned char cmd) +static void decode_std_command(struct sixpack *sp, u8 cmd) { - unsigned char checksum =3D 0, rest =3D 0; + u8 checksum =3D 0, rest =3D 0; short i; =20 switch (cmd & SIXP_CMD_MASK) { /* normal command */ @@ -928,10 +928,10 @@ static void decode_std_command(struct sixpack *sp, un= signed char cmd) /* decode a 6pack packet */ =20 static void -sixpack_decode(struct sixpack *sp, const unsigned char *pre_rbuff, int cou= nt) +sixpack_decode(struct sixpack *sp, const u8 *pre_rbuff, size_t count) { - unsigned char inbyte; - int count1; + size_t count1; + u8 inbyte; =20 for (count1 =3D 0; count1 < count; count1++) { inbyte =3D pre_rbuff[count1]; --=20 2.46.0