From patchwork Mon Jun 25 17:49:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: sjur.brandeland@stericsson.com X-Patchwork-Id: 167186 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C4E1BB6FAB for ; Tue, 26 Jun 2012 03:50:05 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754402Ab2FYRuA (ORCPT ); Mon, 25 Jun 2012 13:50:00 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:34031 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754298Ab2FYRt6 (ORCPT ); Mon, 25 Jun 2012 13:49:58 -0400 Received: by mail-lb0-f174.google.com with SMTP id gm6so6807265lbb.19 for ; Mon, 25 Jun 2012 10:49:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=FQMK1BaaJkYzKkr62AKS+Kb0D06e6Yx1Ouz3x5l9wHI=; b=eQXDgsrELbXpkRV3H9M0WNQWQmo1V+DCe8zir2BO0vYCBqO0Xs42JoUsbQXwrAz9zf TJxDzGWBAsZrf4qB+nMB3u6KOMeugrjeG9Rs4ZQq5axeVOBi1LWcy3tHmW27dGCRfrgh OPnDytP6FhS3PVnUZ939DUuPq0jFvpmgI2OHE5odZqg4S3TQYXF5mQzIrbFETaS9u8tZ PYumUvANn77oZ5fDHENYyEPaALUizMtwKG1Yd4MwhJz2crW8LrOliwl9KAf5O51Lflds W/WL15dvrubQv6GnIqvmFhusWM2sVQ/7nm57v+ubTgWRu+N7Co2kfVjJhl7nuD0GkjPR 9T9Q== Received: by 10.152.114.3 with SMTP id jc3mr13052971lab.11.1340646597572; Mon, 25 Jun 2012 10:49:57 -0700 (PDT) Received: from sjur-laptop.stericsson.local ([212.4.57.94]) by mx.google.com with ESMTPS id h9sm6809882lbi.9.2012.06.25.10.49.55 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 25 Jun 2012 10:49:56 -0700 (PDT) From: sjur.brandeland@stericsson.com To: davem@davemloft.net Cc: netdev@vger.kernel.org, sjurbren@gmail.com, Kim Lilliestierna XX , =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= Subject: [net-next 04/11] caif-hsi: Removed dead code Date: Mon, 25 Jun 2012 19:49:36 +0200 Message-Id: <1340646583-21059-5-git-send-email-sjur.brandeland@stericsson.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1340646583-21059-1-git-send-email-sjur.brandeland@stericsson.com> References: <1340646583-21059-1-git-send-email-sjur.brandeland@stericsson.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Kim Lilliestierna XX Simplify logic and remove dead code. Signed-off-by: Kim Lilliestierna Signed-off-by: Sjur Brændeland --- drivers/net/caif/caif_hsi.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c index 1520814..f81f61f 100644 --- a/drivers/net/caif/caif_hsi.c +++ b/drivers/net/caif/caif_hsi.c @@ -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 @@ -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; } }