Skip to content

Commit

Permalink
mfd: Use devm managed resources for tps6586x
Browse files Browse the repository at this point in the history
Allocate memory for device state using devm_kzalloc()
to simplify accounting and letting the kernel do the
garbage-collection.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Laxman Dewangan authored and Samuel Ortiz committed Jul 24, 2012
1 parent 96c905f commit b671941
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/mfd/tps6586x.c
Original file line number Diff line number Diff line change
Expand Up @@ -579,9 +579,11 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client,

dev_info(&client->dev, "VERSIONCRC is %02x\n", ret);

tps6586x = kzalloc(sizeof(struct tps6586x), GFP_KERNEL);
if (tps6586x == NULL)
tps6586x = devm_kzalloc(&client->dev, sizeof(*tps6586x), GFP_KERNEL);
if (tps6586x == NULL) {
dev_err(&client->dev, "memory for tps6586x alloc failed\n");
return -ENOMEM;
}

tps6586x->client = client;
tps6586x->dev = &client->dev;
Expand All @@ -594,7 +596,7 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client,
pdata->irq_base);
if (ret) {
dev_err(&client->dev, "IRQ init failed: %d\n", ret);
goto err_irq_init;
return ret;
}
}

Expand Down Expand Up @@ -622,8 +624,7 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client,
err_gpio_init:
if (client->irq)
free_irq(client->irq, tps6586x);
err_irq_init:
kfree(tps6586x);

return ret;
}

Expand All @@ -644,7 +645,6 @@ static int __devexit tps6586x_i2c_remove(struct i2c_client *client)
}

tps6586x_remove_subdevs(tps6586x);
kfree(tps6586x);
return 0;
}

Expand Down

0 comments on commit b671941

Please sign in to comment.