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-i801.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-i801.c')
-rw-r--r-- | drivers/i2c/busses/i2c-i801.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 709beab76609..588583530c9f 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c | |||
@@ -110,6 +110,7 @@ static int i801_block_transaction(union i2c_smbus_data *data, | |||
110 | char read_write, int command); | 110 | char read_write, int command); |
111 | 111 | ||
112 | static unsigned short i801_smba; | 112 | static unsigned short i801_smba; |
113 | static struct pci_driver i801_driver; | ||
113 | static struct pci_dev *I801_dev; | 114 | static struct pci_dev *I801_dev; |
114 | static int isich4; | 115 | static int isich4; |
115 | 116 | ||
@@ -143,7 +144,7 @@ static int i801_setup(struct pci_dev *dev) | |||
143 | } | 144 | } |
144 | } | 145 | } |
145 | 146 | ||
146 | if (!request_region(i801_smba, (isich4 ? 16 : 8), "i801-smbus")) { | 147 | if (!request_region(i801_smba, (isich4 ? 16 : 8), i801_driver.name)) { |
147 | dev_err(&dev->dev, "I801_smb region 0x%x already in use!\n", | 148 | dev_err(&dev->dev, "I801_smb region 0x%x already in use!\n", |
148 | i801_smba); | 149 | i801_smba); |
149 | error_return = -EBUSY; | 150 | error_return = -EBUSY; |
@@ -543,7 +544,6 @@ static struct i2c_adapter i801_adapter = { | |||
543 | .owner = THIS_MODULE, | 544 | .owner = THIS_MODULE, |
544 | .class = I2C_CLASS_HWMON, | 545 | .class = I2C_CLASS_HWMON, |
545 | .algo = &smbus_algorithm, | 546 | .algo = &smbus_algorithm, |
546 | .name = "unset", | ||
547 | }; | 547 | }; |
548 | 548 | ||
549 | static struct pci_device_id i801_ids[] = { | 549 | static struct pci_device_id i801_ids[] = { |