Merge remote-tracking branches 'asoc/topic/cs4265', 'asoc/topic/cs42l52',... (9919badf) · Commits · e / devices / android_kernel_fairphone_FP3

sound/soc/codecs/cs4265.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ static bool cs4265_readable_register(struct device *dev, unsigned int reg)
		case CS4265_INT_MASK:
		case CS4265_STATUS_MODE_MSB:
		case CS4265_STATUS_MODE_LSB:
		case CS4265_CHIP_ID:
		return true;
		default:
		return false;

+2 −2

Original line number	Diff line number	Diff line
		@@ -176,9 +176,9 @@ static bool cs42l52_volatile_register(struct device *dev, unsigned int reg)
		case CS42L52_BATT_LEVEL:
		case CS42L52_SPK_STATUS:
		case CS42L52_CHARGE_PUMP:
		return 1;
		return true;
		default:
		return 0;
		return false;
		}
		}

+2 −5

Original line number	Diff line number	Diff line
		@@ -171,9 +171,9 @@ static bool cs42l56_volatile_register(struct device *dev, unsigned int reg)
		{
		switch (reg) {
		case CS42L56_INT_STATUS:
		return 1;
		return true;
		default:
		return 0;
		return false;
		}
		}

		@@ -1175,11 +1175,8 @@ static int cs42l56_probe(struct snd_soc_codec *codec)

		static int cs42l56_remove(struct snd_soc_codec *codec)
		{
		struct cs42l56_private *cs42l56 = snd_soc_codec_get_drvdata(codec);

		cs42l56_free_beep(codec);
		cs42l56_set_bias_level(codec, SND_SOC_BIAS_OFF);
		regulator_bulk_free(ARRAY_SIZE(cs42l56->supplies), cs42l56->supplies);

		return 0;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -217,7 +217,7 @@ static void da732x_set_charge_pump(struct snd_soc_codec *codec, int state)
		snd_soc_write(codec, DA732X_REG_CP_CTRL1, DA723X_CP_DIS);
		break;
		default:
		pr_err(KERN_ERR "Wrong charge pump state\n");
		pr_err("Wrong charge pump state\n");
		break;
		}
		}