From patchwork Fri Dec 24 06:15:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 76610 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 326BCB70D6 for ; Fri, 24 Dec 2010 17:16:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751967Ab0LXGP4 (ORCPT ); Fri, 24 Dec 2010 01:15:56 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:64500 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750763Ab0LXGPz (ORCPT ); Fri, 24 Dec 2010 01:15:55 -0500 Received: by fxm20 with SMTP id 20so7691082fxm.19 for ; Thu, 23 Dec 2010 22:15:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=Mw6rj0SBpsWupMR2WGrH2MBrUAyU/UM7SDlG/lM4pTU=; b=rb3IQfdVQzEcMqPYJir/lajEiJxG2DfCDFAS/6X5uF4aPv7Ma4DLxKGWTYEH02YWSW U92xyq+b2Zfe5suAJ3s045ledWArlYcf6SEoNOpliJPYmdKiIAingLaDz4w9MnzTVuDf 0Q3tCV4tPacopZI8hpxQXjDp3dPaSzdT5gccE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=MPt17xHI1+Swlv6gq2I5EaMC92gpBp3FkVYt0jLwgZf6iG7Zp2m/WdJLH35ZpeX6UI GuYepGX5ryHSSR0zQzoyih9BUu+R27sI/aXEnBi3KHG5m1hBkZiMQDg7cR500oGU0KLC Alf9X9/NZbN1Dvb5Brb1WbujeGevT+GxMVTow= Received: by 10.223.102.67 with SMTP id f3mr8373833fao.125.1293171354088; Thu, 23 Dec 2010 22:15:54 -0800 (PST) Received: from bicker (h2d62.n1.ips.mtn.co.ug [41.210.173.98]) by mx.google.com with ESMTPS id y3sm2199370fai.14.2010.12.23.22.15.49 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 23 Dec 2010 22:15:53 -0800 (PST) Date: Fri, 24 Dec 2010 09:15:39 +0300 From: Dan Carpenter To: Ramkrishna Vepa Cc: Sivakumar Subramani , Sreenivasa Honnur , Jon Mason , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] vxge: remove duplicated part of check Message-ID: <20101224061539.GP1936@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is just a cleanup to make the static checkers happy. We don't need to check "own" twice. Signed-off-by: Dan Carpenter Acked-by: Ram Vepa --- 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 diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/vxge/vxge-traffic.c index 42cc298..4c10d6c 100644 --- a/drivers/net/vxge/vxge-traffic.c +++ b/drivers/net/vxge/vxge-traffic.c @@ -1240,7 +1240,7 @@ enum vxge_hw_status vxge_hw_ring_rxd_next_completed( *t_code = (u8)VXGE_HW_RING_RXD_T_CODE_GET(control_0); /* check whether it is not the end */ - if (!own || ((*t_code == VXGE_HW_RING_T_CODE_FRM_DROP) && own)) { + if (!own || *t_code == VXGE_HW_RING_T_CODE_FRM_DROP) { vxge_assert(((struct vxge_hw_ring_rxd_1 *)rxdp)->host_control != 0);