| Message ID | 20200911063503.152765-1-xie.he.0141@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] drivers/net/wan/x25_asy: Remove an unused flag "SLF_OUTWAIT" | expand |
From: Xie He <xie.he.0141@gmail.com> Date: Thu, 10 Sep 2020 23:35:03 -0700 > The "SLF_OUTWAIT" flag defined in x25_asy.h is not actually used. > It is only cleared at one place in x25_asy.c but is never read or set. > So we can remove it. > > Signed-off-by: Xie He <xie.he.0141@gmail.com> Applied, it looks like this code wss based upon the slip.c code.
On Fri, Sep 11, 2020 at 2:44 PM David Miller <davem@davemloft.net> wrote: > > From: Xie He <xie.he.0141@gmail.com> > Date: Thu, 10 Sep 2020 23:35:03 -0700 > > > The "SLF_OUTWAIT" flag defined in x25_asy.h is not actually used. > > It is only cleared at one place in x25_asy.c but is never read or set. > > So we can remove it. > > > > Signed-off-by: Xie He <xie.he.0141@gmail.com> > > Applied, it looks like this code wss based upon the slip.c code. Oh! You are right! I can finally understand now why there are so many things named "sl" in this file.
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c index 7ee980575208..5a7cf8bf9d0d 100644 --- a/drivers/net/wan/x25_asy.c +++ b/drivers/net/wan/x25_asy.c @@ -243,8 +243,6 @@ static void x25_asy_encaps(struct x25_asy *sl, unsigned char *icp, int len) actual = sl->tty->ops->write(sl->tty, sl->xbuff, count); sl->xleft = count - actual; sl->xhead = sl->xbuff + actual; - /* VSV */ - clear_bit(SLF_OUTWAIT, &sl->flags); /* reset outfill flag */ } /* diff --git a/drivers/net/wan/x25_asy.h b/drivers/net/wan/x25_asy.h index eb4a4216ee94..87798287c9ca 100644 --- a/drivers/net/wan/x25_asy.h +++ b/drivers/net/wan/x25_asy.h @@ -35,7 +35,6 @@ struct x25_asy { #define SLF_INUSE 0 /* Channel in use */ #define SLF_ESCAPE 1 /* ESC received */ #define SLF_ERROR 2 /* Parity, etc. error */ -#define SLF_OUTWAIT 4 /* Waiting for output */ };
The "SLF_OUTWAIT" flag defined in x25_asy.h is not actually used. It is only cleared at one place in x25_asy.c but is never read or set. So we can remove it. Signed-off-by: Xie He <xie.he.0141@gmail.com> --- drivers/net/wan/x25_asy.c | 2 -- drivers/net/wan/x25_asy.h | 1 - 2 files changed, 3 deletions(-)