Restore controlling_mod argument to i2c_register_entry(). This

is needed to properly lock chip drivers in memory while anyone uses their
/proc entries. This also brings back compatibility with the 2.4 Linux
kernel.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2784 7894878c-1315-0410-8ee3-d5d059ff63e0

kernel/chips/adm1021.c

@@ -304,7 +304,8 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address,
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client,	type_name,
 					data->type == adm1021 ? adm1021_dir_table_template :
-					adm1021_max_dir_table_template)) < 0) {
+					adm1021_max_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto error4;
 	}

kernel/chips/adm1024.c

@@ -385,7 +385,8 @@ static int adm1024_detect(struct i2c_adapter *adapter, int address,
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client,
 					type_name,
-					adm1024_dir_table_template)) < 0) {
+					adm1024_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/adm1025.c

@@ -335,7 +335,8 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address,
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client,
 					type_name,
-					adm1025_dir_table_template)) < 0) {
+					adm1025_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/adm1026.c

@@ -753,7 +753,8 @@ int adm1026_detect(struct i2c_adapter *adapter, int address,
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client,
 					type_name,
-					template)) < 0) {
+					template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR2;
 	}

kernel/chips/adm1031.c

@@ -297,11 +297,13 @@ adm1031_detect(struct i2c_adapter *adapter, int address,
 
 	if (kind == adm1030) {
 		if ((err = i2c_register_entry(new_client, type_name,
-					      adm1030_dir_table_template)) < 0)
+					      adm1030_dir_table_template,
+					      THIS_MODULE)) < 0)
 			goto exit_detach;
 	} else if (kind == adm1031) {
 		if ((err = i2c_register_entry(new_client, type_name,
-					      adm1031_dir_table_template)) < 0)
+					      adm1031_dir_table_template,
+					      THIS_MODULE)) < 0)
 			goto exit_detach;
 	}
 

kernel/chips/adm9240.c

@@ -382,7 +382,8 @@ static int adm9240_detect(struct i2c_adapter *adapter, int address,
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client,
 					type_name,
-					adm9240_dir_table_template)) < 0) {
+					adm9240_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/asb100.c

@@ -547,7 +547,7 @@ static int asb100_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((data->sysctl_id = i2c_register_entry(new_client, "asb100",
-			asb100_dir_table_template)) < 0) {
+			asb100_dir_table_template, THIS_MODULE)) < 0) {
 		err = data->sysctl_id;
 		goto ERROR3;
 	}

kernel/chips/bmcsensors.c

@@ -408,7 +408,8 @@ static void bmcsensors_build_proc_table()
 	bmcsensors_dir_table[sdrd_count].ctl_name = 0;
 
 	if ((i = i2c_register_entry(&bmc_client, "bmc",
-				    bmcsensors_dir_table)) < 0) {
+				    bmcsensors_dir_table,
+				    THIS_MODULE)) < 0) {
 		printk(KERN_INFO "bmcsensors.o: i2c registration failed.\n");
 		kfree(bmcsensors_dir_table);
 		kfree(bmcsensors_proc_name_pool);

kernel/chips/bt869.c

@@ -548,7 +548,8 @@ int bt869_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client, type_name,
-					bt869_dir_table_template)) < 0) {
+					bt869_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/ddcmon.c

@@ -270,7 +270,8 @@ int ddcmon_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client, type_name,
-					ddcmon_dir_table_template)) < 0) {
+					ddcmon_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/ds1621.c

@@ -238,7 +238,8 @@ int ds1621_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client, type_name,
-					ds1621_dir_table_template)) < 0) {
+					ds1621_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/eeprom.c

@@ -262,7 +262,8 @@ int eeprom_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client, type_name,
-					eeprom_dir_table_template)) < 0) {
+					eeprom_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/fscher.c

@@ -307,7 +307,8 @@ int fscher_detect(struct i2c_adapter *adapter, int address,
 
   /* Register a new directory entry with module sensors */
   if ((i = i2c_register_entry(new_client, type_name,
-                              fscher_dir_table_template)) < 0) {
+                              fscher_dir_table_template,
+			      THIS_MODULE)) < 0) {
     err = i;
     goto ERROR4;
   }

