Re: uplcom: remove dead code

2020-03-11 Thread Mark Kettenis
> Date: Wed, 11 Mar 2020 13:38:12 +0100
> From: Jasper Lievisse Adriaanse 
> 
> Hi,
> 
> Remove dead code which is actually duplicated a few lines above
> right after err is set. Coverity ID 975917
> 
> OK?

ok kettenis@

> Index: dev/usb/uplcom.c
> ===
> RCS file: /cvs/src/sys/dev/usb/uplcom.c,v
> retrieving revision 1.73
> diff -u -p -U11 -r1.73 uplcom.c
> --- dev/usb/uplcom.c  18 Nov 2018 16:23:14 -  1.73
> +++ dev/usb/uplcom.c  11 Mar 2020 12:36:03 -
> @@ -619,27 +619,22 @@ uplcom_param(void *addr, int portno, str
>   if (err) {
>   DPRINTF(("uplcom_param: err=%s\n", usbd_errstr(err)));
>   return (EIO);
>   }
>  
>   if (ISSET(t->c_cflag, CRTSCTS))
>   uplcom_set_crtscts(sc);
>  
>   if (sc->sc_rts == -1 || sc->sc_dtr == -1)
>   uplcom_set_line_state(sc);
>  
> - if (err) {
> - DPRINTF(("uplcom_param: err=%s\n", usbd_errstr(err)));
> - return (EIO);
> - }
> -
>   return (0);
>  }
>  
>  int
>  uplcom_open(void *addr, int portno)
>  {
>   struct uplcom_softc *sc = addr;
>   usb_device_request_t req;
>   usbd_status uerr;
>   int err;
>  
> 
> -- 
> jasper
> 
> 



uplcom: remove dead code

2020-03-11 Thread Jasper Lievisse Adriaanse
Hi,

Remove dead code which is actually duplicated a few lines above
right after err is set. Coverity ID 975917

OK?

Index: dev/usb/uplcom.c
===
RCS file: /cvs/src/sys/dev/usb/uplcom.c,v
retrieving revision 1.73
diff -u -p -U11 -r1.73 uplcom.c
--- dev/usb/uplcom.c18 Nov 2018 16:23:14 -  1.73
+++ dev/usb/uplcom.c11 Mar 2020 12:36:03 -
@@ -619,27 +619,22 @@ uplcom_param(void *addr, int portno, str
if (err) {
DPRINTF(("uplcom_param: err=%s\n", usbd_errstr(err)));
return (EIO);
}
 
if (ISSET(t->c_cflag, CRTSCTS))
uplcom_set_crtscts(sc);
 
if (sc->sc_rts == -1 || sc->sc_dtr == -1)
uplcom_set_line_state(sc);
 
-   if (err) {
-   DPRINTF(("uplcom_param: err=%s\n", usbd_errstr(err)));
-   return (EIO);
-   }
-
return (0);
 }
 
 int
 uplcom_open(void *addr, int portno)
 {
struct uplcom_softc *sc = addr;
usb_device_request_t req;
usbd_status uerr;
int err;
 

-- 
jasper