2013-05-29 07:38:00

by Nikolay Balandin

Subject: [PATCH v3 1/2] drivers/misc: at24: convert to use devm_kzalloc

From: Nikolay Balandin <[email protected]>

Use devm_kzalloc to make cleanup paths simpler

Signed-off-by: Nikolay Balandin <[email protected]>
---
drivers/misc/eeprom/at24.c | 44 +++++++++++++++-----------------------------
1 file changed, 15 insertions(+), 29 deletions(-)

diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 2baeec5..5d4fd69 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -492,10 +492,9 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
if (client->dev.platform_data) {
chip = *(struct at24_platform_data *)client->dev.platform_data;
} else {
- if (!id->driver_data) {
- err = -ENODEV;
- goto err_out;
- }
+ if (!id->driver_data)
+ return -ENODEV;
+
magic = id->driver_data;
chip.byte_len = BIT(magic & AT24_BITMASK(AT24_SIZE_BYTELEN));
magic >>= AT24_SIZE_BYTELEN;
@@ -519,8 +518,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
"byte_len looks suspicious (no power of 2)!\n");
if (!chip.page_size) {
dev_err(&client->dev, "page_size must not be 0!\n");
- err = -EINVAL;
- goto err_out;
+ return -EINVAL;
}
if (!is_power_of_2(chip.page_size))
dev_warn(&client->dev,
@@ -528,10 +526,9 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)

/* Use I2C operations unless we're stuck with SMBus extensions. */
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
- if (chip.flags & AT24_FLAG_ADDR16) {
- err = -EPFNOSUPPORT;
- goto err_out;
- }
+ if (chip.flags & AT24_FLAG_ADDR16)
+ return -EPFNOSUPPORT;
+
if (i2c_check_functionality(client->adapter,
I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
use_smbus = I2C_SMBUS_I2C_BLOCK_DATA;
@@ -542,8 +539,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
I2C_FUNC_SMBUS_READ_BYTE_DATA)) {
use_smbus = I2C_SMBUS_BYTE_DATA;
} else {
- err = -EPFNOSUPPORT;
- goto err_out;
+ return -EPFNOSUPPORT;
}
}

@@ -553,12 +549,10 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
num_addresses = DIV_ROUND_UP(chip.byte_len,
(chip.flags & AT24_FLAG_ADDR16) ? 65536 : 256);

- at24 = kzalloc(sizeof(struct at24_data) +
+ at24 = devm_kzalloc(&client->dev, sizeof(struct at24_data) +
num_addresses * sizeof(struct i2c_client *), GFP_KERNEL);
- if (!at24) {
- err = -ENOMEM;
- goto err_out;
- }
+ if (!at24)
+ return -ENOMEM;

mutex_init(&at24->lock);
at24->use_smbus = use_smbus;
@@ -596,11 +590,10 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
at24->write_max = write_max;

/* buffer (data + address at the beginning) */
- at24->writebuf = kmalloc(write_max + 2, GFP_KERNEL);
- if (!at24->writebuf) {
- err = -ENOMEM;
- goto err_struct;
- }
+ at24->writebuf = devm_kzalloc(&client->dev,
+ write_max + 2, GFP_KERNEL);
+ if (!at24->writebuf)
+ return -ENOMEM;
} else {
dev_warn(&client->dev,
"cannot write due to controller restrictions.");
@@ -648,11 +641,6 @@ err_clients:
if (at24->client[i])
i2c_unregister_device(at24->client[i]);

- kfree(at24->writebuf);
-err_struct:
- kfree(at24);
-err_out:
- dev_dbg(&client->dev, "probe error %d\n", err);
return err;
}

@@ -667,8 +655,6 @@ static int at24_remove(struct i2c_client *client)
for (i = 1; i < at24->num_addresses; i++)
i2c_unregister_device(at24->client[i]);

- kfree(at24->writebuf);
- kfree(at24);
return 0;
}

--
1.7.9.5

2013-05-29 08:19:09

by Jingoo Han

Subject: Re: [PATCH v3 1/2] drivers/misc: at24: convert to use devm_kzalloc

On Wednesday, May 29, 2013 5:00 AM, Nikolay Balandin wrote:
>
> From: Nikolay Balandin <[email protected]>
>
> Use devm_kzalloc to make cleanup paths simpler
>
> Signed-off-by: Nikolay Balandin <[email protected]>

