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-ali1535.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-ali1535.c')
-rw-r--r-- | drivers/i2c/busses/i2c-ali1535.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c index f021acd2674e..3eb47890db40 100644 --- a/drivers/i2c/busses/i2c-ali1535.c +++ b/drivers/i2c/busses/i2c-ali1535.c | |||
@@ -134,7 +134,7 @@ | |||
134 | /* -> Read = 1 */ | 134 | /* -> Read = 1 */ |
135 | #define ALI1535_SMBIO_EN 0x04 /* SMB I/O Space enable */ | 135 | #define ALI1535_SMBIO_EN 0x04 /* SMB I/O Space enable */ |
136 | 136 | ||
137 | 137 | static struct pci_driver ali1535_driver; | |
138 | static unsigned short ali1535_smba; | 138 | static unsigned short ali1535_smba; |
139 | static DECLARE_MUTEX(i2c_ali1535_sem); | 139 | static DECLARE_MUTEX(i2c_ali1535_sem); |
140 | 140 | ||
@@ -162,7 +162,8 @@ static int ali1535_setup(struct pci_dev *dev) | |||
162 | goto exit; | 162 | goto exit; |
163 | } | 163 | } |
164 | 164 | ||
165 | if (!request_region(ali1535_smba, ALI1535_SMB_IOSIZE, "ali1535-smb")) { | 165 | if (!request_region(ali1535_smba, ALI1535_SMB_IOSIZE, |
166 | ali1535_driver.name)) { | ||
166 | dev_err(&dev->dev, "ALI1535_smb region 0x%x already in use!\n", | 167 | dev_err(&dev->dev, "ALI1535_smb region 0x%x already in use!\n", |
167 | ali1535_smba); | 168 | ali1535_smba); |
168 | goto exit; | 169 | goto exit; |
@@ -480,7 +481,6 @@ static struct i2c_adapter ali1535_adapter = { | |||
480 | .owner = THIS_MODULE, | 481 | .owner = THIS_MODULE, |
481 | .class = I2C_CLASS_HWMON, | 482 | .class = I2C_CLASS_HWMON, |
482 | .algo = &smbus_algorithm, | 483 | .algo = &smbus_algorithm, |
483 | .name = "unset", | ||
484 | }; | 484 | }; |
485 | 485 | ||
486 | static struct pci_device_id ali1535_ids[] = { | 486 | static struct pci_device_id ali1535_ids[] = { |