diff options
Diffstat (limited to 'sound/soc/omap/mcbsp.c')
| -rw-r--r-- | sound/soc/omap/mcbsp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c index a9a24386042..285c8368cb4 100644 --- a/sound/soc/omap/mcbsp.c +++ b/sound/soc/omap/mcbsp.c | |||
| @@ -930,8 +930,7 @@ static const struct attribute_group sidetone_attr_group = { | |||
| 930 | .attrs = (struct attribute **)sidetone_attrs, | 930 | .attrs = (struct attribute **)sidetone_attrs, |
| 931 | }; | 931 | }; |
| 932 | 932 | ||
| 933 | static int __devinit omap_st_add(struct omap_mcbsp *mcbsp, | 933 | static int omap_st_add(struct omap_mcbsp *mcbsp, struct resource *res) |
| 934 | struct resource *res) | ||
| 935 | { | 934 | { |
| 936 | struct omap_mcbsp_st_data *st_data; | 935 | struct omap_mcbsp_st_data *st_data; |
| 937 | int err; | 936 | int err; |
| @@ -957,7 +956,7 @@ static int __devinit omap_st_add(struct omap_mcbsp *mcbsp, | |||
| 957 | * McBSP1 and McBSP3 are directly mapped on 1610 and 1510. | 956 | * McBSP1 and McBSP3 are directly mapped on 1610 and 1510. |
| 958 | * 730 has only 2 McBSP, and both of them are MPU peripherals. | 957 | * 730 has only 2 McBSP, and both of them are MPU peripherals. |
| 959 | */ | 958 | */ |
| 960 | int __devinit omap_mcbsp_init(struct platform_device *pdev) | 959 | int omap_mcbsp_init(struct platform_device *pdev) |
| 961 | { | 960 | { |
| 962 | struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); | 961 | struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); |
| 963 | struct resource *res; | 962 | struct resource *res; |
| @@ -1085,7 +1084,7 @@ err_thres: | |||
| 1085 | return ret; | 1084 | return ret; |
| 1086 | } | 1085 | } |
| 1087 | 1086 | ||
| 1088 | void __devexit omap_mcbsp_sysfs_remove(struct omap_mcbsp *mcbsp) | 1087 | void omap_mcbsp_sysfs_remove(struct omap_mcbsp *mcbsp) |
| 1089 | { | 1088 | { |
| 1090 | if (mcbsp->pdata->buffer_size) | 1089 | if (mcbsp->pdata->buffer_size) |
| 1091 | sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); | 1090 | sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); |
