On Tue, 2023-06-27 at 04:43 +0000, Claudiu.Beznea@xxxxxxxxxxxxx wrote:
>
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
> On 26.06.2023 05:34, Maso Huang wrote:
> > +static int mt7986_afe_pcm_dev_probe(struct platform_device *pdev)
> > +{
> > + struct mtk_base_afe *afe;
> > + struct mt7986_afe_private *afe_priv;
> > + struct device *dev;
> > + int i, irq_id, ret;
> > +
> > + afe = devm_kzalloc(&pdev->dev, sizeof(*afe), GFP_KERNEL);
> > + if (!afe)
> > + return -ENOMEM;
> > + platform_set_drvdata(pdev, afe);
> > +
> > + afe->platform_priv = devm_kzalloc(&pdev->dev,
> sizeof(*afe_priv),
> > + GFP_KERNEL);
> > + if (!afe->platform_priv)
> > + return -ENOMEM;
> > +
> > + afe_priv = afe->platform_priv;
> > + afe->dev = &pdev->dev;
> > + dev = afe->dev;
> > +
> > + afe->base_addr = devm_platform_ioremap_resource(pdev, 0);
> > + if (IS_ERR(afe->base_addr))
> > + return PTR_ERR(afe->base_addr);
> > +
> > + /* initial audio related clock */
> > + ret = mt7986_init_clock(afe);
> > + if (ret)
> > + return dev_err_probe(dev, ret, "Cannot initialize
> clocks\n");
> > +
> > + ret = devm_pm_runtime_enable(dev);
> > + if (ret)
> > + return ret;
> > +
> > + /* enable clock for regcache get default value from hw */
> > + afe_priv->pm_runtime_bypass_reg_ctl = true;
> > + pm_runtime_get_sync(&pdev->dev);
> > +
> > + afe->regmap = devm_regmap_init_mmio(&pdev->dev, afe-
> >base_addr,
> > + &mt7986_afe_regmap_config);
> > + if (IS_ERR(afe->regmap)) {
> > + ret = PTR_ERR(afe->regmap);
> > + goto err_pm_disable;
> > + }
> > +
> > + pm_runtime_put_sync(&pdev->dev);
>
> You already did here a put thus (see below)
>
> > + afe_priv->pm_runtime_bypass_reg_ctl = false;
> > +
> > + /* init memif */
> > + afe->memif_size = MT7986_MEMIF_NUM;
> > + afe->memif = devm_kcalloc(dev, afe->memif_size,
> sizeof(*afe->memif),
> > + GFP_KERNEL);
> > + if (!afe->memif)
> > + goto err_pm_disable;
> > +
> > + for (i = 0; i < afe->memif_size; i++) {
> > + afe->memif[i].data = &memif_data[i];
> > + afe->memif[i].irq_usage = -1;
> > + }
> > +
> > + mutex_init(&afe->irq_alloc_lock);
> > +
> > + /* irq initialize */
> > + afe->irqs_size = MT7986_IRQ_NUM;
> > + afe->irqs = devm_kcalloc(dev, afe->irqs_size, sizeof(*afe-
> >irqs),
> > + GFP_KERNEL);
> > + if (!afe->irqs)
> > + goto err_pm_disable;
> > +
> > + for (i = 0; i < afe->irqs_size; i++)
> > + afe->irqs[i].irq_data = &irq_data[i];
> > +
> > + /* request irq */
> > + irq_id = platform_get_irq(pdev, 0);
> > + if (irq_id < 0) {
> > + dev_err(dev, "%pOFn no irq found\n", dev->of_node);
> > + ret = irq_id;
> > + goto err_pm_disable;
> > + }
> > + ret = devm_request_irq(dev, irq_id, mt7986_afe_irq_handler,
> > + IRQF_TRIGGER_NONE, "asys-isr", (void
> *)afe);
> > + if (ret) {
> > + dev_err(dev, "could not request_irq for asys-
> isr\n");
> > + goto err_pm_disable;
> > + }
> > +
> > + /* init sub_dais */
> > + INIT_LIST_HEAD(&afe->sub_dais);
> > +
> > + for (i = 0; i < ARRAY_SIZE(dai_register_cbs); i++) {
> > + ret = dai_register_cbs[i](afe);
> > + if (ret) {
> > + dev_err(afe->dev, "dai register i %d fail,
> ret %d\n",
> > + i, ret);
> > + goto err_pm_disable;
> > + }
> > + }
> > +
> > + /* init dai_driver and component_driver */
> > + ret = mtk_afe_combine_sub_dai(afe);
> > + if (ret) {
> > + dev_err(afe->dev, "mtk_afe_combine_sub_dai fail,
> ret %d\n",
> > + ret);
> > + goto err_pm_disable;
> > + }
> > +
> > + afe->mtk_afe_hardware = &mt7986_afe_hardware;
> > + afe->memif_fs = mt7986_memif_fs;
> > + afe->irq_fs = mt7986_irq_fs;
> > +
> > + afe->runtime_resume = mt7986_afe_runtime_resume;
> > + afe->runtime_suspend = mt7986_afe_runtime_suspend;
> > +
> > + /* register component */
> > + ret = devm_snd_soc_register_component(&pdev->dev,
> >
> + &mt7986_afe_component,
> > + NULL, 0);
> > + if (ret) {
> > + dev_warn(dev, "err_platform\n");
> > + goto err_pm_disable;
> > + }
> > +
> > + ret = devm_snd_soc_register_component(afe->dev,
> >
> + &mt7986_afe_pcm_dai_com
> ponent,
> > + afe->dai_drivers,
> > + afe-
> >num_dai_drivers);
> > + if (ret) {
> > + dev_warn(dev, "err_dai_component\n");
> > + goto err_pm_disable;
> > + }
> > +
> > + return ret;
> > +
> > +err_pm_disable:
> > + pm_runtime_put_sync(&pdev->dev);
>
> these should be no need for this one here.
>
Hi Claudiu,
Thanks for your review.
This is for (IS_ERR(afe->regmap)) error handling.
May I just remove this one? or any other suggestion?
Thanks,
Maso
> > + pm_runtime_disable(&pdev->dev);
>
> This is also covered by devm_pm_runtime_enable().
>
> > + return ret;
> > +}
>
>
