Unverified Commit a157d07d authored by Biju Das's avatar Biju Das Committed by Mark Brown
Browse files

ASoC: ak4642: Minor cleanups in probe() 



Some minor cleanups:
 Replace local variable np with dev_fwnode()
 Replace dev_err()->dev_err_probe().
 Remove comma in the terminator entry for OF table.
 Drop a space in the terminator entry for ID table.

Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20230831204734.104954-2-biju.das.jz@bp.renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0bb80ecc

sound/soc/codecs/ak4642.c

+5 −8
Original line number Diff line number Diff line
@@ -633,13 +633,12 @@ static const struct i2c_device_id ak4642_i2c_id[]; 
static int ak4642_i2c_probe(struct i2c_client *i2c)

{

	struct device *dev = &i2c->dev;

	struct device_node *np = dev->of_node;

	const struct ak4642_drvdata *drvdata = NULL;

	struct regmap *regmap;

	struct ak4642_priv *priv;

	struct clk *mcko = NULL;



	if (np) {

	if (dev_fwnode(dev)) {

		const struct of_device_id *of_id;



		mcko = ak4642_of_parse_mcko(dev);
@@ -655,10 +654,8 @@ static int ak4642_i2c_probe(struct i2c_client *i2c) 
		drvdata = (const struct ak4642_drvdata *)id->driver_data;

	}



	if (!drvdata) {

		dev_err(dev, "Unknown device type\n");

		return -EINVAL;

	}

	if (!drvdata)

		return dev_err_probe(dev, -EINVAL, "Unknown device type\n");



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)
@@ -681,7 +678,7 @@ static const struct of_device_id ak4642_of_match[] = { 
	{ .compatible = "asahi-kasei,ak4642",	.data = &ak4642_drvdata},

	{ .compatible = "asahi-kasei,ak4643",	.data = &ak4643_drvdata},

	{ .compatible = "asahi-kasei,ak4648",	.data = &ak4648_drvdata},

	{},

	{}

};

MODULE_DEVICE_TABLE(of, ak4642_of_match);