It looks good.
Reviewed-by: Jingoo Han <[email protected]>

Best regards,
Jingoo Han


> ---
> drivers/misc/eeprom/at24.c | 44 +++++++++++++++-----------------------------
> 1 file changed, 15 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
> index 2baeec5..5d4fd69 100644
> --- a/drivers/misc/eeprom/at24.c
> +++ b/drivers/misc/eeprom/at24.c
> @@ -492,10 +492,9 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
> if (client->dev.platform_data) {
> chip = *(struct at24_platform_data *)client->dev.platform_data;
> } else {
> - if (!id->driver_data) {
> - err = -ENODEV;
> - goto err_out;
> - }
> + if (!id->driver_data)
> + return -ENODEV;
> +
> magic = id->driver_data;
> chip.byte_len = BIT(magic & AT24_BITMASK(AT24_SIZE_BYTELEN));
> magic >>= AT24_SIZE_BYTELEN;
> @@ -519,8 +518,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
> "byte_len looks suspicious (no power of 2)!\n");
> if (!chip.page_size) {
> dev_err(&client->dev, "page_size must not be 0!\n");
> - err = -EINVAL;
> - goto err_out;
> + return -EINVAL;
> }
> if (!is_power_of_2(chip.page_size))
> dev_warn(&client->dev,
> @@ -528,10 +526,9 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
>
> /* Use I2C operations unless we're stuck with SMBus extensions. */
> if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
> - if (chip.flags & AT24_FLAG_ADDR16) {
> - err = -EPFNOSUPPORT;
> - goto err_out;
> - }
> + if (chip.flags & AT24_FLAG_ADDR16)
> + return -EPFNOSUPPORT;
> +
> if (i2c_check_functionality(client->adapter,
> I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
> use_smbus = I2C_SMBUS_I2C_BLOCK_DATA;
> @@ -542,8 +539,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
> I2C_FUNC_SMBUS_READ_BYTE_DATA)) {
> use_smbus = I2C_SMBUS_BYTE_DATA;
> } else {
> - err = -EPFNOSUPPORT;
> - goto err_out;
> + return -EPFNOSUPPORT;
> }
> }
>
> @@ -553,12 +549,10 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
> num_addresses = DIV_ROUND_UP(chip.byte_len,
> (chip.flags & AT24_FLAG_ADDR16) ? 65536 : 256);
>
> - at24 = kzalloc(sizeof(struct at24_data) +
> + at24 = devm_kzalloc(&client->dev, sizeof(struct at24_data) +
> num_addresses * sizeof(struct i2c_client *), GFP_KERNEL);
> - if (!at24) {
> - err = -ENOMEM;
> - goto err_out;
> - }
> + if (!at24)
> + return -ENOMEM;
>
> mutex_init(&at24->lock);
> at24->use_smbus = use_smbus;
> @@ -596,11 +590,10 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
> at24->write_max = write_max;
>
> /* buffer (data + address at the beginning) */
> - at24->writebuf = kmalloc(write_max + 2, GFP_KERNEL);
> - if (!at24->writebuf) {
> - err = -ENOMEM;
> - goto err_struct;
> - }
> + at24->writebuf = devm_kzalloc(&client->dev,
> + write_max + 2, GFP_KERNEL);
> + if (!at24->writebuf)
> + return -ENOMEM;
> } else {
> dev_warn(&client->dev,
> "cannot write due to controller restrictions.");
> @@ -648,11 +641,6 @@ err_clients:
> if (at24->client[i])
> i2c_unregister_device(at24->client[i]);
>
> - kfree(at24->writebuf);
> -err_struct:
> - kfree(at24);
> -err_out:
> - dev_dbg(&client->dev, "probe error %d\n", err);
> return err;
> }
>
> @@ -667,8 +655,6 @@ static int at24_remove(struct i2c_client *client)
> for (i = 1; i < at24->num_addresses; i++)
> i2c_unregister_device(at24->client[i]);
>
> - kfree(at24->writebuf);
> - kfree(at24);
> return 0;
> }
>
> --
> 1.7.9.5

2013-05-29 08:48:51

by Andy Shevchenko

Subject: Re: [PATCH v3 1/2] drivers/misc: at24: convert to use devm_kzalloc

