msm: remove include of <asm/mach-types.h> and <asm/system.h>

Upstream has removed <asm/system.h> so remove it from legacy uses.  As all
the platforms we support utilize device tree we no longer need to include
<asm/mach-types.h>.

Change-Id: I8e53b1fd96ad26711fae59f081a8892f8bb184b7
Signed-off-by: Kumar Gala <galak@codeaurora.org>

20 files changed, 5 insertions, 25 deletions

diff --git a/sound/soc/msm/apq8064-i2s.c b/sound/soc/msm/apq8064-i2s.c
index 99defcda74a7..df1f1aeac58b 100644
--- a/sound/soc/msm/apq8064-i2s.c
+++ b/sound/soc/msm/apq8064-i2s.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -25,7 +25,6 @@
 #include <sound/soc-dapm.h>
 #include <sound/pcm.h>
 #include <sound/jack.h>
-#include <asm/mach-types.h>
 #include <mach/socinfo.h>
 #include "msm-pcm-routing.h"
 #include "../codecs/wcd9310.h"
diff --git a/sound/soc/msm/apq8064.c b/sound/soc/msm/apq8064.c
index 7960f13330f0..17005996f604 100644
--- a/sound/soc/msm/apq8064.c
+++ b/sound/soc/msm/apq8064.c
@@ -25,7 +25,6 @@
 #include <sound/soc-dapm.h>
 #include <sound/pcm.h>
 #include <sound/jack.h>
-#include <asm/mach-types.h>
 #include <mach/socinfo.h>
 #include "msm-pcm-routing.h"
 #include "../codecs/wcd9310.h"
diff --git a/sound/soc/msm/apq8074.c b/sound/soc/msm/apq8074.c
index 53eda7c39dbe..3277ab715463 100644
--- a/sound/soc/msm/apq8074.c
+++ b/sound/soc/msm/apq8074.c
@@ -25,7 +25,6 @@
 #include <sound/pcm.h>
 #include <sound/jack.h>
 #include <sound/q6afe-v2.h>
-#include <asm/mach-types.h>
 #include <mach/socinfo.h>
 #include <sound/pcm_params.h>
 #include "qdsp6v2/msm-pcm-routing-v2.h"
diff --git a/sound/soc/msm/apq8084.c b/sound/soc/msm/apq8084.c
index e565d7e49ca6..fbaf39352532 100644
--- a/sound/soc/msm/apq8084.c
+++ b/sound/soc/msm/apq8084.c
@@ -29,7 +29,6 @@
 #include <sound/jack.h>
 #include <sound/q6afe-v2.h>
 #include <sound/pcm_params.h>
-#include <asm/mach-types.h>
 #include <mach/subsystem_notif.h>
 #include "qdsp6v2/msm-pcm-routing-v2.h"
 #include "qdsp6v2/q6core.h"
diff --git a/sound/soc/msm/mdm9615.c b/sound/soc/msm/mdm9615.c
index c3967dcb1c80..f507cea9c5b7 100644
--- a/sound/soc/msm/mdm9615.c
+++ b/sound/soc/msm/mdm9615.c
@@ -23,7 +23,6 @@
 #include <sound/soc-dapm.h>
 #include <sound/pcm.h>
 #include <sound/jack.h>
-#include <asm/mach-types.h>
 #include <mach/socinfo.h>
 #include "msm-pcm-routing.h"
 #include "../codecs/wcd9310.h"
diff --git a/sound/soc/msm/mdm9625.c b/sound/soc/msm/mdm9625.c
index 1f9a45c2a9e7..c7bc79361e79 100644
--- a/sound/soc/msm/mdm9625.c
+++ b/sound/soc/msm/mdm9625.c
@@ -23,7 +23,6 @@
 #include <sound/pcm.h>
 #include <sound/jack.h>
 #include <sound/q6afe-v2.h>
-#include <asm/mach-types.h>
 #include <mach/socinfo.h>
 #include <qdsp6v2/msm-pcm-routing-v2.h>
 #include "../codecs/wcd9320.h"
