Commit 2096b956 authored by David Brownell's avatar David Brownell Committed by Jean Delvare
Browse files

i2c: Shrink struct i2c_client 



This shrinks the size of "struct i2c_client" by 40 bytes:

 - Substantially shrinks the string used to identify the chip type
 - The "flags" don't need to be so big
 - Removes some internal padding

It also adds kerneldoc for that struct, explaining how "name" is really a
chip type identifier; it's otherwise potentially confusing.

Because the I2C_NAME_SIZE symbol was abused for both i2c_client.name
and for i2c_adapter.name, this needed to affect i2c_adapter too.  The
adapters which used that symbol now use the more-obviously-correct
idiom of taking the size of that field.

JD: Shorten i2c_adapter.name from 50 to 48 bytes while we're here, to
avoid wasting space in padding.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 4ad4eac6

drivers/i2c/busses/i2c-ali1535.c

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_ 
	/* set up the sysfs linkage to our parent device */

	ali1535_adapter.dev.parent = &dev->dev;



	snprintf(ali1535_adapter.name, I2C_NAME_SIZE, 

	snprintf(ali1535_adapter.name, sizeof(ali1535_adapter.name),

		"SMBus ALI1535 adapter at %04x", ali1535_smba);

	return i2c_add_adapter(&ali1535_adapter);

}

drivers/i2c/busses/i2c-ali15x3.c

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static int __devinit ali15x3_probe(struct pci_dev *dev, const struct pci_device_ 
	/* set up the sysfs linkage to our parent device */

	ali15x3_adapter.dev.parent = &dev->dev;



	snprintf(ali15x3_adapter.name, I2C_NAME_SIZE,

	snprintf(ali15x3_adapter.name, sizeof(ali15x3_adapter.name),

		"SMBus ALI15X3 adapter at %04x", ali15x3_smba);

	return i2c_add_adapter(&ali15x3_adapter);

}

drivers/i2c/busses/i2c-amd8111.c

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static int __devinit amd8111_probe(struct pci_dev *dev, 
	}



	smbus->adapter.owner = THIS_MODULE;

	snprintf(smbus->adapter.name, I2C_NAME_SIZE,

	snprintf(smbus->adapter.name, sizeof(smbus->adapter.name),

		"SMBus2 AMD8111 adapter at %04x", smbus->base);

	smbus->adapter.id = I2C_HW_SMBUS_AMD8111;

	smbus->adapter.class = I2C_CLASS_HWMON;

drivers/i2c/busses/i2c-i801.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id 
	/* set up the sysfs linkage to our parent device */

	i801_adapter.dev.parent = &dev->dev;



	snprintf(i801_adapter.name, I2C_NAME_SIZE,

	snprintf(i801_adapter.name, sizeof(i801_adapter.name),

		"SMBus I801 adapter at %04lx", i801_smba);

	err = i2c_add_adapter(&i801_adapter);

	if (err) {

drivers/i2c/busses/i2c-ixp2000.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static int ixp2000_i2c_probe(struct platform_device *plat_dev) 


	drv_data->adapter.id = I2C_HW_B_IXP2000,

	strlcpy(drv_data->adapter.name, plat_dev->dev.driver->name,

		I2C_NAME_SIZE);

		sizeof(drv_data->adapter.name));

	drv_data->adapter.algo_data = &drv_data->algo_data,



	drv_data->adapter.dev.parent = &plat_dev->dev;