lkml.org 
[lkml]   [2023]   [Aug]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 1/2] ASoC: ak4642: Minor cleanups in probe()
    Date
    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>
    ---
    v3:
    * New patch.
    ---
    sound/soc/codecs/ak4642.c | 13 +++++--------
    1 file changed, 5 insertions(+), 8 deletions(-)

    diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
    index 2a8984c1fa9c..901014909c0f 100644
    --- 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);

    --
    2.25.1
    \
     
     \ /
      Last update: 2023-08-31 22:48    [W:3.442 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site