From: Lars-Peter Clausen <lars@metafoo.de>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: alsa-devel@alsa-project.org, Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH 3/5] ASoC: stac9766: Move register defines to main source file
Date: Fri, 4 Nov 2016 18:26:55 +0100 [thread overview]
Message-ID: <1478280417-24832-3-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1478280417-24832-1-git-send-email-lars@metafoo.de>
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>
---
sound/soc/codecs/stac9766.c | 6 ++++--
sound/soc/codecs/stac9766.h | 12 ------------
sound/soc/fsl/efika-audio-fabric.c | 1 -
3 files changed, 4 insertions(+), 15 deletions(-)
delete mode 100644 sound/soc/codecs/stac9766.h
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c
index e54e4a4..f675d34 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 e35cee8..0000000
--- 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 b2acd329..f200d1c 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"
--
2.1.4
next prev parent reply other threads:[~2016-11-04 17:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-04 17:26 [PATCH 1/5] ASoC: stac9766: Remove unused DAI ID defines Lars-Peter Clausen
2016-11-04 17:26 ` [PATCH 2/5] ASoC: stac9766: Remove register paging support Lars-Peter Clausen
2016-11-04 17:26 ` Lars-Peter Clausen [this message]
2016-11-04 17:26 ` [PATCH 4/5] ASoC: stac9766: Convert to regmap Lars-Peter Clausen
2016-11-04 17:26 ` [PATCH 5/5] ASoC: stac9766: Remove ac97_read/ac97_write wrappers Lars-Peter Clausen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1478280417-24832-3-git-send-email-lars@metafoo.de \
--to=lars@metafoo.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).