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-sis630.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-sis630.c')
-rw-r--r-- | drivers/i2c/busses/i2c-sis630.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c index 44c4e68e9a98..acb75e282414 100644 --- a/drivers/i2c/busses/i2c-sis630.c +++ b/drivers/i2c/busses/i2c-sis630.c | |||
@@ -92,6 +92,8 @@ | |||
92 | #define SIS630_PCALL 0x04 | 92 | #define SIS630_PCALL 0x04 |
93 | #define SIS630_BLOCK_DATA 0x05 | 93 | #define SIS630_BLOCK_DATA 0x05 |
94 | 94 | ||
95 | static struct pci_driver sis630_driver; | ||
96 | |||
95 | /* insmod parameters */ | 97 | /* insmod parameters */ |
96 | static int high_clock; | 98 | static int high_clock; |
97 | static int force; | 99 | static int force; |
@@ -432,7 +434,8 @@ static int sis630_setup(struct pci_dev *sis630_dev) | |||
432 | dev_dbg(&sis630_dev->dev, "ACPI base at 0x%04x\n", acpi_base); | 434 | dev_dbg(&sis630_dev->dev, "ACPI base at 0x%04x\n", acpi_base); |
433 | 435 | ||
434 | /* Everything is happy, let's grab the memory and set things up. */ | 436 | /* Everything is happy, let's grab the memory and set things up. */ |
435 | if (!request_region(acpi_base + SMB_STS, SIS630_SMB_IOREGION, "sis630-smbus")) { | 437 | if (!request_region(acpi_base + SMB_STS, SIS630_SMB_IOREGION, |
438 | sis630_driver.name)) { | ||
436 | dev_err(&sis630_dev->dev, "SMBus registers 0x%04x-0x%04x already " | 439 | dev_err(&sis630_dev->dev, "SMBus registers 0x%04x-0x%04x already " |
437 | "in use!\n", acpi_base + SMB_STS, acpi_base + SMB_SAA); | 440 | "in use!\n", acpi_base + SMB_STS, acpi_base + SMB_SAA); |
438 | goto exit; | 441 | goto exit; |
@@ -455,7 +458,6 @@ static struct i2c_algorithm smbus_algorithm = { | |||
455 | static struct i2c_adapter sis630_adapter = { | 458 | static struct i2c_adapter sis630_adapter = { |
456 | .owner = THIS_MODULE, | 459 | .owner = THIS_MODULE, |
457 | .class = I2C_CLASS_HWMON, | 460 | .class = I2C_CLASS_HWMON, |
458 | .name = "unset", | ||
459 | .algo = &smbus_algorithm, | 461 | .algo = &smbus_algorithm, |
460 | }; | 462 | }; |
461 | 463 | ||