diff --git a/sound/soc/msm/mpq8064.c b/sound/soc/msm/mpq8064.c
index 81435d9f8514..454374976613 100644
--- a/sound/soc/msm/mpq8064.c
+++ b/sound/soc/msm/mpq8064.c
@@ -24,7 +24,6 @@
 #include <sound/pcm.h>
 #include <sound/jack.h>
 #include <sound/pcm_params.h>
-#include <asm/mach-types.h>
 #include <mach/socinfo.h>
 #include "msm-pcm-routing.h"
 #include "../codecs/wcd9310.h"
diff --git a/sound/soc/msm/msm7201.c b/sound/soc/msm/msm7201.c
index 154e9873b36c..f3d8e648e492 100644
--- a/sound/soc/msm/msm7201.c
+++ b/sound/soc/msm/msm7201.c
@@ -37,7 +37,6 @@
 #include <linux/dma-mapping.h>
 
 #include "msm-pcm.h"
-#include <asm/mach-types.h>
 #include <mach/msm_rpcrouter.h>
 
 static struct msm_rpc_endpoint *snd_ep;
diff --git a/sound/soc/msm/msm7x30.c b/sound/soc/msm/msm7x30.c
index 664baabf3a92..1ea92f25d045 100644
--- a/sound/soc/msm/msm7x30.c
+++ b/sound/soc/msm/msm7x30.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2008-2011, 2013, The Linux Foundation. All rights reserved.
  *
  * All source code in this file is licensed under the following license except
  * where indicated.
@@ -35,7 +35,6 @@
 #include <linux/msm_audio.h>
 
 #include "msm7kv2-pcm.h"
-#include <asm/mach-types.h>
 #include <mach/qdsp5v2/audio_dev_ctl.h>
 #include <mach/debug_mm.h>
 #include <mach/qdsp5v2/afe.h>
diff --git a/sound/soc/msm/msm8226.c b/sound/soc/msm/msm8226.c
index aba9699afa9e..f6122ace5b44 100644
--- a/sound/soc/msm/msm8226.c
+++ b/sound/soc/msm/msm8226.c
@@ -24,7 +24,6 @@
 #include <sound/pcm.h>
 #include <sound/jack.h>
 #include <sound/q6afe-v2.h>
-#include <asm/mach-types.h>
 #include <mach/socinfo.h>
 #include <mach/subsystem_notif.h>
 #include <qdsp6v2/msm-pcm-routing-v2.h>
diff --git a/sound/soc/msm/msm8660-apq-wm8903.c b/sound/soc/msm/msm8660-apq-wm8903.c
index f93a2695bd07..7a20e4f4be08 100644
--- a/sound/soc/msm/msm8660-apq-wm8903.c
+++ b/sound/soc/msm/msm8660-apq-wm8903.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -25,7 +25,6 @@
 #include <sound/soc-dapm.h>
 #include <sound/soc-dsp.h>
 #include <sound/pcm.h>
-#include <asm/mach-types.h>
 #include "msm-pcm-routing.h"
 #include "../codecs/wm8903.h"
 
diff --git a/sound/soc/msm/msm8930.c b/sound/soc/msm/msm8930.c
index 6a548334b37f..d9f4c8aed2ea 100644
--- a/sound/soc/msm/msm8930.c
+++ b/sound/soc/msm/msm8930.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -22,7 +22,6 @@
 #include <sound/soc-dapm.h>
 #include <sound/pcm.h>
 #include <sound/jack.h>
-#include <asm/mach-types.h>
 #include <mach/socinfo.h>
 #include "msm-pcm-routing.h"
 #include "../codecs/wcd9304.h"
diff --git a/sound/soc/msm/msm8960.c b/sound/soc/msm/msm8960.c
index c7fbc4353206..92c4b8fe28d6 100644
--- a/sound/soc/msm/msm8960.c
+++ b/sound/soc/msm/msm8960.c
@@ -22,7 +22,6 @@
 #include <sound/soc-dapm.h>
 #include <sound/pcm.h>
 #include <sound/jack.h>
-#include <asm/mach-types.h>
 #include <mach/socinfo.h>
 #include <linux/mfd/wcd9xxx/core.h>
 #include "msm-pcm-routing.h"
