| Message ID | 20220620183744.3176557-1-dowens@precisionplanting.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f0d96937d31c4615a6418e4bed5cee50a952040e |
| Headers | show |
| Series | [v4] ASoC: ti: omap-mcbsp: duplicate sysfs error | expand |
On 6/20/22 13:37, David Owens wrote: > From: David Owens <daowens01@gmail.com> > > Convert to managed versions of sysfs and clk allocation to simplify > unbinding and error handling in probe. Managed sysfs node > creation specifically addresses the following error seen the second time > probe is attempted after sdma_pcm_platform_register() previously requsted > probe deferral: > > sysfs: cannot create duplicate filename '/devices/platform/68000000.ocp/49022000.mcbsp/max_tx_thres' > > Signed-off-by: David Owens <dowens@precisionplanting.com> > --- > > Changes in v4: > * Reverted change that added use ATTRIBUTE_GROUP and left the attribute > structs as-is to fix compilation error and lessen the area of impact. > > Changes in v3: > * Whitespace changes only to allow clean apply > > Changes in v2: > * Improved error handling > > --- > sound/soc/ti/omap-mcbsp-priv.h | 2 -- > sound/soc/ti/omap-mcbsp-st.c | 14 ++------------ > sound/soc/ti/omap-mcbsp.c | 19 ++----------------- > 3 files changed, 4 insertions(+), 31 deletions(-) > > diff --git a/sound/soc/ti/omap-mcbsp-priv.h b/sound/soc/ti/omap-mcbsp-priv.h > index 7865cda4bf0a..da519ea1f303 100644 > --- a/sound/soc/ti/omap-mcbsp-priv.h > +++ b/sound/soc/ti/omap-mcbsp-priv.h > @@ -316,8 +316,6 @@ static inline int omap_mcbsp_read(struct omap_mcbsp *mcbsp, u16 reg, > > /* Sidetone specific API */ > int omap_mcbsp_st_init(struct platform_device *pdev); > -void omap_mcbsp_st_cleanup(struct platform_device *pdev); > - > int omap_mcbsp_st_start(struct omap_mcbsp *mcbsp); > int omap_mcbsp_st_stop(struct omap_mcbsp *mcbsp); > > diff --git a/sound/soc/ti/omap-mcbsp-st.c b/sound/soc/ti/omap-mcbsp-st.c > index 0bc7d26c660a..7e8179cae92e 100644 > --- a/sound/soc/ti/omap-mcbsp-st.c > +++ b/sound/soc/ti/omap-mcbsp-st.c > @@ -347,7 +347,7 @@ int omap_mcbsp_st_init(struct platform_device *pdev) > if (!st_data) > return -ENOMEM; > > - st_data->mcbsp_iclk = clk_get(mcbsp->dev, "ick"); > + st_data->mcbsp_iclk = devm_clk_get(mcbsp->dev, "ick"); > if (IS_ERR(st_data->mcbsp_iclk)) { > dev_warn(mcbsp->dev, > "Failed to get ick, sidetone might be broken\n"); > @@ -359,7 +359,7 @@ int omap_mcbsp_st_init(struct platform_device *pdev) > if (!st_data->io_base_st) > return -ENOMEM; > > - ret = sysfs_create_group(&mcbsp->dev->kobj, &sidetone_attr_group); > + ret = devm_device_add_group(mcbsp->dev, &sidetone_attr_group); > if (ret) > return ret; > > @@ -368,16 +368,6 @@ int omap_mcbsp_st_init(struct platform_device *pdev) > return 0; > } > > -void omap_mcbsp_st_cleanup(struct platform_device *pdev) > -{ > - struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); > - > - if (mcbsp->st_data) { > - sysfs_remove_group(&mcbsp->dev->kobj, &sidetone_attr_group); > - clk_put(mcbsp->st_data->mcbsp_iclk); > - } > -} > - > static int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol, > struct snd_ctl_elem_info *uinfo) > { > diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c > index 58d8e200a7b9..9fb7cf0c9f88 100644 > --- a/sound/soc/ti/omap-mcbsp.c > +++ b/sound/soc/ti/omap-mcbsp.c > @@ -702,8 +702,7 @@ static int omap_mcbsp_init(struct platform_device *pdev) > mcbsp->max_tx_thres = max_thres(mcbsp) - 0x10; > mcbsp->max_rx_thres = max_thres(mcbsp) - 0x10; > > - ret = sysfs_create_group(&mcbsp->dev->kobj, > - &additional_attr_group); > + ret = devm_device_add_group(mcbsp->dev, &additional_attr_group); > if (ret) { > dev_err(mcbsp->dev, > "Unable to create additional controls\n"); > @@ -711,16 +710,7 @@ static int omap_mcbsp_init(struct platform_device *pdev) > } > } > > - ret = omap_mcbsp_st_init(pdev); > - if (ret) > - goto err_st; > - > - return 0; > - > -err_st: > - if (mcbsp->pdata->buffer_size) > - sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); > - return ret; > + return omap_mcbsp_st_init(pdev); > } > > /* > @@ -1431,11 +1421,6 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) > if (cpu_latency_qos_request_active(&mcbsp->pm_qos_req)) > cpu_latency_qos_remove_request(&mcbsp->pm_qos_req); > > - if (mcbsp->pdata->buffer_size) > - sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); > - > - omap_mcbsp_st_cleanup(pdev); > - > return 0; > } > This patch should resolve the compilation errors seen in the earlier version. Péter, I ended up simply reverting the changes I made related to attribute groups since they were not strictly necessary for the fix and I probably shouldn't have modified those sections of the code anyway. -Dave
On Mon, 20 Jun 2022 13:37:43 -0500, David Owens wrote: > From: David Owens <daowens01@gmail.com> > > Convert to managed versions of sysfs and clk allocation to simplify > unbinding and error handling in probe. Managed sysfs node > creation specifically addresses the following error seen the second time > probe is attempted after sdma_pcm_platform_register() previously requsted > probe deferral: > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: ti: omap-mcbsp: duplicate sysfs error commit: 6d31e225742a1955db8a0c6f6f52beb748a2895e All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/ti/omap-mcbsp-priv.h b/sound/soc/ti/omap-mcbsp-priv.h index 7865cda4bf0a..da519ea1f303 100644 --- a/sound/soc/ti/omap-mcbsp-priv.h +++ b/sound/soc/ti/omap-mcbsp-priv.h @@ -316,8 +316,6 @@ static inline int omap_mcbsp_read(struct omap_mcbsp *mcbsp, u16 reg, /* Sidetone specific API */ int omap_mcbsp_st_init(struct platform_device *pdev); -void omap_mcbsp_st_cleanup(struct platform_device *pdev); - int omap_mcbsp_st_start(struct omap_mcbsp *mcbsp); int omap_mcbsp_st_stop(struct omap_mcbsp *mcbsp); diff --git a/sound/soc/ti/omap-mcbsp-st.c b/sound/soc/ti/omap-mcbsp-st.c index 0bc7d26c660a..7e8179cae92e 100644 --- a/sound/soc/ti/omap-mcbsp-st.c +++ b/sound/soc/ti/omap-mcbsp-st.c @@ -347,7 +347,7 @@ int omap_mcbsp_st_init(struct platform_device *pdev) if (!st_data) return -ENOMEM; - st_data->mcbsp_iclk = clk_get(mcbsp->dev, "ick"); + st_data->mcbsp_iclk = devm_clk_get(mcbsp->dev, "ick"); if (IS_ERR(st_data->mcbsp_iclk)) { dev_warn(mcbsp->dev, "Failed to get ick, sidetone might be broken\n"); @@ -359,7 +359,7 @@ int omap_mcbsp_st_init(struct platform_device *pdev) if (!st_data->io_base_st) return -ENOMEM; - ret = sysfs_create_group(&mcbsp->dev->kobj, &sidetone_attr_group); + ret = devm_device_add_group(mcbsp->dev, &sidetone_attr_group); if (ret) return ret; @@ -368,16 +368,6 @@ int omap_mcbsp_st_init(struct platform_device *pdev) return 0; } -void omap_mcbsp_st_cleanup(struct platform_device *pdev) -{ - struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); - - if (mcbsp->st_data) { - sysfs_remove_group(&mcbsp->dev->kobj, &sidetone_attr_group); - clk_put(mcbsp->st_data->mcbsp_iclk); - } -} - static int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c index 58d8e200a7b9..9fb7cf0c9f88 100644 --- a/sound/soc/ti/omap-mcbsp.c +++ b/sound/soc/ti/omap-mcbsp.c @@ -702,8 +702,7 @@ static int omap_mcbsp_init(struct platform_device *pdev) mcbsp->max_tx_thres = max_thres(mcbsp) - 0x10; mcbsp->max_rx_thres = max_thres(mcbsp) - 0x10; - ret = sysfs_create_group(&mcbsp->dev->kobj, - &additional_attr_group); + ret = devm_device_add_group(mcbsp->dev, &additional_attr_group); if (ret) { dev_err(mcbsp->dev, "Unable to create additional controls\n"); @@ -711,16 +710,7 @@ static int omap_mcbsp_init(struct platform_device *pdev) } } - ret = omap_mcbsp_st_init(pdev); - if (ret) - goto err_st; - - return 0; - -err_st: - if (mcbsp->pdata->buffer_size) - sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); - return ret; + return omap_mcbsp_st_init(pdev); } /* @@ -1431,11 +1421,6 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) if (cpu_latency_qos_request_active(&mcbsp->pm_qos_req)) cpu_latency_qos_remove_request(&mcbsp->pm_qos_req); - if (mcbsp->pdata->buffer_size) - sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); - - omap_mcbsp_st_cleanup(pdev); - return 0; }