| Message ID | 20230111074528.29354-11-roger.lu@mediatek.com |
|---|---|
| State | New |
| Headers | show |
| Series | Enahance SVS's robustness | expand |
On 11/01/2023 08:45, Roger Lu wrote: > From: Matthias Brugger <matthias.bgg@gmail.com> > > Moving svs_platform_probe into driver probe function will allow us to > reduce svs_platform members. This will be done in a follow-up patch. > > Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > Signed-off-by: Roger Lu <roger.lu@mediatek.com> Applied, thanks! > --- > drivers/soc/mediatek/mtk-svs.c | 20 ++++---------------- > 1 file changed, 4 insertions(+), 16 deletions(-) > > diff --git a/drivers/soc/mediatek/mtk-svs.c b/drivers/soc/mediatek/mtk-svs.c > index 354582825082..9d9210c22289 100644 > --- a/drivers/soc/mediatek/mtk-svs.c > +++ b/drivers/soc/mediatek/mtk-svs.c > @@ -2387,17 +2387,17 @@ static const struct of_device_id svs_of_match[] = { > }, > }; > > -static struct svs_platform *svs_platform_probe(struct platform_device *pdev) > +static int svs_probe(struct platform_device *pdev) > { > struct svs_platform *svsp; > const struct svs_platform_data *svsp_data; > - int ret; > + int ret, svsp_irq; > > svsp_data = of_device_get_match_data(&pdev->dev); > > svsp = devm_kzalloc(&pdev->dev, sizeof(*svsp), GFP_KERNEL); > if (!svsp) > - return ERR_PTR(-ENOMEM); > + return -ENOMEM; > > svsp->dev = &pdev->dev; > svsp->name = svsp_data->name; > @@ -2408,19 +2408,7 @@ static struct svs_platform *svs_platform_probe(struct platform_device *pdev) > > ret = svsp_data->probe(svsp); > if (ret) > - return ERR_PTR(ret); > - > - return svsp; > -} > - > -static int svs_probe(struct platform_device *pdev) > -{ > - struct svs_platform *svsp; > - int svsp_irq, ret; > - > - svsp = svs_platform_probe(pdev); > - if (IS_ERR(svsp)) > - return PTR_ERR(svsp); > + return ret; > > if (!svs_is_efuse_data_correct(svsp)) { > dev_notice(svsp->dev, "efuse data isn't correct\n");
diff --git a/drivers/soc/mediatek/mtk-svs.c b/drivers/soc/mediatek/mtk-svs.c index 354582825082..9d9210c22289 100644 --- a/drivers/soc/mediatek/mtk-svs.c +++ b/drivers/soc/mediatek/mtk-svs.c @@ -2387,17 +2387,17 @@ static const struct of_device_id svs_of_match[] = { }, }; -static struct svs_platform *svs_platform_probe(struct platform_device *pdev) +static int svs_probe(struct platform_device *pdev) { struct svs_platform *svsp; const struct svs_platform_data *svsp_data; - int ret; + int ret, svsp_irq; svsp_data = of_device_get_match_data(&pdev->dev); svsp = devm_kzalloc(&pdev->dev, sizeof(*svsp), GFP_KERNEL); if (!svsp) - return ERR_PTR(-ENOMEM); + return -ENOMEM; svsp->dev = &pdev->dev; svsp->name = svsp_data->name; @@ -2408,19 +2408,7 @@ static struct svs_platform *svs_platform_probe(struct platform_device *pdev) ret = svsp_data->probe(svsp); if (ret) - return ERR_PTR(ret); - - return svsp; -} - -static int svs_probe(struct platform_device *pdev) -{ - struct svs_platform *svsp; - int svsp_irq, ret; - - svsp = svs_platform_probe(pdev); - if (IS_ERR(svsp)) - return PTR_ERR(svsp); + return ret; if (!svs_is_efuse_data_correct(svsp)) { dev_notice(svsp->dev, "efuse data isn't correct\n");