Changeset 3149

Timestamp:

10/30/05 11:02:58 (8 years ago)

Author:

khali

Message:

Backport from Linux 2.6:

Clean up name string usage in 11 i2c bus drivers:
* Use the pci_driver 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.

Location:

lm-sensors/trunk/kernel/busses

Files:

• i2c-ali1535.c (modified) (3 diffs)
• i2c-ali1563.c (modified) (4 diffs)
• i2c-ali15x3.c (modified) (3 diffs)
• i2c-amd756.c (modified) (1 diff)
• i2c-amd8111.c (modified) (2 diffs)
• i2c-i801.c (modified) (3 diffs)
• i2c-nforce2.c (modified) (2 diffs)
• i2c-piix4.c (modified) (3 diffs)
• i2c-sis5595.c (modified) (3 diffs)
• i2c-sis630.c (modified) (3 diffs)
• i2c-sis645.c (modified) (3 diffs)

lm-sensors/trunk/kernel/busses/i2c-ali1535.c

@@ -139 +139 @@
 
 
+static struct pci_driver ali1535_driver;
 static unsigned short ali1535_smba = 0;
 DECLARE_MUTEX(i2c_ali1535_sem);
@@ -202 +203 @@
 
         /* Everything is happy, let's grab the memory and set things up. */
-        request_region(ali1535_smba, ALI1535_SMB_IOSIZE, "ali1535-smb");
+        request_region(ali1535_smba, ALI1535_SMB_IOSIZE, ali1535_driver.name);
 
 #ifdef DEBUG
@@ -469 +470 @@
 
 static struct i2c_adapter ali1535_adapter = {
-        .name           = "unset",
         .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_ALI1535,
         .algo           = &smbus_algorithm,

lm-sensors/trunk/kernel/busses/i2c-ali1563.c

@@ -67 +67 @@
 #define HST_CNTL2_SIZEMASK      0x38
 
+static struct pci_driver ali1563_pci_driver;
 static unsigned short ali1563_smba;
 
@@ -363 +364 @@
                 goto Err;
         }