kernel/chips/fscpos.c

@@ -290,7 +290,8 @@ int fscpos_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client, type_name,
-					fscpos_dir_table_template)) < 0) {
+					fscpos_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/fscscy.c

@@ -369,7 +369,8 @@ int fscscy_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client, type_name,
-					fscscy_dir_table_template)) < 0) {
+					fscscy_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/gl518sm.c

@@ -356,7 +356,8 @@ static int gl518_detect(struct i2c_adapter *adapter, int address,
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry((struct i2c_client *) new_client,
 					type_name,
-					gl518_dir_table_template)) < 0) {
+					gl518_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/gl520sm.c

@@ -331,7 +331,8 @@ static int gl520_detect(struct i2c_adapter *adapter, int address,
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client,
 					type_name,
-					gl520_dir_table_template)) < 0) {
+					gl520_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/icspll.c

@@ -167,7 +167,8 @@ int icspll_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((err = i2c_register_entry(new_client, "icspll",
-					  icspll_dir_table_template)) < 0)
+					  icspll_dir_table_template,
+					  THIS_MODULE)) < 0)
 		goto ERROR3;
 	data->sysctl_id = err;
 	err = 0;

kernel/chips/it87.c

@@ -560,7 +560,8 @@ int it87_detect(struct i2c_adapter *adapter, int address,
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client,
 				    type_name,
-				    it87_dir_table_template)) < 0) {
+				    it87_dir_table_template,
+				    THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/lm63.c

@@ -324,7 +324,7 @@ static int lm63_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry */
 	if ((err = i2c_register_entry(new_client, "lm63",
-	     lm63_dir_table_template)) < 0) {
+	     lm63_dir_table_template, THIS_MODULE)) < 0) {
 		printk(KERN_ERR "lm63: Failed registering directory entry\n");
 		goto ERROR2;
 	}

kernel/chips/lm75.c

@@ -203,7 +203,8 @@ int lm75_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client, type_name,
-					lm75_dir_table_template)) < 0) {
+					lm75_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto error4;
 	}

kernel/chips/lm78.c

@@ -391,7 +391,8 @@ int lm78_detect(struct i2c_adapter *adapter, int address,
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client,
 					type_name,
-					lm78_dir_table_template)) < 0) {
+					lm78_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/lm80.c

@@ -313,7 +313,8 @@ int lm80_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client, type_name,
-					lm80_dir_table_template)) < 0) {
+					lm80_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/lm83.c

@@ -354,7 +354,7 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, unsigned
 	 */
 
 	if ((err = i2c_register_entry(new_client, type_name,
-	     lm83_dir_table_template)) < 0)
+	     lm83_dir_table_template, THIS_MODULE)) < 0)
 	{
 #ifdef DEBUG
 		printk("lm83.o: Failed registering directory entry.\n");

kernel/chips/lm85.c

@@ -907,7 +907,8 @@ int lm85_detect(struct i2c_adapter *adapter, int address,
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client,
 					type_name,
-					template)) < 0) {
+					template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR2;
 	}

kernel/chips/lm87.c

