diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-09-25 10:37:04 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 17:02:06 -0400 |
commit | d6072f842a77014220683ee5b781b7cee8f020d1 (patch) | |
tree | d9409d911987815a73f6c08e1f1f67fe4d16bb3a /drivers/i2c/busses/i2c-piix4.c | |
parent | 7d845b10d06fa20a595a5161edabc5e846ed28a6 (diff) |
[PATCH] i2c: Reuse name strings in i2c bus drivers
Clean up name string usage in 12 i2c bus drivers:
* Use the i2c_adapter name for requesting the I/O region rather than
redefining a new string.
* Do not initialize the i2c_adapter name to "unset".
This should save a few data bytes here and there.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/i2c/busses/i2c-ali1535.c | 6 +++---
drivers/i2c/busses/i2c-ali1563.c | 6 ++++--
drivers/i2c/busses/i2c-ali15x3.c | 5 +++--
drivers/i2c/busses/i2c-amd756.c | 5 ++---
drivers/i2c/busses/i2c-amd8111.c | 4 +++-
drivers/i2c/busses/i2c-i801.c | 4 ++--
drivers/i2c/busses/i2c-nforce2.c | 4 ++--
drivers/i2c/busses/i2c-piix4.c | 4 ++--
drivers/i2c/busses/i2c-sis5595.c | 5 +++--
drivers/i2c/busses/i2c-sis630.c | 6 ++++--
drivers/i2c/busses/i2c-sis96x.c | 5 +++--
drivers/i2c/busses/i2c-via.c | 4 ++--
12 files changed, 33 insertions(+), 25 deletions(-)
Diffstat (limited to 'drivers/i2c/busses/i2c-piix4.c')
-rw-r--r-- | drivers/i2c/busses/i2c-piix4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index 1b2d3ebd1075..692f47345481 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c | |||
@@ -112,6 +112,7 @@ MODULE_PARM_DESC(fix_hstcfg, | |||
112 | static int piix4_transaction(void); | 112 | static int piix4_transaction(void); |
113 | 113 | ||
114 | static unsigned short piix4_smba; | 114 | static unsigned short piix4_smba; |
115 | static struct pci_driver piix4_driver; | ||
115 | static struct i2c_adapter piix4_adapter; | 116 | static struct i2c_adapter piix4_adapter; |
116 | 117 | ||
117 | static struct dmi_system_id __devinitdata piix4_dmi_table[] = { | 118 | static struct dmi_system_id __devinitdata piix4_dmi_table[] = { |
@@ -157,7 +158,7 @@ static int __devinit piix4_setup(struct pci_dev *PIIX4_dev, | |||
157 | } | 158 | } |
158 | } | 159 | } |
159 | 160 | ||
160 | if (!request_region(piix4_smba, SMBIOSIZE, "piix4-smbus")) { | 161 | if (!request_region(piix4_smba, SMBIOSIZE, piix4_driver.name)) { |
161 | dev_err(&PIIX4_dev->dev, "SMB region 0x%x already in use!\n", | 162 | dev_err(&PIIX4_dev->dev, "SMB region 0x%x already in use!\n", |
162 | piix4_smba); | 163 | piix4_smba); |
163 | return -ENODEV; | 164 | return -ENODEV; |
@@ -407,7 +408,6 @@ static struct i2c_adapter piix4_adapter = { | |||
407 | .owner = THIS_MODULE, | 408 | .owner = THIS_MODULE, |
408 | .class = I2C_CLASS_HWMON, | 409 | .class = I2C_CLASS_HWMON, |
409 | .algo = &smbus_algorithm, | 410 | .algo = &smbus_algorithm, |
410 | .name = "unset", | ||
411 | }; | 411 | }; |
412 | 412 | ||
413 | static struct pci_device_id piix4_ids[] = { | 413 | static struct pci_device_id piix4_ids[] = { |