Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946202AbbEOVot (ORCPT ); Fri, 15 May 2015 17:44:49 -0400 Received: from mailrelay101.isp.belgacom.be ([195.238.20.128]:54559 "EHLO mailrelay101.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935015AbbEOVoZ (ORCPT ); Fri, 15 May 2015 17:44:25 -0400 X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=aVuRYB9jFzFsbHnyIO6WTXMsFsysg296qeRS+2aVNsk= c=1 sm=2 a=LuE2GQqKRU31B4bV9dsA:9 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DKDwCNZ1ZV/yMoQ1dcgxCBMrJiAQEBAQUBgQSYTQKBMU0BAQEBAQGBC0EDg18BAQQnLyMQUTkeGYgwAddMAQEBAQYihhaKKQcWhBcFnVSWfyNhgxk8MYJGAQEB From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Fabian Frederick , Artem Bityutskiy , Adrian Hunter , linux-mtd@lists.infradead.org Subject: [PATCH 6/6 linux-next] ubifs: remove else after return Date: Fri, 15 May 2015 23:44:00 +0200 Message-Id: <1431726240-4675-6-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 2.4.0 In-Reply-To: <1431726240-4675-1-git-send-email-fabf@skynet.be> References: <1431726240-4675-1-git-send-email-fabf@skynet.be> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1141 Lines: 38 simplify code in add_to_lpt_heap() Signed-off-by: Fabian Frederick --- fs/ubifs/lprops.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c index a0011aa..e1454cf 100644 --- a/fs/ubifs/lprops.c +++ b/fs/ubifs/lprops.c @@ -208,13 +208,12 @@ static int add_to_lpt_heap(struct ubifs_info *c, struct ubifs_lprops *lprops, } dbg_check_heap(c, heap, cat, -1); return 0; /* Not added to heap */ - } else { - lprops->hpos = heap->cnt++; - heap->arr[lprops->hpos] = lprops; - move_up_lpt_heap(c, heap, lprops, cat); - dbg_check_heap(c, heap, cat, lprops->hpos); - return 1; /* Added to heap */ } + lprops->hpos = heap->cnt++; + heap->arr[lprops->hpos] = lprops; + move_up_lpt_heap(c, heap, lprops, cat); + dbg_check_heap(c, heap, cat, lprops->hpos); + return 1; /* Added to heap */ } /** -- 2.4.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/