@@ -438,7 +438,8 @@ static int lm87_detect(struct i2c_adapter *adapter, int address,
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client,
 					type_name,
-					LM87_dir_table_template)) < 0) {
+					LM87_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/lm90.c

@@ -443,7 +443,7 @@ static int lm90_detect(struct i2c_adapter *adapter, int address,
 	 */
 
 	if ((err = i2c_register_entry(new_client, type_name,
-	     lm90_dir_table_template)) < 0)
+	     lm90_dir_table_template, THIS_MODULE)) < 0)
 	{
 #ifdef DEBUG
 		printk("lm90.o: Failed registering directory entry.\n");

kernel/chips/lm92.c

@@ -341,7 +341,8 @@ static int lm92_detect (struct i2c_adapter *adapter,int address,unsigned short f
 		goto ERROR2;
 	}
 
-	if ((result = i2c_register_entry (client,client->name,lm92_dir_table)) < 0) {
+	if ((result = i2c_register_entry(client, client->name, lm92_dir_table,
+					 THIS_MODULE)) < 0) {
 		goto ERROR3;
 	}
 	data->sysctl_id = result;

kernel/chips/lm93.c

@@ -2282,7 +2282,7 @@ static int lm93_detect(struct i2c_adapter *adapter, int address,
 
 	/* register a new directory entry with module sensors */
 	if ((data->sysctl_id = i2c_register_entry(client, "lm93", 
-			lm93_dir_table_template)) < 0) {
+			lm93_dir_table_template, THIS_MODULE)) < 0) {
 		err = data->sysctl_id;
 		goto ERROR2;
 	}

kernel/chips/ltc1710.c

@@ -195,7 +195,8 @@ int ltc1710_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client, type_name,
-					ltc1710_dir_table_template)) < 0) {
+					ltc1710_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/matorb.c

@@ -157,7 +157,8 @@ int matorb_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client, type_name,
-					matorb_dir_table_template)) < 0) {
+					matorb_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/max1619.c

@@ -305,7 +305,7 @@ static int max1619_detect(struct i2c_adapter *adapter, int address,
 	 */
 
 	if ((err = i2c_register_entry(new_client, type_name,
-	     max1619_dir_table_template)) < 0) {
+	     max1619_dir_table_template, THIS_MODULE)) < 0) {
 		printk(KERN_ERR "max1619.o: Failed registering directory "
 		       "entry.\n");
 		goto ERROR2;

kernel/chips/max6650.c

@@ -311,7 +311,8 @@ static int max6650_detect(struct i2c_adapter *adapter, int address, unsigned
      * Register a new directory entry.
      */
     if ((err = i2c_register_entry(new_client, type_name,
-                                    max6650_dir_table_template)) < 0) {
+                                    max6650_dir_table_template,
+				    THIS_MODULE)) < 0) {
 #ifdef DEBUG
         printk("max6650.o: Failed registering directory entry.\n");
 #endif

kernel/chips/maxilife.c

@@ -614,7 +614,8 @@ int maxi_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((err = i2c_register_entry(new_client, type_name,
-					  maxi_dir_table_template)) < 0)
+					  maxi_dir_table_template,
+					  THIS_MODULE)) < 0)
 		goto ERROR4;
 	data->sysctl_id = err;
 

kernel/chips/mtp008.c

@@ -443,7 +443,8 @@ int mtp008_detect(struct i2c_adapter *adapter, int address,
 	 * Register a new directory entry with the sensors module.
 	 */
 	if ((sysid = i2c_register_entry(new_client, type_name,
-					    mtp008_dir_table_template)) < 0) {
+					    mtp008_dir_table_template,
+					    THIS_MODULE)) < 0) {
 		err = sysid;
 		goto ERROR2;
 	}

kernel/chips/pc87360.c

@@ -681,7 +681,7 @@ int pc87360_detect(struct i2c_adapter *adapter, int address,
 	}
 
 	if ((i = i2c_register_entry((struct i2c_client *) new_client,
-				    type_name, template)) < 0) {
+				    type_name, template, THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR2;
 	}

kernel/chips/pca9540.c

@@ -144,7 +144,8 @@ int pca9540_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client, "pca9540",
-				    pca9540_dir_table_template)) < 0) {
+				    pca9540_dir_table_template,
+				    THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR2;
 	}

kernel/chips/pca954x.c

@@ -378,7 +378,8 @@ int pca954x_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register new /proc directory entries with module sensors */
 	if ((i = i2c_register_entry(client, type_name,
-				    pca954x_dir_table_template)) < 0) {
+				    pca954x_dir_table_template,
+				    THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR2;
 	}

kernel/chips/pcf8574.c

@@ -189,7 +189,8 @@ int pcf8574_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client, type_name,
-				    pcf8574_dir_table_template)) < 0) {
+				    pcf8574_dir_table_template,
+				    THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR2;
 	}

kernel/chips/pcf8591.c

@@ -219,7 +219,8 @@ int pcf8591_detect(struct i2c_adapter *adapter, int address,
         /* Register a new directory entry with module sensors */
         if ((i = i2c_register_entry(new_client,
                                         type_name,
-                                        pcf8591_dir_table_template)) < 0) {
+                                        pcf8591_dir_table_template,
+					THIS_MODULE)) < 0) {
                 err = i;
                 goto ERROR4;
         }

