| Message ID | 20210114175718.137483-4-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | tty: some cleanups in remove functions | expand |
On 14. 01. 21, 18:57, Uwe Kleine-König wrote: > vcc_get() returns the port that has provided port->index. As the port that > is about to be removed isn't removed yet this trivially will find this > port. So simplify the call to not assign an identical value to the port > pointer and drop the warning that is never hit. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Jiri Slaby <jirislaby@kernel.org> > --- > drivers/tty/vcc.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/tty/vcc.c b/drivers/tty/vcc.c > index d9b0dc6deae9..e2d6205f83ce 100644 > --- a/drivers/tty/vcc.c > +++ b/drivers/tty/vcc.c > @@ -692,12 +692,9 @@ static int vcc_remove(struct vio_dev *vdev) > tty_vhangup(port->tty); > > /* Get exclusive reference to VCC, ensures that there are no other > - * clients to this port > + * clients to this port. This cannot fail. > */ > - port = vcc_get(port->index, true); > - > - if (WARN_ON(!port)) > - return -ENODEV; > + vcc_get(port->index, true); > > tty_unregister_device(vcc_tty_driver, port->index); > >
diff --git a/drivers/tty/vcc.c b/drivers/tty/vcc.c index d9b0dc6deae9..e2d6205f83ce 100644 --- a/drivers/tty/vcc.c +++ b/drivers/tty/vcc.c @@ -692,12 +692,9 @@ static int vcc_remove(struct vio_dev *vdev) tty_vhangup(port->tty); /* Get exclusive reference to VCC, ensures that there are no other - * clients to this port + * clients to this port. This cannot fail. */ - port = vcc_get(port->index, true); - - if (WARN_ON(!port)) - return -ENODEV; + vcc_get(port->index, true); tty_unregister_device(vcc_tty_driver, port->index);
vcc_get() returns the port that has provided port->index. As the port that is about to be removed isn't removed yet this trivially will find this port. So simplify the call to not assign an identical value to the port pointer and drop the warning that is never hit. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/tty/vcc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)