mfd: max8997: use devm_*() functions
PATCH 1/6 mfd: max8997: use devm_*() functions
Use devm_*() functions to make cleanup paths simpler.
Signed-off-by Jingoo Han <[email protected]>
--- drivers/mfd/max8997.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/mfd/max8997.c +5 -9
@@ -191,7 +191,8 @@ static int max8997_i2c_probe(struct i2c_client *i2c,struct max8997_platform_data *pdata =dev_get_platdata (&i2c->dev);int ret =0 ; - max8997 =kzalloc (sizeof (struct max8997_dev ),GFP_KERNEL ); + max8997 =devm_kzalloc (&i2c->dev,sizeof (struct max8997_dev ), +GFP_KERNEL );if (max8997 ==NULL )return -ENOMEM ;
@@ -203,14 +204,12 @@ static int max8997_i2c_probe(struct i2c_client *i2c,if (max8997->dev->of_node) { pdata =max8997_i2c_parse_dt_pdata (max8997->dev); -if (IS_ERR (pdata)) { - ret =PTR_ERR (pdata); - goto err; - } +if (IS_ERR (pdata)) +return PTR_ERR (pdata); }if (!pdata) - goto err; +return ret; max8997->pdata = pdata; max8997->ono = pdata->ono;
@@ -250,8 +249,6 @@ err_mfd:i2c_unregister_device (max8997->muic);i2c_unregister_device (max8997->haptic);i2c_unregister_device (max8997->rtc); -err: -kfree (max8997);return ret; }
@@ -263,7 +260,6 @@ static int max8997_i2c_remove(struct i2c_client *i2c)i2c_unregister_device (max8997->muic);i2c_unregister_device (max8997->haptic);i2c_unregister_device (max8997->rtc); -kfree (max8997);return 0 ; }
Signature · 1 line
1.7.10.4
Quoted 3 lines
Use devm_*() functions to make cleanup paths simpler.
Signed-off-by Jingoo Han <[email protected]>
Patches look good to me 1-6 applied.
By the way, when you're sending patch-sets would you mind adding a cover letter? Or at least thread patches 2-n on to patch 1. It just makes them easier to track if they receive comments.
If you don't already, send your patches with git send-mail and try playing around with: --thread (turns on threading) and --[no-]chain-reply-to (controlls shallow and deep threading) to find your preference. Cover letters are added with --compose and for convenience you can annotate them with, surprise surprise --annotate. :)
Signature · 4 lines
Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog