serial: 8250: Fix mismerge regarding serial_lsr_in()
The relevant history introducing serial_lsr_in() looks as follows: $ git log --graph --oneline --boundary 9fafe733..df36f3e3 -- drivers/tty/serial/8250/8250_port.c * df36f3e3 Merge tag 'v5.19-rc3' into tty-next |\ | * be03b065 serial: 8250: Store to lsr_save_flags after lsr read * | ... * | bdb70c42 serial: 8250: Create serial_lsr_in() * | ce338e44 serial: 8250: Store to lsr_save_flags after lsr read * | ... |/ o 9fafe733 tty: remove CMSPAR ifdefs So the patch "serial: 8250: Store to lsr_save_flags after lsr read" was introduced twice and in one branch it was followed up by commit bdb70c42 ("serial: 8250: Create serial_lsr_in()") which moved explicit lsr_saved_flags handling into a new function serial_lsr_in(). When the two branches were merged in commit df36f3e3, we got both, serial_lsr_in() and the explicit lsr_saved_flags handling. So drop the explicit lsr_saved_flags handling. Signed-off-by:Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by:
Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Link: https://lore.kernel.org/r/20230202104501.264686-1-u.kleine-koenig@pengutronix.de Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Loading
Please sign in to comment