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: Biju 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: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index 2a8984c1fa9c8c134ebfd78214e8d29ae3fd3fa1..901014909c0f089ec6dea6cb9d67f2684665a756 100644 (file)
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -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);
 
@@ -689,7 +686,7 @@ static const struct i2c_device_id ak4642_i2c_id[] = {
        { "ak4642", (kernel_ulong_t)&ak4642_drvdata },
        { "ak4643", (kernel_ulong_t)&ak4643_drvdata },
        { "ak4648", (kernel_ulong_t)&ak4648_drvdata },
-       { }
+       {}
 };
 MODULE_DEVICE_TABLE(i2c, ak4642_i2c_id);