diff options
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500-msp.c')
-rw-r--r-- | arch/arm/mach-ux500/board-mop500-msp.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c index ace6c051bc1a..dcf5ea9884f8 100644 --- a/arch/arm/mach-ux500/board-mop500-msp.c +++ b/arch/arm/mach-ux500/board-mop500-msp.c | |||
@@ -143,11 +143,11 @@ static struct platform_device *db8500_add_msp_i2s(struct device *parent, | |||
143 | 143 | ||
144 | /* Platform device for ASoC MOP500 machine */ | 144 | /* Platform device for ASoC MOP500 machine */ |
145 | static struct platform_device snd_soc_mop500 = { | 145 | static struct platform_device snd_soc_mop500 = { |
146 | .name = "snd-soc-mop500", | 146 | .name = "snd-soc-mop500", |
147 | .id = 0, | 147 | .id = 0, |
148 | .dev = { | 148 | .dev = { |
149 | .platform_data = NULL, | 149 | .platform_data = NULL, |
150 | }, | 150 | }, |
151 | }; | 151 | }; |
152 | 152 | ||
153 | /* Platform device for Ux500-PCM */ | 153 | /* Platform device for Ux500-PCM */ |
@@ -171,7 +171,7 @@ static struct msp_i2s_platform_data msp3_platform_data = { | |||
171 | .msp_i2s_dma_tx = NULL, | 171 | .msp_i2s_dma_tx = NULL, |
172 | }; | 172 | }; |
173 | 173 | ||
174 | int mop500_msp_init(struct device *parent) | 174 | void mop500_msp_init(struct device *parent) |
175 | { | 175 | { |
176 | pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__); | 176 | pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__); |
177 | platform_device_register(&snd_soc_mop500); | 177 | platform_device_register(&snd_soc_mop500); |
@@ -185,6 +185,4 @@ int mop500_msp_init(struct device *parent) | |||
185 | &msp2_platform_data); | 185 | &msp2_platform_data); |
186 | db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1, | 186 | db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1, |
187 | &msp3_platform_data); | 187 | &msp3_platform_data); |
188 | |||
189 | return 0; | ||
190 | } | 188 | } |