mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
i2c: Drop the kind parameter from detect callbacks
The "kind" parameter always has value -1, and nobody is using it any longer, so we can remove it. Signed-off-by: Jean Delvare <khali@linux-fr.org> Tested-by: Wolfram Sang <w.sang@pengutronix.de>
This commit is contained in:
@@ -97,7 +97,7 @@ struct adm1021_data {
|
||||
|
||||
static int adm1021_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id);
|
||||
static int adm1021_detect(struct i2c_client *client, int kind,
|
||||
static int adm1021_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info);
|
||||
static void adm1021_init_client(struct i2c_client *client);
|
||||
static int adm1021_remove(struct i2c_client *client);
|
||||
@@ -284,7 +284,7 @@ static const struct attribute_group adm1021_group = {
|
||||
};
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int adm1021_detect(struct i2c_client *client, int kind,
|
||||
static int adm1021_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
|
||||
@@ -111,7 +111,7 @@ static const int in_scale[6] = { 2500, 2250, 3300, 5000, 12000, 3300 };
|
||||
|
||||
static int adm1025_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id);
|
||||
static int adm1025_detect(struct i2c_client *client, int kind,
|
||||
static int adm1025_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info);
|
||||
static void adm1025_init_client(struct i2c_client *client);
|
||||
static int adm1025_remove(struct i2c_client *client);
|
||||
@@ -409,7 +409,7 @@ static const struct attribute_group adm1025_group_in4 = {
|
||||
};
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int adm1025_detect(struct i2c_client *client, int kind,
|
||||
static int adm1025_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
|
||||
@@ -293,7 +293,7 @@ struct adm1026_data {
|
||||
|
||||
static int adm1026_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id);
|
||||
static int adm1026_detect(struct i2c_client *client, int kind,
|
||||
static int adm1026_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info);
|
||||
static int adm1026_remove(struct i2c_client *client);
|
||||
static int adm1026_read_value(struct i2c_client *client, u8 reg);
|
||||
@@ -1650,7 +1650,7 @@ static const struct attribute_group adm1026_group_in8_9 = {
|
||||
};
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int adm1026_detect(struct i2c_client *client, int kind,
|
||||
static int adm1026_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
|
||||
@@ -117,7 +117,7 @@ static const u8 ADM1029_REG_FAN_DIV[] = {
|
||||
|
||||
static int adm1029_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id);
|
||||
static int adm1029_detect(struct i2c_client *client, int kind,
|
||||
static int adm1029_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info);
|
||||
static int adm1029_remove(struct i2c_client *client);
|
||||
static struct adm1029_data *adm1029_update_device(struct device *dev);
|
||||
@@ -297,7 +297,7 @@ static const struct attribute_group adm1029_group = {
|
||||
*/
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int adm1029_detect(struct i2c_client *client, int kind,
|
||||
static int adm1029_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
|
||||
@@ -102,7 +102,7 @@ struct adm1031_data {
|
||||
|
||||
static int adm1031_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id);
|
||||
static int adm1031_detect(struct i2c_client *client, int kind,
|
||||
static int adm1031_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info);
|
||||
static void adm1031_init_client(struct i2c_client *client);
|
||||
static int adm1031_remove(struct i2c_client *client);
|
||||
@@ -813,7 +813,7 @@ static const struct attribute_group adm1031_group_opt = {
|
||||
};
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int adm1031_detect(struct i2c_client *client, int kind,
|
||||
static int adm1031_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
|
||||
@@ -132,7 +132,7 @@ static inline unsigned int AOUT_FROM_REG(u8 reg)
|
||||
|
||||
static int adm9240_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id);
|
||||
static int adm9240_detect(struct i2c_client *client, int kind,
|
||||
static int adm9240_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info);
|
||||
static void adm9240_init_client(struct i2c_client *client);
|
||||
static int adm9240_remove(struct i2c_client *client);
|
||||
@@ -545,7 +545,7 @@ static const struct attribute_group adm9240_group = {
|
||||
/*** sensor chip detect and driver install ***/
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int adm9240_detect(struct i2c_client *new_client, int kind,
|
||||
static int adm9240_detect(struct i2c_client *new_client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = new_client->adapter;
|
||||
|
||||
@@ -72,7 +72,7 @@ struct ads7828_data {
|
||||
};
|
||||
|
||||
/* Function declaration - necessary due to function dependencies */
|
||||
static int ads7828_detect(struct i2c_client *client, int kind,
|
||||
static int ads7828_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info);
|
||||
static int ads7828_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id);
|
||||
@@ -187,7 +187,7 @@ static struct i2c_driver ads7828_driver = {
|
||||
};
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int ads7828_detect(struct i2c_client *client, int kind,
|
||||
static int ads7828_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
|
||||
@@ -237,7 +237,7 @@ struct adt7462_data {
|
||||
|
||||
static int adt7462_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id);
|
||||
static int adt7462_detect(struct i2c_client *client, int kind,
|
||||
static int adt7462_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info);
|
||||
static int adt7462_remove(struct i2c_client *client);
|
||||
|
||||
@@ -1902,7 +1902,7 @@ static struct attribute *adt7462_attr[] =
|
||||
};
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int adt7462_detect(struct i2c_client *client, int kind,
|
||||
static int adt7462_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
|
||||
@@ -177,7 +177,7 @@ struct adt7470_data {
|
||||
|
||||
static int adt7470_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id);
|
||||
static int adt7470_detect(struct i2c_client *client, int kind,
|
||||
static int adt7470_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info);
|
||||
static int adt7470_remove(struct i2c_client *client);
|
||||
|
||||
@@ -1225,7 +1225,7 @@ static struct attribute *adt7470_attr[] =
|
||||
};
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int adt7470_detect(struct i2c_client *client, int kind,
|
||||
static int adt7470_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
|
||||
@@ -166,7 +166,7 @@ struct adt7473_data {
|
||||
|
||||
static int adt7473_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id);
|
||||
static int adt7473_detect(struct i2c_client *client, int kind,
|
||||
static int adt7473_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info);
|
||||
static int adt7473_remove(struct i2c_client *client);
|
||||
|
||||
@@ -1085,7 +1085,7 @@ static struct attribute *adt7473_attr[] =
|
||||
};
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int adt7473_detect(struct i2c_client *client, int kind,
|
||||
static int adt7473_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
|
||||
@@ -1172,7 +1172,7 @@ static struct attribute_group in4_attr_group = { .attrs = in4_attrs };
|
||||
static struct attribute_group in5_attr_group = { .attrs = in5_attrs };
|
||||
static struct attribute_group vid_attr_group = { .attrs = vid_attrs };
|
||||
|
||||
static int adt7475_detect(struct i2c_client *client, int kind,
|
||||
static int adt7475_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
|
||||
@@ -209,7 +209,7 @@ static void asb100_write_value(struct i2c_client *client, u16 reg, u16 val);
|
||||
|
||||
static int asb100_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id);
|
||||
static int asb100_detect(struct i2c_client *client, int kind,
|
||||
static int asb100_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info);
|
||||
static int asb100_remove(struct i2c_client *client);
|
||||
static struct asb100_data *asb100_update_device(struct device *dev);
|
||||
@@ -697,7 +697,7 @@ ERROR_SC_2:
|
||||
}
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int asb100_detect(struct i2c_client *client, int kind,
|
||||
static int asb100_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
|
||||
@@ -50,8 +50,7 @@ static int atxp1_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id);
|
||||
static int atxp1_remove(struct i2c_client *client);
|
||||
static struct atxp1_data * atxp1_update_device(struct device *dev);
|
||||
static int atxp1_detect(struct i2c_client *client, int kind,
|
||||
struct i2c_board_info *info);
|
||||
static int atxp1_detect(struct i2c_client *client, struct i2c_board_info *info);
|
||||
|
||||
static const struct i2c_device_id atxp1_id[] = {
|
||||
{ "atxp1", atxp1 },
|
||||
@@ -275,7 +274,7 @@ static const struct attribute_group atxp1_group = {
|
||||
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int atxp1_detect(struct i2c_client *new_client, int kind,
|
||||
static int atxp1_detect(struct i2c_client *new_client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = new_client->adapter;
|
||||
|
||||
@@ -2208,7 +2208,7 @@ exit:
|
||||
}
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int dme1737_i2c_detect(struct i2c_client *client, int kind,
|
||||
static int dme1737_i2c_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
|
||||
@@ -224,7 +224,7 @@ static const struct attribute_group ds1621_group = {
|
||||
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int ds1621_detect(struct i2c_client *client, int kind,
|
||||
static int ds1621_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
|
||||
@@ -113,7 +113,7 @@ struct f75375_data {
|
||||
s8 temp_max_hyst[2];
|
||||
};
|
||||
|
||||
static int f75375_detect(struct i2c_client *client, int kind,
|
||||
static int f75375_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info);
|
||||
static int f75375_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id);
|
||||
@@ -677,7 +677,7 @@ static int f75375_remove(struct i2c_client *client)
|
||||
}
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int f75375_detect(struct i2c_client *client, int kind,
|
||||
static int f75375_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
|
||||
@@ -221,7 +221,7 @@ static const int FSCHMD_NO_TEMP_SENSORS[7] = { 3, 3, 4, 3, 5, 5, 11 };
|
||||
|
||||
static int fschmd_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id);
|
||||
static int fschmd_detect(struct i2c_client *client, int kind,
|
||||
static int fschmd_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info);
|
||||
static int fschmd_remove(struct i2c_client *client);
|
||||
static struct fschmd_data *fschmd_update_device(struct device *dev);
|
||||
@@ -1000,7 +1000,7 @@ static void fschmd_dmi_decode(const struct dmi_header *header, void *dummy)
|
||||
}
|
||||
}
|
||||
|
||||
static int fschmd_detect(struct i2c_client *client, int _kind,
|
||||
static int fschmd_detect(struct i2c_client *client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
enum chips kind;
|
||||
|
||||
@@ -139,8 +139,7 @@ struct gl518_data {
|
||||
|
||||
static int gl518_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id);
|
||||
static int gl518_detect(struct i2c_client *client, int kind,
|
||||
struct i2c_board_info *info);
|
||||
static int gl518_detect(struct i2c_client *client, struct i2c_board_info *info);
|
||||
static void gl518_init_client(struct i2c_client *client);
|
||||
static int gl518_remove(struct i2c_client *client);
|
||||
static int gl518_read_value(struct i2c_client *client, u8 reg);
|
||||
@@ -484,8 +483,7 @@ static const struct attribute_group gl518_group_r80 = {
|
||||
*/
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int gl518_detect(struct i2c_client *client, int kind,
|
||||
struct i2c_board_info *info)
|
||||
static int gl518_detect(struct i2c_client *client, struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
int rev;
|
||||
|
||||
@@ -81,8 +81,7 @@ static const u8 GL520_REG_TEMP_MAX_HYST[] = { 0x06, 0x18 };
|
||||
|
||||
static int gl520_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id);
|
||||
static int gl520_detect(struct i2c_client *client, int kind,
|
||||
struct i2c_board_info *info);
|
||||
static int gl520_detect(struct i2c_client *client, struct i2c_board_info *info);
|
||||
static void gl520_init_client(struct i2c_client *client);
|
||||
static int gl520_remove(struct i2c_client *client);
|
||||
static int gl520_read_value(struct i2c_client *client, u8 reg);
|
||||
@@ -681,8 +680,7 @@ static const struct attribute_group gl520_group_opt = {
|
||||
*/
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int gl520_detect(struct i2c_client *client, int kind,
|
||||
struct i2c_board_info *info)
|
||||
static int gl520_detect(struct i2c_client *client, struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
|
||||
|
||||
@@ -134,8 +134,7 @@ static int lm63_remove(struct i2c_client *client);
|
||||
|
||||
static struct lm63_data *lm63_update_device(struct device *dev);
|
||||
|
||||
static int lm63_detect(struct i2c_client *client, int kind,
|
||||
struct i2c_board_info *info);
|
||||
static int lm63_detect(struct i2c_client *client, struct i2c_board_info *info);
|
||||
static void lm63_init_client(struct i2c_client *client);
|
||||
|
||||
/*
|
||||
@@ -423,7 +422,7 @@ static const struct attribute_group lm63_group_fan1 = {
|
||||
*/
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int lm63_detect(struct i2c_client *new_client, int kind,
|
||||
static int lm63_detect(struct i2c_client *new_client,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = new_client->adapter;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user