From b886765b436b37006b442da3f9cfa45068f8bc89 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Fri, 14 Sep 2012 15:43:52 +0100
Subject: [PATCH] --- yaml --- r: 326903 b: refs/heads/master c:
 65b67d33fbce920d7c502a146504fcbb2db99e40 h: refs/heads/master i:   326901:
 4cc616786b81b674b1b7d156736fbff1dd3af7cd   326899:
 38f7ac4cf2766c6770d88c276ba6d718e3ecf7cc   326895:
 1e65077ed4e4e8152e504774cf001e1ffa4755c8 v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/arm/mach-ux500/board-mop500-msp.c | 14 ++++++--------
 trunk/arch/arm/mach-ux500/board-mop500-msp.h | 14 --------------
 trunk/arch/arm/mach-ux500/board-mop500.c     |  1 -
 trunk/arch/arm/mach-ux500/board-mop500.h     |  1 +
 5 files changed, 8 insertions(+), 24 deletions(-)
 delete mode 100644 trunk/arch/arm/mach-ux500/board-mop500-msp.h

diff --git a/[refs] b/[refs]
index df1e316eda65..80570710416a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cf24b157c3c4e7bc4060668245dc4affba3dcfc
+refs/heads/master: 65b67d33fbce920d7c502a146504fcbb2db99e40
diff --git a/trunk/arch/arm/mach-ux500/board-mop500-msp.c b/trunk/arch/arm/mach-ux500/board-mop500-msp.c
index ace6c051bc1a..dcf5ea9884f8 100644
--- a/trunk/arch/arm/mach-ux500/board-mop500-msp.c
+++ b/trunk/arch/arm/mach-ux500/board-mop500-msp.c
@@ -143,11 +143,11 @@ static struct platform_device *db8500_add_msp_i2s(struct device *parent,
 
 /* Platform device for ASoC MOP500 machine */
 static struct platform_device snd_soc_mop500 = {
-		.name = "snd-soc-mop500",
-		.id = 0,
-		.dev = {
-			.platform_data = NULL,
-		},
+	.name = "snd-soc-mop500",
+	.id = 0,
+	.dev = {
+		.platform_data = NULL,
+	},
 };
 
 /* Platform device for Ux500-PCM */
@@ -171,7 +171,7 @@ static struct msp_i2s_platform_data msp3_platform_data = {
 	.msp_i2s_dma_tx	= NULL,
 };
 
-int mop500_msp_init(struct device *parent)
+void mop500_msp_init(struct device *parent)
 {
 	pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__);
 	platform_device_register(&snd_soc_mop500);
@@ -185,6 +185,4 @@ int mop500_msp_init(struct device *parent)
 			   &msp2_platform_data);
 	db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1,
 			   &msp3_platform_data);
-
-	return 0;
 }
diff --git a/trunk/arch/arm/mach-ux500/board-mop500-msp.h b/trunk/arch/arm/mach-ux500/board-mop500-msp.h
deleted file mode 100644
index 6fcfb5e2cc94..000000000000
--- a/trunk/arch/arm/mach-ux500/board-mop500-msp.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2012
- *
- * Author: Ola Lilja <ola.o.lilja@stericsson.com>,
- *         for ST-Ericsson.
- *
- * License terms:
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-
-void mop500_msp_init(struct device *parent);
diff --git a/trunk/arch/arm/mach-ux500/board-mop500.c b/trunk/arch/arm/mach-ux500/board-mop500.c
index 8890b19b90e7..a7994776ef30 100644
--- a/trunk/arch/arm/mach-ux500/board-mop500.c
+++ b/trunk/arch/arm/mach-ux500/board-mop500.c
@@ -54,7 +54,6 @@
 #include "devices-db8500.h"
 #include "board-mop500.h"
 #include "board-mop500-regulators.h"
-#include "board-mop500-msp.h"
 
 static struct gpio_led snowball_led_array[] = {
 	{
diff --git a/trunk/arch/arm/mach-ux500/board-mop500.h b/trunk/arch/arm/mach-ux500/board-mop500.h
index eb421f9f01aa..bdae9b03a33b 100644
--- a/trunk/arch/arm/mach-ux500/board-mop500.h
+++ b/trunk/arch/arm/mach-ux500/board-mop500.h
@@ -94,6 +94,7 @@ void __init mop500_stuib_init(void);
 void __init mop500_pinmaps_init(void);
 void __init snowball_pinmaps_init(void);
 void __init hrefv60_pinmaps_init(void);
+void mop500_msp_init(struct device *parent);
 
 int __init mop500_uib_init(void);
 void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,