kernel/chips/saa1064.c

@@ -257,7 +257,8 @@ static int saa1064_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client, type_name,
-					saa1064_dir_table_template)) < 0) {
+					saa1064_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/sis5595.c

@@ -429,7 +429,8 @@ int sis5595_detect(struct i2c_adapter *adapter, int address,
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry((struct i2c_client *) new_client,
 					type_name,
-					sis5595_dir_table_template)) < 0) {
+					sis5595_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/smartbatt.c

@@ -279,7 +279,8 @@ int smartbatt_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client, type_name,
-					smartbatt_dir_table_template)) < 0) {
+					smartbatt_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/smbus-arp.c

@@ -218,7 +218,8 @@ int smbusarp_detect(struct i2c_adapter *adapter, int address,
 		goto ERROR1;
 
 	if ((i = i2c_register_entry(new_client, type_name,
-					smbusarp_dir_table_template)) < 0) {
+					smbusarp_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/smsc47m1.c

@@ -284,7 +284,8 @@ int smsc47m1_detect(struct i2c_adapter *adapter, int address,
 
 	if ((i = i2c_register_entry((struct i2c_client *) new_client,
 					type_name,
-					smsc47m1_dir_table_template)) < 0) {
+					smsc47m1_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/thmc50.c

@@ -242,7 +242,8 @@ int thmc50_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client, type_name,
-					thmc50_dir_table_template)) < 0) {
+					thmc50_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/via686a.c

@@ -523,7 +523,8 @@ int via686a_detect(struct i2c_adapter *adapter, int address,
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry((struct i2c_client *) new_client,
 					type_name,
-					via686a_dir_table_template)) < 0) {
+					via686a_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/vt1211.c

@@ -433,7 +433,8 @@ int vt1211_detect(struct i2c_adapter *adapter, int address,
 
 	if ((i = i2c_register_entry((struct i2c_client *) new_client,
 					type_name,
-					vt1211_dir_table_template)) < 0) {
+					vt1211_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/vt8231.c

@@ -403,7 +403,8 @@ int vt8231_detect(struct i2c_adapter *adapter, int address,
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry((struct i2c_client *) new_client,
 					type_name,
-					vt8231_dir_table_template)) < 0) {
+					vt8231_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR4;
 	}

kernel/chips/w83627hf.c

@@ -718,7 +718,8 @@ int w83627hf_detect(struct i2c_adapter *adapter, int address,
 				(kind == w83627hf) ?
 				   w83627hf_dir_table_template :
 				   /* w83627thf table also used for 637 */
-				   w83627thf_dir_table_template)) < 0) {
+				   w83627thf_dir_table_template,
+				THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR7;
 	}

kernel/chips/w83781d.c

@@ -1049,7 +1049,8 @@ static int w83781d_detect(struct i2c_adapter *adapter, int address,
                                             w83791d_dir_table_template :
                                         (is_isa || kind == w83627hf) ?
 					   w83782d_isa_dir_table_template :
-					   w83782d_i2c_dir_table_template)) < 0) {
+					   w83782d_i2c_dir_table_template,
+					THIS_MODULE)) < 0) {
 		err = i;
 		goto ERROR7;
 	}

kernel/chips/w83l785ts.c

@@ -270,7 +270,7 @@ static int w83l785ts_detect(struct i2c_adapter *adapter, int address,
 	 */
 
 	if ((err = i2c_register_entry(new_client, type_name,
-	    w83l785ts_dir_table_template)) < 0) {
+	    w83l785ts_dir_table_template, THIS_MODULE)) < 0) {
 #ifdef DEBUG
 		printk(KERN_ERR "w83l785ts.o: Failed registering directory "
 			"entry.\n");

kernel/chips/xeontemp.c

@@ -211,7 +211,8 @@ static int xeontemp_detect(struct i2c_adapter *adapter, int address,
 
 	/* Register a new directory entry with module sensors */
 	if ((i = i2c_register_entry(new_client,	type_name,
-				    xeontemp_dir_table_template)) < 0) {
+				    xeontemp_dir_table_template,
+				    THIS_MODULE)) < 0) {
 		err = i;
 		goto error4;
 	}