Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752145AbdLEUSj (ORCPT ); Tue, 5 Dec 2017 15:18:39 -0500 Received: from mx0a-00010702.pphosted.com ([148.163.156.75]:52906 "EHLO mx0b-00010702.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751416AbdLEUSg (ORCPT ); Tue, 5 Dec 2017 15:18:36 -0500 Date: Tue, 5 Dec 2017 14:18:30 -0600 From: Julia Cartwright To: Julia Lawall CC: Rafal Ozieblo , Nicolas Ferre , , , Subject: [PATCH 2/2] net: macb: kill useless use of list_empty() Message-ID: <20171205201830.GB18445@jcartwri.amer.corp.natinst.com> References: <20171205201711.GA18445@jcartwri.amer.corp.natinst.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20171205201711.GA18445@jcartwri.amer.corp.natinst.com> User-Agent: Mutt/1.9.1 (2017-09-22) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-12-05_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=inbound_policy_notspam policy=inbound_policy score=30 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=30 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1712050290 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2367 Lines: 71 The list_for_each_entry() macro already handles the case where the list is empty (by not executing the loop body). It's not necessary to handle this case specially, so stop doing so. Cc: Rafal Ozieblo Signed-off-by: Julia Cartwright --- This is an additional cleanup patch found when looking at this code. Julia drivers/net/ethernet/cadence/macb_main.c | 34 ++++++++++++-------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index e7ef104a077d..3643c6ad2322 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -2815,25 +2815,22 @@ static int gem_add_flow_filter(struct net_device *netdev, spin_lock_irqsave(&bp->rx_fs_lock, flags); /* find correct place to add in list */ - if (list_empty(&bp->rx_fs_list.list)) - list_add(&newfs->list, &bp->rx_fs_list.list); - else { - list_for_each_entry(item, &bp->rx_fs_list.list, list) { - if (item->fs.location > newfs->fs.location) { - list_add_tail(&newfs->list, &item->list); - added = true; - break; - } else if (item->fs.location == fs->location) { - netdev_err(netdev, "Rule not added: location %d not free!\n", - fs->location); - ret = -EBUSY; - goto err; - } + list_for_each_entry(item, &bp->rx_fs_list.list, list) { + if (item->fs.location > newfs->fs.location) { + list_add_tail(&newfs->list, &item->list); + added = true; + break; + } else if (item->fs.location == fs->location) { + netdev_err(netdev, "Rule not added: location %d not free!\n", + fs->location); + ret = -EBUSY; + goto err; } - if (!added) - list_add_tail(&newfs->list, &bp->rx_fs_list.list); } + if (!added) + list_add_tail(&newfs->list, &bp->rx_fs_list.list); + gem_prog_cmp_regs(bp, fs); bp->rx_fs_list.count++; /* enable filtering if NTUPLE on */ @@ -2859,11 +2856,6 @@ static int gem_del_flow_filter(struct net_device *netdev, spin_lock_irqsave(&bp->rx_fs_lock, flags); - if (list_empty(&bp->rx_fs_list.list)) { - spin_unlock_irqrestore(&bp->rx_fs_lock, flags); - return -EINVAL; - } - list_for_each_entry(item, &bp->rx_fs_list.list, list) { if (item->fs.location == cmd->fs.location) { /* disable screener regs for the flow entry */ -- 2.14.2