Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4301aecb authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/log' into asoc-next

parents edbe08ad b1bc7b3c
Loading
Loading
Loading
Loading
+5 −5
Original line number Original line Diff line number Diff line
@@ -88,7 +88,7 @@ static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec)
		ret = snd_soc_write(codec, i, val);
		ret = snd_soc_write(codec, i, val);
		if (ret)
		if (ret)
			return ret;
			return ret;
		dev_dbg(codec->dev, "Synced register %#x, value = %#x\n",
		dev_dbg(codec->dev, "ASoC: Synced register %#x, value = %#x\n",
			i, val);
			i, val);
	}
	}
	return 0;
	return 0;
@@ -156,7 +156,7 @@ int snd_soc_cache_init(struct snd_soc_codec *codec)


	/* Fall back to flat compression */
	/* Fall back to flat compression */
	if (i == ARRAY_SIZE(cache_types)) {
	if (i == ARRAY_SIZE(cache_types)) {
		dev_warn(codec->dev, "Could not match compress type: %d\n",
		dev_warn(codec->dev, "ASoC: Could not match compress type: %d\n",
			 codec->compress_type);
			 codec->compress_type);
		i = 0;
		i = 0;
	}
	}
@@ -166,7 +166,7 @@ int snd_soc_cache_init(struct snd_soc_codec *codec)


	if (codec->cache_ops->init) {
	if (codec->cache_ops->init) {
		if (codec->cache_ops->name)
		if (codec->cache_ops->name)
			dev_dbg(codec->dev, "Initializing %s cache for %s codec\n",
			dev_dbg(codec->dev, "ASoC: Initializing %s cache for %s codec\n",
				codec->cache_ops->name, codec->name);
				codec->cache_ops->name, codec->name);
		return codec->cache_ops->init(codec);
		return codec->cache_ops->init(codec);
	}
	}
@@ -181,7 +181,7 @@ int snd_soc_cache_exit(struct snd_soc_codec *codec)
{
{
	if (codec->cache_ops && codec->cache_ops->exit) {
	if (codec->cache_ops && codec->cache_ops->exit) {
		if (codec->cache_ops->name)
		if (codec->cache_ops->name)
			dev_dbg(codec->dev, "Destroying %s cache for %s codec\n",
			dev_dbg(codec->dev, "ASoC: Destroying %s cache for %s codec\n",
				codec->cache_ops->name, codec->name);
				codec->cache_ops->name, codec->name);
		return codec->cache_ops->exit(codec);
		return codec->cache_ops->exit(codec);
	}
	}
@@ -265,7 +265,7 @@ int snd_soc_cache_sync(struct snd_soc_codec *codec)
		name = "unknown";
		name = "unknown";


	if (codec->cache_ops->name)
	if (codec->cache_ops->name)
		dev_dbg(codec->dev, "Syncing %s cache for %s codec\n",
		dev_dbg(codec->dev, "ASoC: Syncing %s cache for %s codec\n",
			codec->cache_ops->name, codec->name);
			codec->cache_ops->name, codec->name);
	trace_snd_soc_cache_sync(codec, name, "start");
	trace_snd_soc_cache_sync(codec, name, "start");
	ret = codec->cache_ops->sync(codec);
	ret = codec->cache_ops->sync(codec);
+123 −118

File changed.

Preview size limit exceeded, changes collapsed.

+74 −60

File changed.

Preview size limit exceeded, changes collapsed.

+7 −6
Original line number Original line Diff line number Diff line
@@ -169,12 +169,13 @@ int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count,


	for (i = 0; i < count; i++) {
	for (i = 0; i < count; i++) {
		if (!pins[i].pin) {
		if (!pins[i].pin) {
			printk(KERN_ERR "No name for pin %d\n", i);
			dev_err(jack->codec->dev, "ASoC: No name for pin %d\n",
				i);
			return -EINVAL;
			return -EINVAL;
		}
		}
		if (!pins[i].mask) {
		if (!pins[i].mask) {
			printk(KERN_ERR "No mask for pin %d (%s)\n", i,
			dev_err(jack->codec->dev, "ASoC: No mask for pin %d"
			       pins[i].pin);
				" (%s)\n", i, pins[i].pin);
			return -EINVAL;
			return -EINVAL;
		}
		}


@@ -294,13 +295,13 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,


	for (i = 0; i < count; i++) {
	for (i = 0; i < count; i++) {
		if (!gpio_is_valid(gpios[i].gpio)) {
		if (!gpio_is_valid(gpios[i].gpio)) {
			printk(KERN_ERR "Invalid gpio %d\n",
			dev_err(jack->codec->dev, "ASoC: Invalid gpio %d\n",
				gpios[i].gpio);
				gpios[i].gpio);
			ret = -EINVAL;
			ret = -EINVAL;
			goto undo;
			goto undo;
		}
		}
		if (!gpios[i].name) {
		if (!gpios[i].name) {
			printk(KERN_ERR "No name for gpio %d\n",
			dev_err(jack->codec->dev, "ASoC: No name for gpio %d\n",
				gpios[i].gpio);
				gpios[i].gpio);
			ret = -EINVAL;
			ret = -EINVAL;
			goto undo;
			goto undo;
@@ -329,7 +330,7 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
		if (gpios[i].wake) {
		if (gpios[i].wake) {
			ret = irq_set_irq_wake(gpio_to_irq(gpios[i].gpio), 1);
			ret = irq_set_irq_wake(gpio_to_irq(gpios[i].gpio), 1);
			if (ret != 0)
			if (ret != 0)
				printk(KERN_ERR
				dev_err(jack->codec->dev, "ASoC: "
				  "Failed to mark GPIO %d as wake source: %d\n",
				  "Failed to mark GPIO %d as wake source: %d\n",
					gpios[i].gpio, ret);
					gpios[i].gpio, ret);
		}
		}
+100 −95

File changed.

Preview size limit exceeded, changes collapsed.