Unverified Commit 5b66dde4 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: hsw_rt5640: Update code indentation 



Make use of 100 character limit and modify indentation so code is easier
to read. While at it, sort includes in alphabetical order.

Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Tested-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220620101402.2684366-5-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a69615e8

sound/soc/intel/boards/hsw_rt5640.c

+18 −41
Original line number Diff line number Diff line
@@ -9,10 +9,9 @@ 
#include <linux/platform_device.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>

#include <sound/soc-acpi.h>

#include <sound/pcm_params.h>



#include "../../codecs/rt5640.h"



/* Haswell ULT platforms have a Headphone and Mic jack */
@@ -22,7 +21,6 @@ static const struct snd_soc_dapm_widget card_widgets[] = { 
};



static const struct snd_soc_dapm_route card_routes[] = {



	{"Headphones", NULL, "HPOR"},

	{"Headphones", NULL, "HPOL"},

	{"IN2P", NULL, "Mic"},
@@ -35,17 +33,15 @@ static const struct snd_soc_dapm_route card_routes[] = { 
static int codec_link_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

				      struct snd_pcm_hw_params *params)

{

	struct snd_interval *rate = hw_param_interval(params,

			SNDRV_PCM_HW_PARAM_RATE);

	struct snd_interval *channels = hw_param_interval(params,

						SNDRV_PCM_HW_PARAM_CHANNELS);

	struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);

	struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);



	/* The ADSP will covert the FE rate to 48k, stereo */

	rate->min = rate->max = 48000;

	channels->min = channels->max = 2;



	/* set SSP0 to 16 bit */

	params_set_format(params, SNDRV_PCM_FORMAT_S16_LE);



	return 0;

}
@@ -56,9 +52,7 @@ static int codec_link_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	int ret;



	ret = snd_soc_dai_set_sysclk(codec_dai, RT5640_SCLK_S_MCLK, 12288000,

		SND_SOC_CLOCK_IN);



	ret = snd_soc_dai_set_sysclk(codec_dai, RT5640_SCLK_S_MCLK, 12288000, SND_SOC_CLOCK_IN);

	if (ret < 0) {

		dev_err(rtd->dev, "can't set codec sysclk configuration\n");

		return ret;
@@ -74,29 +68,15 @@ static const struct snd_soc_ops codec_link_ops = { 
	.hw_params = codec_link_hw_params,

};



SND_SOC_DAILINK_DEF(dummy,

	DAILINK_COMP_ARRAY(COMP_DUMMY()));



SND_SOC_DAILINK_DEF(system,

	DAILINK_COMP_ARRAY(COMP_CPU("System Pin")));

SND_SOC_DAILINK_DEF(system, DAILINK_COMP_ARRAY(COMP_CPU("System Pin")));

SND_SOC_DAILINK_DEF(offload0, DAILINK_COMP_ARRAY(COMP_CPU("Offload0 Pin")));

SND_SOC_DAILINK_DEF(offload1, DAILINK_COMP_ARRAY(COMP_CPU("Offload1 Pin")));

SND_SOC_DAILINK_DEF(loopback, DAILINK_COMP_ARRAY(COMP_CPU("Loopback Pin")));



SND_SOC_DAILINK_DEF(offload0,

	DAILINK_COMP_ARRAY(COMP_CPU("Offload0 Pin")));



SND_SOC_DAILINK_DEF(offload1,

	DAILINK_COMP_ARRAY(COMP_CPU("Offload1 Pin")));



SND_SOC_DAILINK_DEF(loopback,

	DAILINK_COMP_ARRAY(COMP_CPU("Loopback Pin")));



SND_SOC_DAILINK_DEF(codec,

	DAILINK_COMP_ARRAY(COMP_CODEC("i2c-INT33CA:00", "rt5640-aif1")));



SND_SOC_DAILINK_DEF(platform,

	DAILINK_COMP_ARRAY(COMP_PLATFORM("haswell-pcm-audio")));



SND_SOC_DAILINK_DEF(ssp0_port,

	    DAILINK_COMP_ARRAY(COMP_CPU("ssp0-port")));

SND_SOC_DAILINK_DEF(dummy, DAILINK_COMP_ARRAY(COMP_DUMMY()));

SND_SOC_DAILINK_DEF(codec, DAILINK_COMP_ARRAY(COMP_CODEC("i2c-INT33CA:00", "rt5640-aif1")));

SND_SOC_DAILINK_DEF(platform, DAILINK_COMP_ARRAY(COMP_PLATFORM("haswell-pcm-audio")));

SND_SOC_DAILINK_DEF(ssp0_port, DAILINK_COMP_ARRAY(COMP_CPU("ssp0-port")));



static struct snd_soc_dai_link card_dai_links[] = {

	/* Front End DAI links */
@@ -137,15 +117,13 @@ static struct snd_soc_dai_link card_dai_links[] = { 
		.dpcm_capture = 1,

		SND_SOC_DAILINK_REG(loopback, dummy, platform),

	},



	/* Back End DAI links */

	{

		/* SSP0 - Codec */

		.name = "Codec",

		.id = 0,

		.no_pcm = 1,

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_CBC_CFC,

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC,

		.ignore_pmdown_time = 1,

		.be_hw_params_fixup = codec_link_hw_params_fixup,

		.ops = &codec_link_ops,
@@ -174,11 +152,10 @@ static int hsw_rt5640_probe(struct platform_device *pdev) 
	int ret;



	hsw_rt5640_card.dev = &pdev->dev;



	/* override platform name, if required */

	mach = pdev->dev.platform_data;

	ret = snd_soc_fixup_dai_links_platform_name(&hsw_rt5640_card,

						    mach->mach_params.platform);



	ret = snd_soc_fixup_dai_links_platform_name(&hsw_rt5640_card, mach->mach_params.platform);

	if (ret)

		return ret;