diff --git a/sound/soc/msm/msm8974.c b/sound/soc/msm/msm8974.c
index 27ee4eed93a7..25fa042ed4b0 100644
--- a/sound/soc/msm/msm8974.c
+++ b/sound/soc/msm/msm8974.c
@@ -27,7 +27,6 @@
 #include <sound/jack.h>
 #include <sound/q6afe-v2.h>
 #include <sound/pcm_params.h>
-#include <asm/mach-types.h>
 #include <mach/subsystem_notif.h>
 #include "qdsp6v2/msm-pcm-routing-v2.h"
 #include "qdsp6v2/q6core.h"
diff --git a/sound/soc/msm/msm8x10.c b/sound/soc/msm/msm8x10.c
index 1b4154f9c0fe..c95b0ee3c2e0 100644
--- a/sound/soc/msm/msm8x10.c
+++ b/sound/soc/msm/msm8x10.c
@@ -24,7 +24,6 @@
 #include <sound/soc-dapm.h>
 #include <sound/pcm.h>
 #include <sound/jack.h>
-#include <asm/mach-types.h>
 #include <mach/socinfo.h>
 #include <qdsp6v2/msm-pcm-routing-v2.h>
 #include <sound/q6afe-v2.h>
diff --git a/sound/soc/msm/msm8x60.c b/sound/soc/msm/msm8x60.c
index fcc3f32f5483..0ee2c865fed0 100644
--- a/sound/soc/msm/msm8x60.c
+++ b/sound/soc/msm/msm8x60.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2011, 2013 The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -28,7 +28,6 @@
 #include <sound/control.h>
 #include <sound/q6afe.h>
 #include <asm/dma.h>
-#include <asm/mach-types.h>
 #include <mach/qdsp6v2/audio_dev_ctl.h>
 #include <mach/qdsp6v2/q6voice.h>
 
diff --git a/sound/soc/msm/msmsamarium.c b/sound/soc/msm/msmsamarium.c
index ae3f911effda..625e297966eb 100644
--- a/sound/soc/msm/msmsamarium.c
+++ b/sound/soc/msm/msmsamarium.c
@@ -27,7 +27,6 @@
 #include <sound/jack.h>
 #include <sound/q6afe-v2.h>
 #include <sound/pcm_params.h>
-#include <asm/mach-types.h>
 #include <mach/socinfo.h>
 #include <mach/subsystem_notif.h>
 #include "qdsp6v2/msm-pcm-routing-v2.h"
diff --git a/sound/soc/msm/qdsp6/q6voice.c b/sound/soc/msm/qdsp6/q6voice.c
index 7294350a04e5..cd642ea65b11 100644
--- a/sound/soc/msm/qdsp6/q6voice.c
+++ b/sound/soc/msm/qdsp6/q6voice.c
@@ -17,7 +17,6 @@
 #include <linux/wait.h>
 #include <linux/mutex.h>
 
-#include <asm/mach-types.h>
 #include <mach/qdsp6v2/audio_acdb.h>
 #include <mach/qdsp6v2/rtac.h>
 
diff --git a/sound/soc/msm/qdsp6v2/audio_ocmem.c b/sound/soc/msm/qdsp6v2/audio_ocmem.c
index ae4a8a6fbb53..c5c50871144e 100644
--- a/sound/soc/msm/qdsp6v2/audio_ocmem.c
+++ b/sound/soc/msm/qdsp6v2/audio_ocmem.c
@@ -23,7 +23,6 @@
 #include <linux/io.h>
 #include <linux/of_device.h>
 #include <linux/memory_alloc.h>
-#include <asm/mach-types.h>
 #include <mach/msm_bus.h>
 #include <mach/msm_bus_board.h>
 #include <mach/ocmem.h>
diff --git a/sound/soc/msm/qdsp6v2/q6voice.c b/sound/soc/msm/qdsp6v2/q6voice.c
index 622fae17bbad..ef487b3f70ff 100644
--- a/sound/soc/msm/qdsp6v2/q6voice.c
+++ b/sound/soc/msm/qdsp6v2/q6voice.c
@@ -18,7 +18,6 @@
 #include <linux/mutex.h>
 #include <linux/msm_audio_ion.h>
 
-#include <asm/mach-types.h>
 #include <mach/socinfo.h>
 #include <mach/qdsp6v2/apr_tal.h>