From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DE4B2CA5FF1 for ; Wed, 7 Oct 2026 06:13:46 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4j02r73HWjz30PJ; Wed, 07 Oct 2026 17:13:43 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=211.20.114.72 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1791353623; cv=none; b=VMc7z0jCfVsUOaJiNq4JkymlFLAn2OHIefbiL25iGGWEYl0o7Lo/DSgQS07cNoeKbzux64HP1+JxaEIsGhDuF8zWPJwS8qr6bbSt+GTazAtZZU88Fp2GVhTkTBt3GmvnYSRc393U8g8eRLWg1P2Tki0PSnZ452T/2UivujjnQAT/aTC+TK0u1Xaklys9vELagRhCKy9SvDAJHE+j4F5gVWSL0TzApGAsRRFnWY+C4cZ1+wzFpGK8taSF6uY15JRLIiN81yuSUfrbGp0GR1hhaKarO24qDJyr+NWlVn8AbvOpa53M7NRaYXMgxloWole39CqSx5pSpwibfIdP0fal2A== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1791353623; c=relaxed/relaxed; bh=6f734yTbEWz0ezhrghCa7D1vrDDeFe3FBoPdBCv1v2s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=jJ2LbqLEySeqN3UeJdEHkPtoWC3cpN5dlmLXkmRETz/OnQ7T3Yx0YC4vnklCYsg+CV67JzShZvSKoYmu3QEUp/ePK42ESts5MmAPG0b7oSpNCW84VEkRYT3XUvjPqejVZTsjgt0iU+DChSmD1S12t6Tn64nZAwxl4NWuBSD5Uc9JTryj17nKFm8rwreewqTmZOg2XlkzyqX3cYeJZZExU28VYeSs/1Zz3tgJjpLKU9PNcvrb8CIEaTDYAiCDO62LNOFe0OiNh5ri0SvS1x4rPxR/BacipFIG3SXAVFbvxesGtQSLvo40rgeokuzZI+l6K9t0rRjKaFBuzo+9/n+rxQ== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com; spf=pass (client-ip=211.20.114.72; helo=twmbx01.aspeedtech.com; envelope-from=ryan_chen@aspeedtech.com; receiver=lists.ozlabs.org) smtp.mailfrom=aspeedtech.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=aspeedtech.com (client-ip=211.20.114.72; helo=twmbx01.aspeedtech.com; envelope-from=ryan_chen@aspeedtech.com; receiver=lists.ozlabs.org) Received: from twmbx01.aspeedtech.com (mail.aspeedtech.com [211.20.114.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4j02r64BlFz2y8f for ; Wed, 07 Oct 2026 17:13:42 +1100 (AEDT) Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1748.10; Wed, 7 Oct 2026 14:13:19 +0800 Received: from [127.0.1.1] (192.168.10.13) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1748.10 via Frontend Transport; Wed, 7 Oct 2026 14:13:19 +0800 From: Ryan Chen Date: Wed, 7 Oct 2026 14:13:21 +0800 Subject: [PATCH v5 4/9] EDAC/aspeed: Free the mem_ctl_info unconditionally on remove X-Mailing-List: linux-aspeed@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-ID: <20261007-edac-v5-4-5c31fc5df4cf@aspeedtech.com> References: <20261007-edac-v5-0-5c31fc5df4cf@aspeedtech.com> In-Reply-To: <20261007-edac-v5-0-5c31fc5df4cf@aspeedtech.com> To: Stefan Schaeckeler , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Joel Stanley , Andrew Jeffery , Borislav Petkov , Tony Luck CC: , , , , , Borislav Petkov , Ryan Chen X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1791353599; l=1499; i=ryan_chen@aspeedtech.com; s=20251126; h=from:subject:message-id; bh=Jeu93HngNXPqxP5kQEwwawVViBIF6aurqmZa1RE8cn8=; b=JLarcacer4Pwhgu9S4CPBkXazIKSVYmTVDv5BYV6krpKlX7PSDdrAvuGxVXVvaB77Q/bu2OCj 6AXvShajSeUACEP9Hi7QEROHr9/xbhW+7VWhMVyk+OzV5dBEJsw0mpv X-Developer-Key: i=ryan_chen@aspeedtech.com; a=ed25519; pk=Xe73xY6tcnkuRjjbVAB/oU30KdB3FvG4nuJuILj7ZVc= aspeed_remove() is a driver .remove callback, so it only runs for a device that has already probed successfully and registered its mem_ctl_info. In that case edac_mc_del_mc() always returns the same, valid pointer, and the NULL check on its return value can never be false. Fetch the mem_ctl_info from the platform device's driver data instead and free it unconditionally, dropping the redundant check. This also decouples the teardown from the return value of edac_mc_del_mc(). Signed-off-by: Ryan Chen --- drivers/edac/aspeed_edac.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/edac/aspeed_edac.c b/drivers/edac/aspeed_edac.c index bf1ff9a79d15..610da8aa2a22 100644 --- a/drivers/edac/aspeed_edac.c +++ b/drivers/edac/aspeed_edac.c @@ -345,18 +345,17 @@ static int aspeed_probe(struct platform_device *pdev) static void aspeed_remove(struct platform_device *pdev) { - struct mem_ctl_info *mci; + struct mem_ctl_info *mci = platform_get_drvdata(pdev); /* disable interrupts */ regmap_update_bits(aspeed_regmap, ASPEED_MCR_INTR_CTRL, ASPEED_MCR_INTR_CTRL_ENABLE, 0); - free_irq(aspeed_irq, platform_get_drvdata(pdev)); + free_irq(aspeed_irq, mci); /* free resources */ - mci = edac_mc_del_mc(&pdev->dev); - if (mci) - edac_mc_free(mci); + edac_mc_del_mc(&pdev->dev); + edac_mc_free(mci); } static const struct of_device_id aspeed_of_match[] = { -- 2.34.1