Merge "ASoC: aw8896: Keep dev name for aw8896 SmartPA" (d6dd6bf9) · Commits · e / devices / android_kernel_fairphone_FP3

sound/soc/codecs/aw8896.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -927,9 +927,6 @@ static int aw8896_probe(struct snd_soc_codec *codec)
		aw8896->codec = codec;
		aw8896_add_codec_controls(aw8896);

		if (codec->dev->of_node)
		dev_set_name(codec->dev, "%s", "aw8896_smartpa");

		return ret;
		}

		@@ -1404,12 +1401,6 @@ static int aw8896_i2c_probe(struct i2c_client *i2c,
		goto err_id;
		}

		if (i2c->dev.of_node)
		dev_set_name(&i2c->dev, "%s", "aw8896_smartpa");
		else
		dev_err(&i2c->dev, "%s failed to set device name: %d\n",
		__func__, ret);

		/* register codec */
		dai = devm_kzalloc(&i2c->dev, sizeof(aw8896_dai), GFP_KERNEL);
		if (!dai)