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-amd756.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-amd756.c')
-rw-r--r-- | drivers/i2c/busses/i2c-amd756.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c index 3bbac2f8ce38..1750dedaf4b5 100644 --- a/drivers/i2c/busses/i2c-amd756.c +++ b/drivers/i2c/busses/i2c-amd756.c | |||
@@ -85,7 +85,7 @@ | |||
85 | #define AMD756_PROCESS_CALL 0x04 | 85 | #define AMD756_PROCESS_CALL 0x04 |
86 | #define AMD756_BLOCK_DATA 0x05 | 86 | #define AMD756_BLOCK_DATA 0x05 |
87 | 87 | ||
88 | 88 | static struct pci_driver amd756_driver; | |
89 | static unsigned short amd756_ioport; | 89 | static unsigned short amd756_ioport; |
90 | 90 | ||
91 | /* | 91 | /* |
@@ -303,7 +303,6 @@ struct i2c_adapter amd756_smbus = { | |||
303 | .owner = THIS_MODULE, | 303 | .owner = THIS_MODULE, |
304 | .class = I2C_CLASS_HWMON, | 304 | .class = I2C_CLASS_HWMON, |
305 | .algo = &smbus_algorithm, | 305 | .algo = &smbus_algorithm, |
306 | .name = "unset", | ||
307 | }; | 306 | }; |
308 | 307 | ||
309 | enum chiptype { AMD756, AMD766, AMD768, NFORCE, AMD8111 }; | 308 | enum chiptype { AMD756, AMD766, AMD768, NFORCE, AMD8111 }; |
@@ -365,7 +364,7 @@ static int __devinit amd756_probe(struct pci_dev *pdev, | |||
365 | amd756_ioport += SMB_ADDR_OFFSET; | 364 | amd756_ioport += SMB_ADDR_OFFSET; |
366 | } | 365 | } |
367 | 366 | ||
368 | if (!request_region(amd756_ioport, SMB_IOSIZE, "amd756-smbus")) { | 367 | if (!request_region(amd756_ioport, SMB_IOSIZE, amd756_driver.name)) { |
369 | dev_err(&pdev->dev, "SMB region 0x%x already in use!\n", | 368 | dev_err(&pdev->dev, "SMB region 0x%x already in use!\n", |
370 | amd756_ioport); | 369 | amd756_ioport); |
371 | return -ENODEV; | 370 | return -ENODEV; |