leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2c: pca954x: Use devm_kzalloc managed allocator

Browse Source 
This simplifies error and removal paths.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Laurent Pinchart 2013-11-29 01:51:23 +01:00 committed by Wolfram Sang
parent 4b9b00734b
commit bc12cfc87f
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/i2c/muxes/i2c-mux-pca954x.c
View File

@ -187,16 +187,14 @@ static int pca954x_probe(struct i2c_client *client,
struct pca954x_platform_data *pdata = dev_get_platdata(&client->dev); struct pca954x_platform_data *pdata = dev_get_platdata(&client->dev);
int num, force, class; int num, force, class;
struct pca954x *data; struct pca954x *data;
int ret = -ENODEV; int ret;
if (!i2c_check_functionality(adap, I2C_FUNC_SMBUS_BYTE)) if (!i2c_check_functionality(adap, I2C_FUNC_SMBUS_BYTE))
goto err; return -ENODEV;
data = kzalloc(sizeof(struct pca954x), GFP_KERNEL); data = devm_kzalloc(&client->dev, sizeof(struct pca954x), GFP_KERNEL);
if (!data) { if (!data)
ret = -ENOMEM; return -ENOMEM;
goto err;
}
i2c_set_clientdata(client, data); i2c_set_clientdata(client, data);
@ -206,7 +204,7 @@ static int pca954x_probe(struct i2c_client *client,
*/ */
if (i2c_smbus_write_byte(client, 0) < 0) { if (i2c_smbus_write_byte(client, 0) < 0) {
dev_warn(&client->dev, "probe failed\n"); dev_warn(&client->dev, "probe failed\n");
goto exit_free; return -ENODEV;
} }
data->type = id->driver_data; data->type = id->driver_data;
@ -251,9 +249,6 @@ static int pca954x_probe(struct i2c_client *client,
virt_reg_failed: virt_reg_failed:
for (num--; num >= 0; num--) for (num--; num >= 0; num--)
i2c_del_mux_adapter(data->virt_adaps[num]); i2c_del_mux_adapter(data->virt_adaps[num]);
exit_free:
kfree(data);
err:
return ret; return ret;
} }
@ -269,7 +264,6 @@ static int pca954x_remove(struct i2c_client *client)
data->virt_adaps[i] = NULL; data->virt_adaps[i] = NULL;
} }
kfree(data);
return 0; return 0;
} }