Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ceadda05 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c: Remove all i2c_set_clientdata(client, NULL) in drivers
  i2c/busses: Move two drivers to embedded section
  i2c: Rename i2c_check_addr to i2c_check_addr_busy
  i2c: Document reserved I2C addresses
  i2c: Check for address validity on client registration
  i2c: Share the I2C device presence detection code
  Documentation/i2c: Checkpatch cleanup
parents 95619be5 fbae3fb1

drivers/hwmon/adt7411.c

+0 −2
Original line number Diff line number Diff line
@@ -316,7 +316,6 @@ static int __devinit adt7411_probe(struct i2c_client *client, 
 exit_remove:

	sysfs_remove_group(&client->dev.kobj, &adt7411_attr_grp);

 exit_free:

	i2c_set_clientdata(client, NULL);

	kfree(data);

	return ret;

}
@@ -327,7 +326,6 @@ static int __devexit adt7411_remove(struct i2c_client *client) 


	hwmon_device_unregister(data->hwmon_dev);

	sysfs_remove_group(&client->dev.kobj, &adt7411_attr_grp);

	i2c_set_clientdata(client, NULL);

	kfree(data);

	return 0;

}

drivers/hwmon/asc7621.c

+0 −2
Original line number Diff line number Diff line
@@ -1141,7 +1141,6 @@ exit_remove: 
				   &(asc7621_params[i].sda.dev_attr));

	}



	i2c_set_clientdata(client, NULL);

	kfree(data);

	return err;

}
@@ -1196,7 +1195,6 @@ static int asc7621_remove(struct i2c_client *client) 
				   &(asc7621_params[i].sda.dev_attr));

	}



	i2c_set_clientdata(client, NULL);

	kfree(data);

	return 0;

}

drivers/hwmon/f75375s.c

+0 −2
Original line number Diff line number Diff line
@@ -662,7 +662,6 @@ exit_remove: 
	sysfs_remove_group(&client->dev.kobj, &f75375_group);

exit_free:

	kfree(data);

	i2c_set_clientdata(client, NULL);

	return err;

}
@@ -672,7 +671,6 @@ static int f75375_remove(struct i2c_client *client) 
	hwmon_device_unregister(data->hwmon_dev);

	sysfs_remove_group(&client->dev.kobj, &f75375_group);

	kfree(data);

	i2c_set_clientdata(client, NULL);

	return 0;

}

drivers/hwmon/g760a.c

+0 −2
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ error_hwmon_device_register: 
	sysfs_remove_group(&client->dev.kobj, &g760a_group);

error_sysfs_create_group:

	kfree(data);

	i2c_set_clientdata(client, NULL);



	return err;

}
@@ -247,7 +246,6 @@ static int g760a_remove(struct i2c_client *client) 
	hwmon_device_unregister(data->hwmon_dev);

	sysfs_remove_group(&client->dev.kobj, &g760a_group);

	kfree(data);

	i2c_set_clientdata(client, NULL);



	return 0;

}

drivers/hwmon/lm73.c

+0 −1
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ static int lm73_remove(struct i2c_client *client) 


	hwmon_device_unregister(hwmon_dev);

	sysfs_remove_group(&client->dev.kobj, &lm73_group);

	i2c_set_clientdata(client, NULL);

	return 0;

}