From patchwork Tue Jan 28 14:08:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 232621 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34C1AC2D0DB for ; Tue, 28 Jan 2020 14:29:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B8A52469B for ; Tue, 28 Jan 2020 14:29:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221796; bh=6lpWIcc88biLNAPyYFo1TaYDUDDhUz3rViWY/n2XOkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aBQGSvYsulX+mNFO4Z/OM5jepQ9wxbpxpaq6J17bXbYHf6rJKkRNTXFbtwNbEWARp znVjp92kz4UsK6sJbVcPfoQqx68OxAidsBAjNnAzrS8y7F6kswTc5htYqppNxFh1KB OnQsuqty9oCvEbVFjco6JzC0Xww47BRs1+bslW9M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387695AbgA1O3v (ORCPT ); Tue, 28 Jan 2020 09:29:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:58932 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387479AbgA1O3v (ORCPT ); Tue, 28 Jan 2020 09:29:51 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 620BD246A1; Tue, 28 Jan 2020 14:29:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221790; bh=6lpWIcc88biLNAPyYFo1TaYDUDDhUz3rViWY/n2XOkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eOL7jM06OcD1Kd2Lnd5a9HlAOCFul8+v2Cc7cJOrJN0aerEOoYrdskGSRVya0IFNE 4FC7aztm22c4eZwDeBEnvokndKcNA2wVsFQ+cAgYc2swkE2E7b9lsnhRC6fpU+J5kq bgkIB51jzAnvqLVSM/ypLdGPYYRRV32/fkyrf5JM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Wei Yang , Andrew Morton , "Rafael J. Wysocki" , Seth Jennings , Linus Torvalds , David Hildenbrand Subject: [PATCH 4.19 72/92] drivers/base/memory.c: remove an unnecessary check on NR_MEM_SECTIONS Date: Tue, 28 Jan 2020 15:08:40 +0100 Message-Id: <20200128135818.638247131@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135809.344954797@linuxfoundation.org> References: <20200128135809.344954797@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wei Yang commit 3b6fd6ffb27c2efa003c6d4d15ca72c054b71d7c upstream. In cb5e39b8038b ("drivers: base: refactor add_memory_section() to add_memory_block()"), add_memory_block() is introduced, which is only invoked in memory_dev_init(). When combining these two loops in memory_dev_init() and add_memory_block(), they looks like this: for (i = 0; i < NR_MEM_SECTIONS; i += sections_per_block) for (j = i; (j < i + sections_per_block) && j < NR_MEM_SECTIONS; j++) Since it is sure the (i < NR_MEM_SECTIONS) and j sits in its own memory block, the check of (j < NR_MEM_SECTIONS) is not necessary. This patch just removes this check. Link: http://lkml.kernel.org/r/20181123222811.18216-1-richard.weiyang@gmail.com Signed-off-by: Wei Yang Reviewed-by: Andrew Morton Cc: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" Cc: Seth Jennings Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: David Hildenbrand Signed-off-by: Greg Kroah-Hartman --- drivers/base/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -691,7 +691,7 @@ static int add_memory_block(int base_sec int i, ret, section_count = 0, section_nr; for (i = base_section_nr; - (i < base_section_nr + sections_per_block) && i < NR_MEM_SECTIONS; + i < base_section_nr + sections_per_block; i++) { if (!present_section_nr(i)) continue;