diff options
| author | Jean Delvare <khali@linux-fr.org> | 2006-07-01 17:20:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-26 15:38:50 -0700 |
| commit | 22f76e744dc41096987c6df8270b5c249511cde5 (patch) | |
| tree | 16afa3c645afb5a22fbe7095b1fe2311c6684d01 /drivers/i2c/i2c-dev.c | |
| parent | f3b3aadbbd66d8a020550b01b37d9b1ea559f2c3 (diff) | |
| download | kernel-crypto-22f76e744dc41096987c6df8270b5c249511cde5.tar.gz kernel-crypto-22f76e744dc41096987c6df8270b5c249511cde5.tar.xz kernel-crypto-22f76e744dc41096987c6df8270b5c249511cde5.zip | |
i2c-dev: Drop the client template
i2c-dev: Drop the client template
Drop the i2c-dev client template. This saves about 360 bytes of
memory. I got the idea from a similar cleanup Hans-Frieder Vogt
made to i2c-nforce2 recently.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c/i2c-dev.c')
| -rw-r--r-- | drivers/i2c/i2c-dev.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index 206e8052f90..2ce08339129 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c @@ -37,7 +37,7 @@ #include <linux/i2c-dev.h> #include <asm/uaccess.h> -static struct i2c_client i2cdev_client_template; +static struct i2c_driver i2cdev_driver; struct i2c_dev { struct list_head list; @@ -365,12 +365,13 @@ static int i2cdev_open(struct inode *inode, struct file *file) if (!adap) return -ENODEV; - client = kmalloc(sizeof(*client), GFP_KERNEL); + client = kzalloc(sizeof(*client), GFP_KERNEL); if (!client) { i2c_put_adapter(adap); return -ENOMEM; } - memcpy(client, &i2cdev_client_template, sizeof(*client)); + snprintf(client->name, I2C_NAME_SIZE, "i2c-dev %d", adap->nr); + client->driver = &i2cdev_driver; /* registered with adapter, passed as client to user */ client->adapter = adap; @@ -459,12 +460,6 @@ static struct i2c_driver i2cdev_driver = { .detach_client = i2cdev_detach_client, }; -static struct i2c_client i2cdev_client_template = { - .name = "I2C /dev entry", - .addr = -1, - .driver = &i2cdev_driver, -}; - static int __init i2c_dev_init(void) { int res; |