From: Lars-Peter Clausen <lars@metafoo.de>
Date: Fri, 4 Nov 2016 17:26:55 +0000 (+0100)
Subject: ASoC: stac9766: Move register defines to main source file
X-Git-Tag: v4.10-rc1~121^2~3^2~3^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=dccb395c268e9f96dfaf3f3bb9933aa9a0ded8cc;p=linux.git

ASoC: stac9766: Move register defines to main source file

The stac9766 driver has a header file that defines 3 register locations.
Move these to the main source file since it is not really worth it having a
separate file for them. The header file is now empty and can be removed.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c
index e54e4a4ce296..f675d343b529 100644
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
@@ -26,11 +26,13 @@
 #include <sound/soc.h>
 #include <sound/tlv.h>
 
-#include "stac9766.h"
-
 #define STAC9766_VENDOR_ID 0x83847666
 #define STAC9766_VENDOR_ID_MASK 0xffffffff
 
+#define AC97_STAC_DA_CONTROL 0x6A
+#define AC97_STAC_ANALOG_SPECIAL 0x6E
+#define AC97_STAC_STEREO_MIC 0x78
+
 /*
  * STAC9766 register cache
  */
diff --git a/sound/soc/codecs/stac9766.h b/sound/soc/codecs/stac9766.h
deleted file mode 100644
index e35cee82f416..000000000000
--- a/sound/soc/codecs/stac9766.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * stac9766.h  --  STAC9766 Soc Audio driver
- */
-
-#ifndef _STAC9766_H
-#define _STAC9766_H
-
-#define AC97_STAC_DA_CONTROL 0x6A
-#define AC97_STAC_ANALOG_SPECIAL 0x6E
-#define AC97_STAC_STEREO_MIC 0x78
-
-#endif
diff --git a/sound/soc/fsl/efika-audio-fabric.c b/sound/soc/fsl/efika-audio-fabric.c
index b2acd3293ea8..f200d1cfc4bd 100644
--- a/sound/soc/fsl/efika-audio-fabric.c
+++ b/sound/soc/fsl/efika-audio-fabric.c
@@ -27,7 +27,6 @@
 
 #include "mpc5200_dma.h"
 #include "mpc5200_psc_ac97.h"
-#include "../codecs/stac9766.h"
 
 #define DRV_NAME "efika-audio-fabric"