From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (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 B1B47363C63 for ; Fri, 14 Aug 2026 20:55:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786740958; cv=none; b=o5QWjdpp5XCI1ZqC6vJ4Abj/HyYhydNi7VBegJypfPQ/wEuspnnnP+yKc3eZQmakDMH6LwExkXPXlDm6mf7rbU4BNp7QtN5MqlBrZpb2q2gXEcNFMvCll9QlXylC+jAFSda4QT1uKyJ+26Aqblv8LNvrRihubRwAwqh80NWJdvw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786740958; c=relaxed/simple; bh=NUe+5o3sircrOdyQUEMvfJqplkZG2BM5b2wmeSmf9ck=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=VxH8ldMuCKiYzXGTgH4lWtUNhF/mefVyK0N39BrMZ37xW5y4yPj3uaCavQHIZSO0UDV064qP1uUSY/UV/Waqsul1WlHAhjZR8kWJUXGQZg9hvfgX/S302WRlr7CgXI4pGj8PoDHRnMaUfyVNDTM99lJIvxp/Ak5ocbKoC7xZiOs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=B1+e3AoF; arc=none smtp.client-ip=209.85.216.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="B1+e3AoF" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-38125cebfdaso2195574a91.1 for ; Fri, 14 Aug 2026 13:55:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786740956; x=1787345756; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=r5Y6mvwj3GDfaz1b69DVL8jE0Eg17I3eO1sqFwFDyY0=; b=B1+e3AoFG34yZQI3gW/TFsO1kYpPatpW36GZRNTKTlqk5mENmeiwtsuuOyUASO2mqO X8vVuJKtwSy0vUehedPnaOFLoPJpRSCCAuQXz3qoP1IR+/KXGCjITQUz3cxhjADC/1I5 D+81toIw0KjSNQu3dra4Yal+3CB10ZK33DZeevRJBgndUnWBrmrXXPYvUDJtPkl4REip fRSZxElVWef6rGDOQAmXxrNCJPyg/tLJx0sYub9jPknsdyIMJQr3mtyysHrKOC9qNUoQ iuG5D4yIZ04X92I6QPOXdx24NsFhlxq24clGpU3ly392yZvn/QlCGxO6OW63HyFvWoTU Orgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786740956; x=1787345756; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=r5Y6mvwj3GDfaz1b69DVL8jE0Eg17I3eO1sqFwFDyY0=; b=sFM+Dmdeu2BPvaJSAJWVfBGxGmnDEpI4A6iNY7DlVLWKU2QpRtU8nzo2sXpD3dIk43 HbKYMRl2uFm08jRHqhwOtBZ6dJr30wfesEixvi9ivFUDzIPPI2aClfQvnFcZ4Pyq8HX1 D9giwPirwLy54bH0cEv3KmORoDk97StPbJIWW0njrZmggZUmNHwFgtFrCvRIobWbheGR u9sCkNwzUxdticWvTwaHlXm5ZWhxUr2LPkiaNqHxbHNv5R20tem7lvNX8s2hnDFkeuvA sfNmqrGyLVJoKOWfDOFyISzdW+AEUXuTXbutvpk2RpRjx1TFGBpnF67PsJ+Kkte1qkvW +9Cg== X-Forwarded-Encrypted: i=1; AHgh+RpFROwterxResR2Zsh+aiah8RAEFGajPyjYCbM7aZ/Hfs3+NJryULbVsZX/s0MxHLuuy7zOtZIlJTz3KYY=@vger.kernel.org X-Gm-Message-State: AOJu0YwIaW2pGUalGELTVl/2IE6lAMXeItVKTlPRQ1BZRX0PeedKy3zp jj3lgJDznwdtaSMRHDMVYa/KeHSYM/NzbKTnDdNVj0ak0frqVAaKKE5h X-Gm-Gg: AR+sD12+f21VU1LS4ZLsDFOj4HFNd0765uKfXPwXYIKLG9EOXA1wJLN2zUgeovsatbo gEs3kvc7hc9o9XPaBGcKCdu7/BPQxPtdl34bv0GwCDbH13q8kPiMHl+0TLHtidqkCzydj0hb399 B2eW0VzVAOHA03IXZOEusNXLhxiuIvefOJ9svCyLTf/xld0GmCbo5aV81AjG7Xn8R0DdghxcQAC sj4lOxj6GuNCQt61T9FY4N8YWETlrQumyQ7kWxX4gZOXAkRRV9hsoc1Dkh0DHjNmWjhYKU1ih6y yBkVxggmzom8DyM/5GxJT4sYCMCWJFOkVRCUUC5MvZHQKnbzV1gDODJIJW2rD8c6pG1aYpc6K5q nX+660xkEPQdknJKAXYkUkLcC99ez7kQs9Ohy5vHVTxYOdjOghIeUXSmMbjd2areFV9ZRXRB6AF oLeCMXzn8Yh/Rqhq4I4hAdGI8pSvda7r8rLdLL0ygl8KALAWsuX6Icp9C1AXaGYlkCrjzATKBSm 4DSN1XUrinPkIBt8M6Hy2p7HDIgg5UEH8ZfF8HN6Ji5/KI34t+9xVxF/eY0WN9pXTNuGVx94LuF 75zdVaX/kWi+oJLwB/VjJh2MdpJ8WdgSHy3NAgpBTbVJDAZv X-Received: by 2002:a17:90b:4405:b0:381:792d:f993 with SMTP id 98e67ed59e1d1-3933b8c4cf1mr8467756a91.17.1786740956014; Fri, 14 Aug 2026 13:55:56 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e34]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-394ea96c7fcsm4107294a91.3.2026.08.14.13.55.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2026 13:55:55 -0700 (PDT) From: Rosen Penev To: linux-sunxi@lists.linux.dev Cc: Jassi Brar , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , linux-kernel@vger.kernel.org (open list:MAILBOX API), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Allwinner sunXi SoC support) Subject: [PATCHv2] mailbox: sun6i: modernize probe and convert to fully managed Date: Fri, 14 Aug 2026 13:55:53 -0700 Message-ID: <20260814205553.39894-1-rosenp@gmail.com> X-Mailer: git-send-email 2.55.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 Replace irq_of_parse_and_map() with platform_get_irq() and move both IRQ and MMIO resource acquisition to the top of probe, before any allocations, for early error exit. Switch from devm_clk_get() + clk_prepare_enable() to devm_clk_get_enabled(), which combines both operations and registers devres callbacks for automatic disable/unprepare on unbind. This eliminates the manual err_disable_unprepare error path and the remove callback entirely. Use devm_mbox_controller_register() for devres-managed controller registration, and drop the remove callback and platform_set_drvdata() which are no longer needed. Signed-off-by: Rosen Penev --- v2: fix compilation drivers/mailbox/sun6i-msgbox.c | 62 ++++++++++------------------------ 1 file changed, 18 insertions(+), 44 deletions(-) diff --git a/drivers/mailbox/sun6i-msgbox.c b/drivers/mailbox/sun6i-msgbox.c index 6ba6920f4645..3b838f6c837a 100644 --- a/drivers/mailbox/sun6i-msgbox.c +++ b/drivers/mailbox/sun6i-msgbox.c @@ -198,7 +198,17 @@ static int sun6i_msgbox_probe(struct platform_device *pdev) struct mbox_chan *chans; struct reset_control *reset; struct sun6i_msgbox *mbox; + void __iomem *regs; int i, ret; + int irq; + + irq = platform_get_irq(pdev, 0); + if (irq < 0) + return irq; + + regs = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(regs)) + return PTR_ERR(regs); mbox = devm_kzalloc(dev, sizeof(*mbox), GFP_KERNEL); if (!mbox) @@ -211,24 +221,18 @@ static int sun6i_msgbox_probe(struct platform_device *pdev) for (i = 0; i < NUM_CHANS; ++i) chans[i].con_priv = mbox; - mbox->clk = devm_clk_get(dev, NULL); + mbox->clk = devm_clk_get_enabled(dev, NULL); if (IS_ERR(mbox->clk)) { ret = PTR_ERR(mbox->clk); dev_err(dev, "Failed to get clock: %d\n", ret); return ret; } - ret = clk_prepare_enable(mbox->clk); - if (ret) { - dev_err(dev, "Failed to enable clock: %d\n", ret); - return ret; - } - reset = devm_reset_control_get_exclusive(dev, NULL); if (IS_ERR(reset)) { ret = PTR_ERR(reset); dev_err(dev, "Failed to get reset control: %d\n", ret); - goto err_disable_unprepare; + return ret; } /* @@ -242,25 +246,17 @@ static int sun6i_msgbox_probe(struct platform_device *pdev) ret = reset_control_deassert(reset); if (ret) { dev_err(dev, "Failed to deassert reset: %d\n", ret); - goto err_disable_unprepare; + return ret; } - mbox->regs = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(mbox->regs)) { - ret = PTR_ERR(mbox->regs); - dev_err(dev, "Failed to map MMIO resource: %d\n", ret); - goto err_disable_unprepare; - } + mbox->regs = regs; /* Disable all IRQs for this end of the msgbox. */ writel(0, mbox->regs + LOCAL_IRQ_EN_REG); - ret = devm_request_irq(dev, irq_of_parse_and_map(dev->of_node, 0), - sun6i_msgbox_irq, 0, dev_name(dev), mbox); - if (ret) { - dev_err(dev, "Failed to register IRQ handler: %d\n", ret); - goto err_disable_unprepare; - } + ret = devm_request_irq(dev, irq, sun6i_msgbox_irq, 0, dev_name(dev), mbox); + if (ret) + return ret; mbox->controller.dev = dev; mbox->controller.ops = &sun6i_msgbox_chan_ops; @@ -271,29 +267,8 @@ static int sun6i_msgbox_probe(struct platform_device *pdev) mbox->controller.txpoll_period = 5; spin_lock_init(&mbox->lock); - platform_set_drvdata(pdev, mbox); - - ret = mbox_controller_register(&mbox->controller); - if (ret) { - dev_err(dev, "Failed to register controller: %d\n", ret); - goto err_disable_unprepare; - } - - return 0; - -err_disable_unprepare: - clk_disable_unprepare(mbox->clk); - - return ret; -} - -static void sun6i_msgbox_remove(struct platform_device *pdev) -{ - struct sun6i_msgbox *mbox = platform_get_drvdata(pdev); - mbox_controller_unregister(&mbox->controller); - /* See the comment in sun6i_msgbox_probe about the reset line. */ - clk_disable_unprepare(mbox->clk); + return devm_mbox_controller_register(dev, &mbox->controller); } static const struct of_device_id sun6i_msgbox_of_match[] = { @@ -308,7 +283,6 @@ static struct platform_driver sun6i_msgbox_driver = { .of_match_table = sun6i_msgbox_of_match, }, .probe = sun6i_msgbox_probe, - .remove = sun6i_msgbox_remove, }; module_platform_driver(sun6i_msgbox_driver); -- 2.55.0