Merge "ASoC: update headers for upstream compliance"

2020-05-14 22:04:36 -07:00
parent 072e3e291c e0bdd11269
commit c3c4fd765e
67 changed files with 110 additions and 109 deletions
--- a/dsp/codecs/aac_in.c
+++ b/dsp/codecs/aac_in.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2010-2017, 2020 The Linux Foundation. All rights reserved.
 */
 #include <linux/module.h>
 #include <linux/fs.h>
@@ -10,7 +10,7 @@
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/msm_audio_aac.h>
+#include <audio/linux/msm_audio_aac.h>
 #include <linux/compat.h>
 #include <linux/atomic.h>
 #include <asm/ioctls.h>
--- a/dsp/codecs/amrnb_in.c
+++ b/dsp/codecs/amrnb_in.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2010-2012, 2014, 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2010-2012, 2014, 2016-2017, 2020 The Linux Foundation. All rights reserved.
 */

 #include <linux/module.h>
@@ -11,7 +11,7 @@
 #include <linux/slab.h>
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
-#include <linux/msm_audio_amrnb.h>
+#include <audio/linux/msm_audio_amrnb.h>
 #include <linux/compat.h>
 #include <linux/atomic.h>
 #include <asm/ioctls.h>
--- a/dsp/codecs/amrwb_in.c
+++ b/dsp/codecs/amrwb_in.c
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2011-2012, 2014, 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2012, 2014, 2016-2017, 2020 The Linux Foundation. All rights reserved.
 */

 #include <linux/dma-mapping.h>
 #include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/miscdevice.h>
-#include <linux/msm_audio_amrwb.h>
+#include <audio/linux/msm_audio_amrwb.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
--- a/dsp/codecs/audio_aac.c
+++ b/dsp/codecs/audio_aac.c
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2008 Google, Inc.
 * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2010-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2010-2020, The Linux Foundation. All rights reserved.
 *
 * This software is licensed under the terms of the GNU General Public
 * License version 2, as published by the Free Software Foundation, and
@@ -16,7 +16,7 @@
 *
 */

-#include <linux/msm_audio_aac.h>
+#include <audio/linux/msm_audio_aac.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"

--- a/dsp/codecs/audio_alac.c
+++ b/dsp/codecs/audio_alac.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
 */

 #include <linux/types.h>
-#include <linux/msm_audio_alac.h>
+#include <audio/linux/msm_audio_alac.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"

--- a/dsp/codecs/audio_amrwbplus.c
+++ b/dsp/codecs/audio_amrwbplus.c
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2008 Google, Inc.
 * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2010-2017, 2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2010-2017, 2019-2020 The Linux Foundation. All rights reserved.
 *
 * This software is licensed under the terms of the GNU General Public
 * License version 2, as published by the Free Software Foundation, and
@@ -15,7 +15,7 @@
 * GNU General Public License for more details.
 *
 */
-#include <linux/msm_audio_amrwbplus.h>
+#include <audio/linux/msm_audio_amrwbplus.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"

--- a/dsp/codecs/audio_ape.c
+++ b/dsp/codecs/audio_ape.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
 */

 #include <linux/types.h>
-#include <linux/msm_audio_ape.h>
+#include <audio/linux/msm_audio_ape.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"

--- a/dsp/codecs/audio_g711alaw.c
+++ b/dsp/codecs/audio_g711alaw.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2016-2017, 2019 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, 2019-2020 The Linux Foundation. All rights reserved.
 */

 #include <linux/types.h>
-#include <linux/msm_audio_g711_dec.h>
+#include <audio/linux/msm_audio_g711_dec.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"

--- a/dsp/codecs/audio_g711mlaw.c
+++ b/dsp/codecs/audio_g711mlaw.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2016-2017, 2019 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, 2019-2020 The Linux Foundation. All rights reserved.
 */

 #include <linux/types.h>
-#include <linux/msm_audio_g711_dec.h>
+#include <audio/linux/msm_audio_g711_dec.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"

--- a/dsp/codecs/audio_hwacc_effects.c
+++ b/dsp/codecs/audio_hwacc_effects.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2017, 2020 The Linux Foundation. All rights reserved.
 */

-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/compat.h>
 #include "q6audio_common.h"
 #include <dsp/msm-audio-effects-q6-v2.h>