-        if (!request_region(ali1563_smba,ALI1563_SMB_IOSIZE,"i2c-ali1563")) {
+        if (!request_region(ali1563_smba, ALI1563_SMB_IOSIZE,
+                            ali1563_pci_driver.name)) {
                 printk(KERN_WARNING "ali1563: Could not allocate I/O space");
                 goto Err;
@@ -400 +402 @@
 
 static struct i2c_adapter ali1563_adapter = {
-        .name           = "unset",
         .algo           = &ali1563_algorithm,
         .inc_use        = ali1563_inc,
@@ -439 +440 @@
 
 static struct pci_driver ali1563_pci_driver = {
-        .name           = "ali1563 driver",
+        .name           = "ali1563 smbus",
         .id_table       = ali1563_ids,
         .probe          = ali1563_probe,

lm-sensors/trunk/kernel/busses/i2c-ali15x3.c

@@ -134 +134 @@
                  "Initialize the base address of the i2c controller");
 
+static struct pci_driver ali15x3_driver;
 static unsigned short ali15x3_smba = 0;
 
@@ -170 +171 @@
                 ali15x3_smba = force_addr & ~(ALI15X3_SMB_IOSIZE - 1);
 
-        if (!request_region(ali15x3_smba, ALI15X3_SMB_IOSIZE, "ali15x3-smb")) {
+        if (!request_region(ali15x3_smba, ALI15X3_SMB_IOSIZE,
+                            ali15x3_driver.name)) {
                 dev_err(ALI15X3_dev,
                         "ALI15X3_smb region 0x%x already in use!\n",
@@ -486 +488 @@
         .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_ALI15X3,
         .algo           = &smbus_algorithm,
-        .name           = "unset",
         .inc_use        = ali15x3_inc,
         .dec_use        = ali15x3_dec,

lm-sensors/trunk/kernel/busses/i2c-amd756.c

@@ -324 +324 @@
 
 struct i2c_adapter amd756_smbus = {
-        .name           = "unset",
         .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_AMD756,
         .algo           = &smbus_algorithm,

lm-sensors/trunk/kernel/busses/i2c-amd8111.c

@@ -38 +38 @@
 };
 
+static struct pci_driver amd8111_driver;
+
 /*
  * AMD PCI control registers definitions.
@@ -372 +374 @@
         smbus->size = pci_resource_len(dev, 0);
 
-        if (!request_region(smbus->base, smbus->size, "amd8111 SMBus 2.0")) {
+        if (!request_region(smbus->base, smbus->size, amd8111_driver.name)) {
                 kfree(smbus);
                 return -1;

lm-sensors/trunk/kernel/busses/i2c-i801.c

@@ -150 +150 @@
 
 static unsigned short i801_smba;
+static struct pci_driver i801_driver;
 static struct pci_dev *I801_dev;
 static int isich4;      /* is PEC supported? */
@@ -188 +189 @@
         }
 
-        if (!request_region(i801_smba, (isich4 ? 16 : 8), "i801-smbus")) {
+        if (!request_region(i801_smba, (isich4 ? 16 : 8), i801_driver.name)) {
                 dev_err(dev, "I801_smb region 0x%x already in use!\n",
                         i801_smba);
@@ -616 +617 @@
         .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_I801,
         .algo           = &smbus_algorithm,
-        .name           = "unset",
         .inc_use        = i801_inc,
         .dec_use        = i801_dec,

lm-sensors/trunk/kernel/busses/i2c-nforce2.c

@@ -119 +119 @@
 #define NVIDIA_SMB_PRTCL_PEC                    0x80
 
+static struct pci_driver nforce2_driver;
 
 static s32 nforce2_access(struct i2c_adapter *adap, u16 addr,
@@ -320 +321 @@
         smbus->size = 8;
 
-        if (!request_region(smbus->base, smbus->size, "nForce2 SMBus")) {
+        if (!request_region(smbus->base, smbus->size, nforce2_driver.name)) {
                 printk (KERN_ERR "i2c-nforce2.o: Error requesting region %02x .. %02X for %s\n", smbus->base, smbus->base+smbus->size-1, name);
                 return -1;

lm-sensors/trunk/kernel/busses/i2c-piix4.c

@@ -111 +111 @@
 
 static unsigned short piix4_smba = 0;
+static struct pci_driver piix4_driver;
 
 #ifdef CONFIG_X86
@@ -163 +164 @@
         }
 
-        if (!request_region(piix4_smba, SMBIOSIZE, "piix4-smbus")) {
+        if (!request_region(piix4_smba, SMBIOSIZE, piix4_driver.name)) {
                 printk(KERN_ERR "i2c-piix4.o: SMB region 0x%x already in "
                         "use!\n", piix4_smba);
@@ -449 +450 @@
 
 static struct i2c_adapter piix4_adapter = {
-        .name           = "unset",
         .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_PIIX4,
         .algo           = &smbus_algorithm,

lm-sensors/trunk/kernel/busses/i2c-sis5595.c

@@ -135 +135 @@
 static int sis5595_transaction(void);
 
+static struct pci_driver sis5595_driver;
 static unsigned short sis5595_base = 0;
 
@@ -224 +225 @@
 
         /* Everything is happy, let's grab the memory and set things up. */
-        request_region(sis5595_base + SMB_INDEX, 2, "sis5595-smbus");
+        request_region(sis5595_base + SMB_INDEX, 2, sis5595_driver.name);
         return(0);
 }
@@ -426 +427 @@
 
 static struct i2c_adapter sis5595_adapter = {
-        .name           = "unset",
         .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_SIS5595,
         .algo           = &smbus_algorithm,

lm-sensors/trunk/kernel/busses/i2c-sis630.c

@@ -102 +102 @@
 #define SIS630_PCALL      0x04
 #define SIS630_BLOCK_DATA 0x05
+
+static struct pci_driver sis630_driver;
 
 /* insmod parameters */
@@ -452 +454 @@
 
         /* Everything is happy, let's grab the memory and set things up. */
-        if (!request_region(acpi_base + SMB_STS, SIS630_SMB_IOREGION, "sis630-smbus")){
+        if (!request_region(acpi_base + SMB_STS, SIS630_SMB_IOREGION,
+                            sis630_driver.name)){
                 printk(KERN_ERR "i2c-sis630.o: SMBus registers 0x%04x-0x%04x "
                         "already in use!\n",acpi_base + SMB_STS, acpi_base + SMB_SAA);
@@ -471 +474 @@
 
 static struct i2c_adapter sis630_adapter = {
-        .name           = "unset",
         .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_SIS630,
         .algo           = &smbus_algorithm,

lm-sensors/trunk/kernel/busses/i2c-sis645.c

@@ -143 +143 @@
 #define SIS645_BLOCK_DATA 0x05
 
+static struct pci_driver sis645_driver;
 static struct i2c_adapter sis645_adapter;
 static u16 sis645_smbus_base = 0;
@@ -489 +490 @@
 
 static struct i2c_adapter sis645_adapter = {
-        .name           = "unset",
         .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_SIS645,
         .algo           = &smbus_algorithm,
@@ -533 +533 @@
 
         /* Everything is happy, let's grab the memory and set things up. */
-        if (!request_region(sis645_smbus_base, SMB_IOSIZE, "sis645-smbus")) {
+        if (!request_region(sis645_smbus_base, SMB_IOSIZE,
+                            sis645_driver.name)) {
                 dev_err(dev, "SMBus registers 0x%04x-0x%04x "
                         "already in use!\n", sis645_smbus_base,