Skip to content

Commit

Permalink
caif-hsi: Removed dead code
Browse files Browse the repository at this point in the history
Simplify logic and remove dead code.

Signed-off-by: Kim Lilliestierna <kim.xx.lilliestierna@stericsson.com>
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Kim Lilliestierna XX authored and David S. Miller committed Jun 25, 2012
1 parent f315fd3 commit 4e7bb59
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions drivers/net/caif/caif_hsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -680,12 +680,11 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
if (desc_pld_len < 0)
goto out_of_sync;

if (desc_pld_len > 0)
if (desc_pld_len > 0) {
rx_len = desc_pld_len;

if (desc_pld_len > 0 &&
(piggy_desc->header & CFHSI_PIGGY_DESC))
rx_len += CFHSI_DESC_SZ;
if (piggy_desc->header & CFHSI_PIGGY_DESC)
rx_len += CFHSI_DESC_SZ;
}

/*
* Copy needed information from the piggy-backed
Expand All @@ -695,8 +694,6 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
CFHSI_DESC_SHORT_SZ);
/* Mark no embedded frame here */
piggy_desc->offset = 0;
if (desc_pld_len == -EPROTO)
goto out_of_sync;
}
}

Expand Down

0 comments on commit 4e7bb59

Please sign in to comment.