--- a/dsp/codecs/audio_multi_aac.c
+++ b/dsp/codecs/audio_multi_aac.c
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2008 Google, Inc.
 * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2020, The Linux Foundation. All rights reserved.
 *
 * This software is licensed under the terms of the GNU General Public
 * License version 2, as published by the Free Software Foundation, and
@@ -16,7 +16,7 @@
 *
 */

-#include <linux/msm_audio_aac.h>
+#include <audio/linux/msm_audio_aac.h>
 #include <linux/compat.h>
 #include <soc/qcom/socinfo.h>
 #include "audio_utils_aio.h"
--- a/dsp/codecs/audio_utils.h
+++ b/dsp/codecs/audio_utils.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
-/* Copyright (c) 2010-2015, 2017 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2015, 2017, 2020 The Linux Foundation. All rights reserved.
 */
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/compat.h>
 #include "q6audio_common.h"

--- a/dsp/codecs/audio_utils_aio.h
+++ b/dsp/codecs/audio_utils_aio.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* Copyright (C) 2008 Google, Inc.
 * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2009-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009-2018, 2020 The Linux Foundation. All rights reserved.
 */

 #include <linux/fs.h>
@@ -11,7 +11,7 @@
 #include <linux/sched.h>
 #include <linux/uaccess.h>
 #include <linux/wait.h>
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/debugfs.h>
 #include <linux/list.h>
 #include <linux/slab.h>
--- a/dsp/codecs/audio_wma.c
+++ b/dsp/codecs/audio_wma.c
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2008 Google, Inc.
 * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2009-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009-2020, The Linux Foundation. All rights reserved.
 *
 * This software is licensed under the terms of the GNU General Public
 * License version 2, as published by the Free Software Foundation, and
@@ -17,7 +17,7 @@
 */

 #include <linux/types.h>
-#include <linux/msm_audio_wma.h>
+#include <audio/linux/msm_audio_wma.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"

--- a/dsp/codecs/audio_wmapro.c
+++ b/dsp/codecs/audio_wmapro.c
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2008 Google, Inc.
 * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2009-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009-2020, The Linux Foundation. All rights reserved.
 *
 * This software is licensed under the terms of the GNU General Public
 * License version 2, as published by the Free Software Foundation, and
@@ -17,7 +17,7 @@
 */

 #include <linux/types.h>
-#include <linux/msm_audio_wmapro.h>
+#include <audio/linux/msm_audio_wmapro.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"

--- a/dsp/codecs/evrc_in.c
+++ b/dsp/codecs/evrc_in.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2017, 2020 The Linux Foundation. All rights reserved.
 */

 #include <linux/module.h>
@@ -10,7 +10,7 @@
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/msm_audio_qcp.h>
+#include <audio/linux/msm_audio_qcp.h>
 #include <linux/atomic.h>
 #include <linux/compat.h>
 #include <asm/ioctls.h>
--- a/dsp/codecs/g711alaw_in.c
+++ b/dsp/codecs/g711alaw_in.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2017, 2020 The Linux Foundation. All rights reserved.
 */

 #include <linux/module.h>
@@ -10,7 +10,7 @@
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/msm_audio_g711.h>
+#include <audio/linux/msm_audio_g711.h>
 #include <linux/atomic.h>
 #include <linux/compat.h>
 #include <asm/ioctls.h>
--- a/dsp/codecs/g711mlaw_in.c
+++ b/dsp/codecs/g711mlaw_in.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2017, 2020 The Linux Foundation. All rights reserved.
 */

 #include <linux/module.h>
@@ -10,7 +10,7 @@
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/msm_audio_g711.h>
+#include <audio/linux/msm_audio_g711.h>
 #include <linux/atomic.h>
 #include <linux/compat.h>
 #include <asm/ioctls.h>
--- a/dsp/codecs/qcelp_in.c
+++ b/dsp/codecs/qcelp_in.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2017, 2020 The Linux Foundation. All rights reserved.
 */

 #include <linux/module.h>
@@ -10,7 +10,7 @@
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/msm_audio_qcp.h>
+#include <audio/linux/msm_audio_qcp.h>
 #include <linux/atomic.h>
 #include <linux/compat.h>
 #include <asm/ioctls.h>