On Tue, May 28, 2013 at 11:00 PM, Nikolay Balandin
<[email protected]> wrote:
> From: Nikolay Balandin <[email protected]>
>
> Use devm_kzalloc to make cleanup paths simpler
>
> Signed-off-by: Nikolay Balandin <[email protected]>

Reviewed-by: Andy Shevchenko <[email protected]>

> ---
> drivers/misc/eeprom/at24.c | 44 +++++++++++++++-----------------------------
> 1 file changed, 15 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
> index 2baeec5..5d4fd69 100644
> --- a/drivers/misc/eeprom/at24.c
> +++ b/drivers/misc/eeprom/at24.c
> @@ -492,10 +492,9 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
> if (client->dev.platform_data) {
> chip = *(struct at24_platform_data *)client->dev.platform_data;
> } else {
> - if (!id->driver_data) {
> - err = -ENODEV;
> - goto err_out;
> - }
> + if (!id->driver_data)
> + return -ENODEV;
> +
> magic = id->driver_data;
> chip.byte_len = BIT(magic & AT24_BITMASK(AT24_SIZE_BYTELEN));
> magic >>= AT24_SIZE_BYTELEN;
> @@ -519,8 +518,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
> "byte_len looks suspicious (no power of 2)!\n");
> if (!chip.page_size) {
> dev_err(&client->dev, "page_size must not be 0!\n");
> - err = -EINVAL;
> - goto err_out;
> + return -EINVAL;
> }
> if (!is_power_of_2(chip.page_size))
> dev_warn(&client->dev,
> @@ -528,10 +526,9 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
>
> /* Use I2C operations unless we're stuck with SMBus extensions. */
> if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
> - if (chip.flags & AT24_FLAG_ADDR16) {
> - err = -EPFNOSUPPORT;
> - goto err_out;
> - }
> + if (chip.flags & AT24_FLAG_ADDR16)
> + return -EPFNOSUPPORT;
> +
> if (i2c_check_functionality(client->adapter,
> I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
> use_smbus = I2C_SMBUS_I2C_BLOCK_DATA;
> @@ -542,8 +539,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
> I2C_FUNC_SMBUS_READ_BYTE_DATA)) {
> use_smbus = I2C_SMBUS_BYTE_DATA;
> } else {
> - err = -EPFNOSUPPORT;
> - goto err_out;
> + return -EPFNOSUPPORT;
> }
> }
>
> @@ -553,12 +549,10 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
> num_addresses = DIV_ROUND_UP(chip.byte_len,
> (chip.flags & AT24_FLAG_ADDR16) ? 65536 : 256);
>
> - at24 = kzalloc(sizeof(struct at24_data) +
> + at24 = devm_kzalloc(&client->dev, sizeof(struct at24_data) +
> num_addresses * sizeof(struct i2c_client *), GFP_KERNEL);
> - if (!at24) {
> - err = -ENOMEM;
> - goto err_out;
> - }
> + if (!at24)
> + return -ENOMEM;
>
> mutex_init(&at24->lock);
> at24->use_smbus = use_smbus;
> @@ -596,11 +590,10 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
> at24->write_max = write_max;
>
> /* buffer (data + address at the beginning) */
> - at24->writebuf = kmalloc(write_max + 2, GFP_KERNEL);
> - if (!at24->writebuf) {
> - err = -ENOMEM;
> - goto err_struct;
> - }
> + at24->writebuf = devm_kzalloc(&client->dev,
> + write_max + 2, GFP_KERNEL);
> + if (!at24->writebuf)
> + return -ENOMEM;
> } else {
> dev_warn(&client->dev,
> "cannot write due to controller restrictions.");
> @@ -648,11 +641,6 @@ err_clients:
> if (at24->client[i])
> i2c_unregister_device(at24->client[i]);
>
> - kfree(at24->writebuf);
> -err_struct:
> - kfree(at24);
> -err_out:
> - dev_dbg(&client->dev, "probe error %d\n", err);
> return err;
> }
>
> @@ -667,8 +655,6 @@ static int at24_remove(struct i2c_client *client)
> for (i = 1; i < at24->num_addresses; i++)
> i2c_unregister_device(at24->client[i]);
>
> - kfree(at24->writebuf);
> - kfree(at24);
> return 0;
> }
>
> --
> 1.7.9.5
>



--
With Best Regards,
Andy Shevchenko