Skip to content

Commit

Permalink
i2c: Refactor a kfree in i2c-dev
Browse files Browse the repository at this point in the history
Refactor kfree(i2c_dev) into return_i2c_dev(). This saves some
code and makes more sense, as the memory is allocated in
get_free_i2c_dev().

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Jean Delvare authored and Jean Delvare committed Dec 10, 2006
1 parent 3bacb36 commit 07125ab
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/i2c/i2c-dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ static void return_i2c_dev(struct i2c_dev *i2c_dev)
spin_lock(&i2c_dev_list_lock);
list_del(&i2c_dev->list);
spin_unlock(&i2c_dev_list_lock);
kfree(i2c_dev);
}

static ssize_t show_adapter_name(struct device *dev,
Expand Down Expand Up @@ -431,7 +432,6 @@ static int i2cdev_attach_adapter(struct i2c_adapter *adap)
device_destroy(i2c_dev_class, MKDEV(I2C_MAJOR, adap->nr));
error:
return_i2c_dev(i2c_dev);
kfree(i2c_dev);
return res;
}

Expand All @@ -446,7 +446,6 @@ static int i2cdev_detach_adapter(struct i2c_adapter *adap)
device_remove_file(i2c_dev->dev, &dev_attr_name);
return_i2c_dev(i2c_dev);
device_destroy(i2c_dev_class, MKDEV(I2C_MAJOR, adap->nr));
kfree(i2c_dev);

pr_debug("i2c-dev: adapter [%s] unregistered\n", adap->name);
return 0;
Expand Down

0 comments on commit 07125ab

Please sign in to comment.