diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2016-05-30 04:23:48 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2016-06-10 08:07:24 -0400 |
commit | 6610d3571b3daefca47f6735ee400f9e85f91e3d (patch) | |
tree | d5c0690c503ef06a8e6d0fa9fded547ffd8990ca /sound | |
parent | c26c84c92ba8907402faaab760dc0e4ecec89dd0 (diff) |
ASoC: omap-mcbsp: Rename omap_mcbsp_sysfs_remove() to omap_mcbsp_cleanup()
The function will do more then removing the sysfs files in the future.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/omap/mcbsp.c | 2 | ||||
-rw-r--r-- | sound/soc/omap/mcbsp.h | 2 | ||||
-rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c index 4a16e778966b..ace73b97769f 100644 --- a/sound/soc/omap/mcbsp.c +++ b/sound/soc/omap/mcbsp.c | |||
@@ -1088,7 +1088,7 @@ err_thres: | |||
1088 | return ret; | 1088 | return ret; |
1089 | } | 1089 | } |
1090 | 1090 | ||
1091 | void omap_mcbsp_sysfs_remove(struct omap_mcbsp *mcbsp) | 1091 | void omap_mcbsp_cleanup(struct omap_mcbsp *mcbsp) |
1092 | { | 1092 | { |
1093 | if (mcbsp->pdata->buffer_size) | 1093 | if (mcbsp->pdata->buffer_size) |
1094 | sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); | 1094 | sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); |
diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h index 96d1b086bcf8..ce6cbbf923a4 100644 --- a/sound/soc/omap/mcbsp.h +++ b/sound/soc/omap/mcbsp.h | |||
@@ -349,6 +349,6 @@ int omap_st_disable(struct omap_mcbsp *mcbsp); | |||
349 | int omap_st_is_enabled(struct omap_mcbsp *mcbsp); | 349 | int omap_st_is_enabled(struct omap_mcbsp *mcbsp); |
350 | 350 | ||
351 | int omap_mcbsp_init(struct platform_device *pdev); | 351 | int omap_mcbsp_init(struct platform_device *pdev); |
352 | void omap_mcbsp_sysfs_remove(struct omap_mcbsp *mcbsp); | 352 | void omap_mcbsp_cleanup(struct omap_mcbsp *mcbsp); |
353 | 353 | ||
354 | #endif /* __ASOC_MCBSP_H */ | 354 | #endif /* __ASOC_MCBSP_H */ |
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index fd99d89de6a8..db07debb4a9c 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c | |||
@@ -832,7 +832,7 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) | |||
832 | if (mcbsp->pdata->ops && mcbsp->pdata->ops->free) | 832 | if (mcbsp->pdata->ops && mcbsp->pdata->ops->free) |
833 | mcbsp->pdata->ops->free(mcbsp->id); | 833 | mcbsp->pdata->ops->free(mcbsp->id); |
834 | 834 | ||
835 | omap_mcbsp_sysfs_remove(mcbsp); | 835 | omap_mcbsp_cleanup(mcbsp); |
836 | 836 | ||
837 | clk_put(mcbsp->fclk); | 837 | clk_put(mcbsp->fclk); |
838 | 838 | ||