From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mta1.migadu.com (out-141.mta1.migadu.com [95.215.58.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B516303A0D for ; Fri, 21 Aug 2026 03:32:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.141 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787283167; cv=none; b=k9uSlVYjrgiH0/uiGdXSPtBak2v2OFuXMaczjyp3jo6JOlJyKFPFm+177uFB6CeTc9YR9juKQ+V4MY9HGl2HaJ8XioaICsI7ivzCkd45x/sRgWl8wPwDirEOOY62yVdKkWQTEjJmSlcwxc4fgvd5G3DjtPPtBc5/YoJZe0Nh8ic= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787283167; c=relaxed/simple; bh=kBdCSAyi4kONaeB6a0YcYCGt5al3Yd9yiIHm97HUMa4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=BQUqs4Ij5p4hZljM/LH6BT/NOKfPd8FilkjuE9gLCuPDGvCFttTtgZoiUjdxcySy7Ocwrj66slKxdHQYt6RRhOreNIdPIAAjuDdtVFiJiEBxhqMI+t5trVDpjKzTKZY32EKvvGLxK6goaLe7CADpWP/zrydfRgicwwUUSP7mOso= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=Dbj129Ss; arc=none smtp.client-ip=95.215.58.141 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="Dbj129Ss" X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=kBdCSAyi4kONaeB6a0YcYCGt5al3Yd9yiIHm97HUMa4=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1787283162; v=1; x=1787887962; b=Dbj129SslkGBbU5+vvwfr3HoKJRZ/t3g0qi+hp8FMWiYhSSf+n0L8t1e8gZA8ySqFS6E82rv z7n0lYf+7XFpH+clitGV2DRQB2VianbwpVjgAzp5hWBF7RHB8O+FVG8QY92oMQG+Q0KqVdRO9X3 iEfGz1ihWWCH3Z+8hLjxu1Xg= X-Envelope-To: linux-kernel@vger.kernel.org Received: from localhost.localdomain (223.70.159.239) by smtp.migadu.com with ESMTPS id 154a81432023c6b1; Fri, 21 Aug 2026 03:32:42 +0000 X-Mizu-Trace-ID: 154a81432023c6b1 X-Migadu-Flow: FLOW_OUT From: Hongfu Li To: rppt@kernel.org, akpm@linux-foundation.org Cc: graf@amazon.com, pasha.tatashin@soleen.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, hongfu.li@linux.dev, Hongfu Li Subject: [PATCH] mm/memblock: simplify reserve_mem_init error handling Date: Fri, 21 Aug 2026 11:32:30 +0800 Message-ID: <20260821033230.55210-1-hongfu.li@linux.dev> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Hongfu Li Return prepare_kho_fdt() directly instead of assigning to a local and returning it on both success and failure paths. Signed-off-by: Hongfu Li --- mm/memblock.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index 777c69f05400..7079b93ec730 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -2616,15 +2616,10 @@ static int __init prepare_kho_fdt(void) static int __init reserve_mem_init(void) { - int err; - if (!kho_is_enabled() || !reserved_mem_count) return 0; - err = prepare_kho_fdt(); - if (err) - return err; - return err; + return prepare_kho_fdt(); } late_initcall(reserve_mem_init); -- 2.54.0