All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cezary Rojewski <cezary.rojewski@intel.com>
To: alsa-devel@alsa-project.org
Cc: lgirdwood@gmail.com, Cezary Rojewski <cezary.rojewski@intel.com>,
	broonie@kernel.org, tiwai@suse.com,
	pierre-louis.bossart@linux.intel.com
Subject: [PATCH 2/4] ASoC: Intel: haswell: Simplify device probe
Date: Thu, 22 Aug 2019 13:36:14 +0200	[thread overview]
Message-ID: <20190822113616.22702-3-cezary.rojewski@intel.com> (raw)
In-Reply-To: <20190822113616.22702-1-cezary.rojewski@intel.com>

With legacy ADSP private context adjusted, there is no need for double
safety.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
 sound/soc/intel/boards/haswell.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/sound/soc/intel/boards/haswell.c b/sound/soc/intel/boards/haswell.c
index 4d3822cff98c..3dadf9bff796 100644
--- a/sound/soc/intel/boards/haswell.c
+++ b/sound/soc/intel/boards/haswell.c
@@ -188,18 +188,14 @@ static struct snd_soc_card haswell_rt5640 = {
 static int haswell_audio_probe(struct platform_device *pdev)
 {
 	struct snd_soc_acpi_mach *mach;
-	const char *platform_name = NULL;
 	int ret;
 
 	haswell_rt5640.dev = &pdev->dev;
 
 	/* override plaform name, if required */
 	mach = (&pdev->dev)->platform_data;
-	if (mach) /* extra check since legacy does not pass parameters */
-		platform_name = mach->mach_params.platform;
-
 	ret = snd_soc_fixup_dai_links_platform_name(&haswell_rt5640,
-						    platform_name);
+						    mach->mach_params.platform);
 	if (ret)
 		return ret;
 
-- 
2.17.1

  parent reply	other threads:[~2019-08-22 11:36 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-22 11:36 [PATCH 0/4] ASoC: Intel: Haswell: Adjust machine device private Cezary Rojewski
2019-08-22 11:36 ` [PATCH 1/4] ASoC: Intel: Haswell: Adjust machine device private context Cezary Rojewski
2019-08-22 14:07   ` Pierre-Louis Bossart
2019-08-22 15:11     ` Cezary Rojewski
2019-08-22 15:58   ` Pierre-Louis Bossart
2019-08-22 16:05     ` Cezary Rojewski
2019-08-22 16:42       ` Pierre-Louis Bossart
2019-08-22 17:14         ` Cezary Rojewski
2019-08-22 18:44           ` Pierre-Louis Bossart
2019-08-22 19:02             ` Cezary Rojewski
2019-08-22 20:44               ` Pierre-Louis Bossart
2019-08-23  7:27                 ` Cezary Rojewski
2019-08-28  9:38                   ` Cezary Rojewski
2019-08-29 22:31                     ` Pierre-Louis Bossart
2019-08-30 11:45   ` Applied "ASoC: Intel: Haswell: Adjust machine device private context" to the asoc tree Mark Brown
2019-08-30 11:45     ` [alsa-devel] " Mark Brown
2019-08-22 11:36 ` Cezary Rojewski [this message]
2019-08-30 11:45   ` Applied "ASoC: Intel: haswell: Simplify device probe" " Mark Brown
2019-08-30 11:45     ` [alsa-devel] " Mark Brown
2019-08-22 11:36 ` [PATCH 3/4] ASoC: Intel: bdw-rt5677: Simplify device probe Cezary Rojewski
2019-08-30 11:45   ` Applied "ASoC: Intel: bdw-rt5677: Simplify device probe" to the asoc tree Mark Brown
2019-08-30 11:45     ` [alsa-devel] " Mark Brown
2019-08-22 11:36 ` [PATCH 4/4] ASoC: Intel: broadwell: Simplify device probe Cezary Rojewski
2019-08-30 11:45   ` Applied "ASoC: Intel: broadwell: Simplify device probe" to the asoc tree Mark Brown
2019-08-30 11:45     ` [alsa-devel] " Mark Brown
2019-08-29 22:45 ` [PATCH 0/4] ASoC: Intel: Haswell: Adjust machine device private Pierre-Louis Bossart

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=20190822113616.22702-3-cezary.rojewski@intel.com \
    --to=cezary.rojewski@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=pierre-louis.bossart@linux.intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.