kernel: ubnt-ledbar: use devm_mutex_init
Allows remove the _remove function as devm calls mutex_destroy automatically. Signed-off-by: Rosen Penev <rosenp@gmail.com> Link: https://github.com/openwrt/openwrt/pull/16615 Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
parent
7d33aedd10
commit
3483f63c56
1 changed files with 4 additions and 9 deletions
|
@ -164,6 +164,7 @@ static int ubnt_ledbar_probe(struct i2c_client *client)
|
||||||
{
|
{
|
||||||
struct device_node *np = client->dev.of_node;
|
struct device_node *np = client->dev.of_node;
|
||||||
struct ubnt_ledbar *ledbar;
|
struct ubnt_ledbar *ledbar;
|
||||||
|
int err;
|
||||||
|
|
||||||
ledbar = devm_kzalloc(&client->dev, sizeof(*ledbar), GFP_KERNEL);
|
ledbar = devm_kzalloc(&client->dev, sizeof(*ledbar), GFP_KERNEL);
|
||||||
if (!ledbar)
|
if (!ledbar)
|
||||||
|
@ -184,7 +185,9 @@ static int ubnt_ledbar_probe(struct i2c_client *client)
|
||||||
|
|
||||||
ledbar->client = client;
|
ledbar->client = client;
|
||||||
|
|
||||||
mutex_init(&ledbar->lock);
|
err = devm_mutex_init(&ofdev->dev, &ledbar->lock);
|
||||||
|
if (err)
|
||||||
|
return err;
|
||||||
|
|
||||||
i2c_set_clientdata(client, ledbar);
|
i2c_set_clientdata(client, ledbar);
|
||||||
|
|
||||||
|
@ -203,13 +206,6 @@ static int ubnt_ledbar_probe(struct i2c_client *client)
|
||||||
return ubnt_ledbar_apply_state(ledbar);
|
return ubnt_ledbar_apply_state(ledbar);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ubnt_ledbar_remove(struct i2c_client *client)
|
|
||||||
{
|
|
||||||
struct ubnt_ledbar *ledbar = i2c_get_clientdata(client);
|
|
||||||
|
|
||||||
mutex_destroy(&ledbar->lock);
|
|
||||||
}
|
|
||||||
|
|
||||||
static const struct i2c_device_id ubnt_ledbar_id[] = {
|
static const struct i2c_device_id ubnt_ledbar_id[] = {
|
||||||
{ "ubnt-ledbar", 0 },
|
{ "ubnt-ledbar", 0 },
|
||||||
{ }
|
{ }
|
||||||
|
@ -228,7 +224,6 @@ static struct i2c_driver ubnt_ledbar_driver = {
|
||||||
.of_match_table = of_ubnt_ledbar_match,
|
.of_match_table = of_ubnt_ledbar_match,
|
||||||
},
|
},
|
||||||
.probe = ubnt_ledbar_probe,
|
.probe = ubnt_ledbar_probe,
|
||||||
.remove = ubnt_ledbar_remove,
|
|
||||||
.id_table = ubnt_ledbar_id,
|
.id_table = ubnt_ledbar_id,
|
||||||
};
|
};
|
||||||
module_i2c_driver(ubnt_ledbar_driver);
|
module_i2c_driver(ubnt_ledbar_driver);
|
||||||
|
|
Loading…
Reference in a new issue