Unverified Commit b0714c5d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/cs35l32', 'asoc/topic/cs35l34',... 

Merge remote-tracking branches 'asoc/topic/cs35l32', 'asoc/topic/cs35l34', 'asoc/topic/cs42l52', 'asoc/topic/cs42l56' and 'asoc/topic/cs42l73' into asoc-next
parents 9a2fef7c b28ad41e 7f9f3abd cd9e0b82 e8d8b98c ef3d687c

sound/soc/codecs/cs35l32.c

+6 −12
Original line number Diff line number Diff line
@@ -355,13 +355,9 @@ static int cs35l32_i2c_probe(struct i2c_client *i2c_client, 
	unsigned int devid = 0;

	unsigned int reg;





	cs35l32 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs35l32_private),

			       GFP_KERNEL);

	if (!cs35l32) {

		dev_err(&i2c_client->dev, "could not allocate codec\n");

	cs35l32 = devm_kzalloc(&i2c_client->dev, sizeof(*cs35l32), GFP_KERNEL);

	if (!cs35l32)

		return -ENOMEM;

	}



	i2c_set_clientdata(i2c_client, cs35l32);
@@ -375,13 +371,11 @@ static int cs35l32_i2c_probe(struct i2c_client *i2c_client, 
	if (pdata) {

		cs35l32->pdata = *pdata;

	} else {

		pdata = devm_kzalloc(&i2c_client->dev,

				     sizeof(struct cs35l32_platform_data),

		pdata = devm_kzalloc(&i2c_client->dev, sizeof(*pdata),

				     GFP_KERNEL);

		if (!pdata) {

			dev_err(&i2c_client->dev, "could not allocate pdata\n");

		if (!pdata)

			return -ENOMEM;

		}



		if (i2c_client->dev.of_node) {

			ret = cs35l32_handle_of_data(i2c_client,

						     &cs35l32->pdata);

sound/soc/codecs/cs35l34.c

+6 −13
Original line number Diff line number Diff line
@@ -1004,13 +1004,9 @@ static int cs35l34_i2c_probe(struct i2c_client *i2c_client, 
	unsigned int devid = 0;

	unsigned int reg;



	cs35l34 = devm_kzalloc(&i2c_client->dev,

			       sizeof(struct cs35l34_private),

			       GFP_KERNEL);

	if (!cs35l34) {

		dev_err(&i2c_client->dev, "could not allocate codec\n");

	cs35l34 = devm_kzalloc(&i2c_client->dev, sizeof(*cs35l34), GFP_KERNEL);

	if (!cs35l34)

		return -ENOMEM;

	}



	i2c_set_clientdata(i2c_client, cs35l34);

	cs35l34->regmap = devm_regmap_init_i2c(i2c_client, &cs35l34_regmap);
@@ -1044,14 +1040,11 @@ static int cs35l34_i2c_probe(struct i2c_client *i2c_client, 
	if (pdata) {

		cs35l34->pdata = *pdata;

	} else {

		pdata = devm_kzalloc(&i2c_client->dev,

				sizeof(struct cs35l34_platform_data),

		pdata = devm_kzalloc(&i2c_client->dev, sizeof(*pdata),

				     GFP_KERNEL);

		if (!pdata) {

			dev_err(&i2c_client->dev,

				"could not allocate pdata\n");

		if (!pdata)

			return -ENOMEM;

		}



		if (i2c_client->dev.of_node) {

			ret = cs35l34_handle_of_data(i2c_client, pdata);

			if (ret != 0)

sound/soc/codecs/cs42l52.c

+5 −8
Original line number Diff line number Diff line
@@ -1100,8 +1100,7 @@ static int cs42l52_i2c_probe(struct i2c_client *i2c_client, 
	unsigned int reg;

	u32 val32;



	cs42l52 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs42l52_private),

			       GFP_KERNEL);

	cs42l52 = devm_kzalloc(&i2c_client->dev, sizeof(*cs42l52), GFP_KERNEL);

	if (cs42l52 == NULL)

		return -ENOMEM;

	cs42l52->dev = &i2c_client->dev;
@@ -1115,13 +1114,11 @@ static int cs42l52_i2c_probe(struct i2c_client *i2c_client, 
	if (pdata) {

		cs42l52->pdata = *pdata;

	} else {

		pdata = devm_kzalloc(&i2c_client->dev,

				     sizeof(struct cs42l52_platform_data),

		pdata = devm_kzalloc(&i2c_client->dev, sizeof(*pdata),

				     GFP_KERNEL);

		if (!pdata) {

			dev_err(&i2c_client->dev, "could not allocate pdata\n");

		if (!pdata)

			return -ENOMEM;

		}



		if (i2c_client->dev.of_node) {

			if (of_property_read_bool(i2c_client->dev.of_node,

				"cirrus,mica-differential-cfg"))

sound/soc/codecs/cs42l56.c

+4 −9
Original line number Diff line number Diff line
@@ -1190,9 +1190,7 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client, 
	unsigned int alpha_rev, metal_rev;

	unsigned int reg;



	cs42l56 = devm_kzalloc(&i2c_client->dev,

			       sizeof(struct cs42l56_private),

			       GFP_KERNEL);

	cs42l56 = devm_kzalloc(&i2c_client->dev, sizeof(*cs42l56), GFP_KERNEL);

	if (cs42l56 == NULL)

		return -ENOMEM;

	cs42l56->dev = &i2c_client->dev;
@@ -1207,14 +1205,11 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client, 
	if (pdata) {

		cs42l56->pdata = *pdata;

	} else {

		pdata = devm_kzalloc(&i2c_client->dev,

				     sizeof(struct cs42l56_platform_data),

		pdata = devm_kzalloc(&i2c_client->dev, sizeof(*pdata),

				     GFP_KERNEL);

		if (!pdata) {

			dev_err(&i2c_client->dev,

				"could not allocate pdata\n");

		if (!pdata)

			return -ENOMEM;

		}



		if (i2c_client->dev.of_node) {

			ret = cs42l56_handle_of_data(i2c_client,

						     &cs42l56->pdata);

sound/soc/codecs/cs42l73.c

+6 −9
Original line number Diff line number Diff line
@@ -1289,8 +1289,7 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client, 
	unsigned int reg;

	u32 val32;



	cs42l73 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs42l73_private),

			       GFP_KERNEL);

	cs42l73 = devm_kzalloc(&i2c_client->dev, sizeof(*cs42l73), GFP_KERNEL);

	if (!cs42l73)

		return -ENOMEM;
@@ -1304,13 +1303,11 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client, 
	if (pdata) {

		cs42l73->pdata = *pdata;

	} else {

		pdata = devm_kzalloc(&i2c_client->dev,

				     sizeof(struct cs42l73_platform_data),

		pdata = devm_kzalloc(&i2c_client->dev, sizeof(*pdata),

				     GFP_KERNEL);

		if (!pdata) {

			dev_err(&i2c_client->dev, "could not allocate pdata\n");

		if (!pdata)

			return -ENOMEM;

		}



		if (i2c_client->dev.of_node) {

			if (of_property_read_u32(i2c_client->dev.of_node,

				"chgfreq", &val32) >= 0)
@@ -1358,7 +1355,7 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client, 
	ret = regmap_read(cs42l73->regmap, CS42L73_REVID, &reg);

	if (ret < 0) {

		dev_err(&i2c_client->dev, "Get Revision ID failed\n");

		return ret;;

		return ret;

	}



	dev_info(&i2c_client->dev,