mailbox: sun6i: modernize probe and convert to fully managed
Subsystems (2)
PATCH v3 1/1 mailbox: sun6i: modernize probe and convert to fully managed
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 <[email protected]>
---
v3: use dev_err_probe
v2: fix compilation
drivers/mailbox/sun6i-msgbox.c | 78 ++++++++++------------------------ 1 file changed, 22 insertions(+), 56 deletions(-)
drivers/mailbox/sun6i-msgbox.c +22 -56
@@ -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,25 +221,13 @@ 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 ); -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; - } + mbox->clk =devm_clk_get_enabled (dev,NULL ); +if (IS_ERR (mbox->clk)) +return dev_err_probe (dev,PTR_ERR (mbox->clk),"Failed to get clock\n" ); 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; - } +if (IS_ERR (reset)) +return dev_err_probe (dev,PTR_ERR (reset),"Failed to get reset control\n" );/* * NOTE: We rely on platform firmware to preconfigure the channel
@@ -240,27 +238,17 @@ static int sun6i_msgbox_probe(struct platform_device *pdev)* when removing the device. */ ret =reset_control_deassert (reset); -if (ret) { -dev_err (dev,"Failed to deassert reset: %d\n" , ret); - goto err_disable_unprepare; - } +if (ret) +return dev_err_probe (dev, ret,"Failed to deassert reset\n" ); - 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 +259,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 +275,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);
Signature · 1 line
2.55.0