Merge branch 'for-5.4' of... (992fd39a) · Commits · 戴 / test

include/sound/simple_card_utils.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv,
		struct link_info *li);

		#ifdef DEBUG
		inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv,
		static inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv,
		char *name,
		struct asoc_simple_dai *dai)
		{
		@@ -168,7 +168,7 @@ inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv,
		dev_dbg(dev, "%s clk %luHz\n", name, clk_get_rate(dai->clk));
		}

		inline void asoc_simple_debug_info(struct asoc_simple_priv *priv)
		static inline void asoc_simple_debug_info(struct asoc_simple_priv *priv)
		{
		struct snd_soc_card *card = simple_priv_to_card(priv);
		struct device *dev = simple_priv_to_dev(priv);

+1 −1

Original line number	Diff line number	Diff line
		@@ -528,7 +528,7 @@ static int snd_compress_check_input(struct snd_compr_params *params)
		{
		/* first let's check the buffer parameter's */
		if (params->buffer.fragment_size == 0 \|\|
		params->buffer.fragments > INT_MAX / params->buffer.fragment_size \|\|
		params->buffer.fragments > U32_MAX / params->buffer.fragment_size \|\|
		params->buffer.fragments == 0)
		return -EINVAL;

+1 −1

Original line number	Diff line number	Diff line
		@@ -500,8 +500,8 @@ static void hdac_hda_codec_remove(struct snd_soc_component *component)
		return;
		}

		snd_hdac_ext_bus_link_put(hdev->bus, hlink);
		pm_runtime_disable(&hdev->dev);
		snd_hdac_ext_bus_link_put(hdev->bus, hlink);
		}

		static const struct snd_soc_dapm_route hdac_hda_dapm_routes[] = {

+5 −7

Original line number	Diff line number	Diff line
		@@ -274,7 +274,7 @@ struct hdmi_codec_priv {
		uint8_t eld[MAX_ELD_BYTES];
		struct snd_pcm_chmap *chmap_info;
		unsigned int chmap_idx;
		struct mutex lock;
		unsigned long busy;
		struct snd_soc_jack *jack;
		unsigned int jack_status;
		};
		@@ -390,8 +390,8 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream,
		struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai);
		int ret = 0;

		ret = mutex_trylock(&hcp->lock);
		if (!ret) {
		ret = test_and_set_bit(0, &hcp->busy);
		if (ret) {
		dev_err(dai->dev, "Only one simultaneous stream supported!\n");
		return -EINVAL;
		}
		@@ -419,7 +419,7 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream,

		err:
		/* Release the exclusive lock on error */
		mutex_unlock(&hcp->lock);
		clear_bit(0, &hcp->busy);
		return ret;
		}

		@@ -431,7 +431,7 @@ static void hdmi_codec_shutdown(struct snd_pcm_substream *substream,
		hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN;
		hcp->hcd.ops->audio_shutdown(dai->dev->parent, hcp->hcd.data);

		mutex_unlock(&hcp->lock);
		clear_bit(0, &hcp->busy);
		}

		static int hdmi_codec_hw_params(struct snd_pcm_substream *substream,
		@@ -811,8 +811,6 @@ static int hdmi_codec_probe(struct platform_device *pdev)
		return -ENOMEM;

		hcp->hcd = *hcd;
		mutex_init(&hcp->lock);

		daidrv = devm_kcalloc(dev, dai_count, sizeof(*daidrv), GFP_KERNEL);
		if (!daidrv)
		return -ENOMEM;

+2 −2

Original line number	Diff line number	Diff line
		@@ -960,11 +960,11 @@ static int max98373_i2c_probe(struct i2c_client *i2c,

		/* Power on device */
		if (gpio_is_valid(max98373->reset_gpio)) {
		ret = gpio_request(max98373->reset_gpio, "MAX98373_RESET");
		ret = devm_gpio_request(&i2c->dev, max98373->reset_gpio,
		"MAX98373_RESET");
		if (ret) {
		dev_err(&i2c->dev, "%s: Failed to request gpio %d\n",
		__func__, max98373->reset_gpio);
		gpio_free(max98373->reset_gpio);
		return -EINVAL;
		}
		gpio_direction_output(max98373->reset_gpio, 0);