lkml.org 
[lkml]   [2011]   [Jun]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 1/2] staging: iio replaced kmalloc with local variables.
    From
    Date
    From: anish kumar <anish198519851985@gmail.com>

    Replace kmalloc with local variables as it was un-necessary and
    also removed the redudant code after this change.

    Signed-off-by: anish kumar <anish198519851985@gmail.com>
    ---
    drivers/staging/iio/accel/kxsd9.c | 19 +++----------------
    drivers/staging/iio/adc/max1363_core.c | 3 +--
    2 files changed, 4 insertions(+), 18 deletions(-)

    diff --git a/drivers/staging/iio/accel/kxsd9.c b/drivers/staging/iio/accel/kxsd9.c
    index 431aa0f..7f6e6e5 100644
    --- a/drivers/staging/iio/accel/kxsd9.c
    +++ b/drivers/staging/iio/accel/kxsd9.c
    @@ -255,7 +255,10 @@ static const struct attribute_group kxsd9_attribute_group = {

    static int __devinit kxsd9_power_up(struct spi_device *spi)
    {
    + struct spi_message msg;
    int ret;
    + u8 tx[2], tx2[2];
    +
    struct spi_transfer xfers[2] = {
    {
    .bits_per_word = 8,
    @@ -267,19 +270,7 @@ static int __devinit kxsd9_power_up(struct spi_device *spi)
    .cs_change = 1,
    },
    };
    - struct spi_message msg;
    - u8 *tx2;
    - u8 *tx = kmalloc(2, GFP_KERNEL);

    - if (tx == NULL) {
    - ret = -ENOMEM;
    - goto error_ret;
    - }
    - tx2 = kmalloc(2, GFP_KERNEL);
    - if (tx2 == NULL) {
    - ret = -ENOMEM;
    - goto error_free_tx;
    - }
    tx[0] = 0x0d;
    tx[1] = 0x40;

    @@ -293,10 +284,6 @@ static int __devinit kxsd9_power_up(struct spi_device *spi)
    spi_message_add_tail(&xfers[1], &msg);
    ret = spi_sync(spi, &msg);

    - kfree(tx2);
    -error_free_tx:
    - kfree(tx);
    -error_ret:
    return ret;

    };
    diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/staging/iio/adc/max1363_core.c
    index 1037087..0026242 100644
    --- a/drivers/staging/iio/adc/max1363_core.c
    +++ b/drivers/staging/iio/adc/max1363_core.c
    @@ -207,7 +207,7 @@ static int max1363_write_basic_config(struct i2c_client *client,
    unsigned char d2)
    {
    int ret;
    - u8 *tx_buf = kmalloc(2, GFP_KERNEL);
    + u8 tx_buf[2];

    if (!tx_buf)
    return -ENOMEM;
    @@ -215,7 +215,6 @@ static int max1363_write_basic_config(struct i2c_client *client,
    tx_buf[1] = d2;

    ret = i2c_master_send(client, tx_buf, 2);
    - kfree(tx_buf);

    return (ret > 0) ? 0 : ret;
    }
    --
    1.7.0.4





    \
     
     \ /
      Last update: 2011-06-06 21:09    [W:0.023 / U:1.224 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site