Patchwork isdn: remove dead code

login
register
mail settings
Submitter Alan Cox
Date Oct. 25, 2012, 2:30 p.m.
Message ID <20121025143031.16991.81337.stgit@localhost.localdomain>
Download mbox | patch
Permalink /patch/194184/
State Accepted
Delegated to: David Miller
Headers show

Comments

Alan Cox - Oct. 25, 2012, 2:30 p.m.
From: Alan Cox <alan@linux.intel.com>

multi is assigned to 0 and then acts as a constant. Remove the dead
code.

Signed-off-by: Alan Cox <alan@linux.intel.com>
---

 drivers/isdn/mISDN/l1oip_core.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Oct. 26, 2012, 7:47 a.m.
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Thu, 25 Oct 2012 15:30:52 +0100

> From: Alan Cox <alan@linux.intel.com>
> 
> multi is assigned to 0 and then acts as a constant. Remove the dead
> code.
> 
> Signed-off-by: Alan Cox <alan@linux.intel.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index db50f78..f8e405c 100644
--- a/drivers/isdn/mISDN/l1oip_core.c
+++ b/drivers/isdn/mISDN/l1oip_core.c
@@ -277,7 +277,6 @@  l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask,
 		  u16 timebase, u8 *buf, int len)
 {
 	u8 *p;
-	int multi = 0;
 	u8 frame[len + 32];
 	struct socket *socket = NULL;
 
@@ -317,9 +316,7 @@  l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask,
 		*p++ = hc->id >> 8;
 		*p++ = hc->id;
 	}
-	*p++ = (multi == 1) ? 0x80 : 0x00 + channel; /* m-flag, channel */
-	if (multi == 1)
-		*p++ = len; /* length */
+	*p++ =  0x00 + channel; /* m-flag, channel */
 	*p++ = timebase >> 8; /* time base */
 	*p++ = timebase;