alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Krzysztof Kozlowski <krzk@kernel.org>
To: Krzysztof Kozlowski <krzk@kernel.org>,
	Sangbeom Kim <sbkim73@samsung.com>,
	Sylwester Nawrocki <s.nawrocki@samsung.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
	Takashi Iwai <tiwai@suse.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org
Subject: [PATCH 2/6] ASoC: samsung: smdk_wm8580: Remove old platforms and drop mach-types usage
Date: Sat, 19 Nov 2016 16:48:27 +0200	[thread overview]
Message-ID: <1479566911-5580-3-git-send-email-krzk@kernel.org> (raw)
In-Reply-To: <1479566911-5580-1-git-send-email-krzk@kernel.org>

MACH_SMDKC100, MACH_SMDKV210 and MACH_SMDKC110 are no longer supported
so drop the dead code.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
 sound/soc/samsung/smdk_wm8580.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/sound/soc/samsung/smdk_wm8580.c b/sound/soc/samsung/smdk_wm8580.c
index 548bfd993788..59fd3b8fd414 100644
--- a/sound/soc/samsung/smdk_wm8580.c
+++ b/sound/soc/samsung/smdk_wm8580.c
@@ -14,8 +14,6 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
-#include <asm/mach-types.h>
-
 #include "../codecs/wm8580.h"
 #include "i2s.h"
 
@@ -206,15 +204,10 @@ static int __init smdk_audio_init(void)
 	int ret;
 	char *str;
 
-	if (machine_is_smdkc100()
-			|| machine_is_smdkv210() || machine_is_smdkc110()) {
-		smdk.num_links = 3;
-	} else if (machine_is_smdk6410()) {
-		str = (char *)smdk_dai[PRI_PLAYBACK].cpu_dai_name;
-		str[strlen(str) - 1] = '2';
-		str = (char *)smdk_dai[PRI_CAPTURE].cpu_dai_name;
-		str[strlen(str) - 1] = '2';
-	}
+	str = (char *)smdk_dai[PRI_PLAYBACK].cpu_dai_name;
+	str[strlen(str) - 1] = '2';
+	str = (char *)smdk_dai[PRI_CAPTURE].cpu_dai_name;
+	str[strlen(str) - 1] = '2';
 
 	smdk_snd_device = platform_device_alloc("soc-audio", -1);
 	if (!smdk_snd_device)
-- 
2.7.4

  parent reply	other threads:[~2016-11-19 14:48 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-19 14:48 [PATCH 0/6] ASoC: samsung: Minor cleanup for old machines Krzysztof Kozlowski
2016-11-19 14:48 ` [PATCH 1/6] ASoC: samsung: Remove non-existing MACH dependencies Krzysztof Kozlowski
2016-11-21 10:17   ` Sylwester Nawrocki
2016-11-22 17:26   ` Applied "ASoC: samsung: Remove non-existing MACH dependencies" to the asoc tree Mark Brown
2016-11-19 14:48 ` Krzysztof Kozlowski [this message]
2016-11-19 15:42   ` [PATCH 2/6] ASoC: samsung: smdk_wm8580: Remove old platforms and drop mach-types usage Lars-Peter Clausen
2016-11-19 15:45     ` Lars-Peter Clausen
2016-11-19 15:48       ` Lars-Peter Clausen
2016-11-19 18:01         ` Krzysztof Kozlowski
2016-11-19 14:48 ` [RFT 3/6] ASoC: samsung: smdk_wm8580: Remove machine specific quirks Krzysztof Kozlowski
2016-11-19 14:48 ` [PATCH 4/6] ASoC: samsung: Enable COMPILE_TEST for SmartQ and WM8580 Krzysztof Kozlowski
2016-11-22 17:26   ` Applied "ASoC: samsung: Enable COMPILE_TEST for SmartQ and WM8580" to the asoc tree Mark Brown
2016-11-19 14:48 ` [PATCH 5/6] ASoC: samsung: Enable COMPILE_TEST for entire Samsung ASoc Krzysztof Kozlowski
2016-11-22 17:26   ` Applied "ASoC: samsung: Enable COMPILE_TEST for entire Samsung ASoc" to the asoc tree Mark Brown
2016-11-19 14:48 ` [PATCH 6/6] ARM: s5pv210_defconfig: Remove old MACHs Krzysztof Kozlowski

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=1479566911-5580-3-git-send-email-krzk@kernel.org \
    --to=krzk@kernel.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=s.nawrocki@samsung.com \
    --cc=sbkim73@samsung.com \
    --cc=tiwai@suse.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).