tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Jean Delvare 310ec792 f4054253

+84 -100
+2 -2
drivers/hwmon/adm1021.c
··· 97 97 98 98 static int adm1021_probe(struct i2c_client *client, 99 99 const struct i2c_device_id *id); 100 - static int adm1021_detect(struct i2c_client *client, int kind, 100 + static int adm1021_detect(struct i2c_client *client, 101 101 struct i2c_board_info *info); 102 102 static void adm1021_init_client(struct i2c_client *client); 103 103 static int adm1021_remove(struct i2c_client *client); ··· 284 284 }; 285 285 286 286 /* Return 0 if detection is successful, -ENODEV otherwise */ 287 - static int adm1021_detect(struct i2c_client *client, int kind, 287 + static int adm1021_detect(struct i2c_client *client, 288 288 struct i2c_board_info *info) 289 289 { 290 290 struct i2c_adapter *adapter = client->adapter;
+2 -2
drivers/hwmon/adm1025.c
··· 111 111 112 112 static int adm1025_probe(struct i2c_client *client, 113 113 const struct i2c_device_id *id); 114 - static int adm1025_detect(struct i2c_client *client, int kind, 114 + static int adm1025_detect(struct i2c_client *client, 115 115 struct i2c_board_info *info); 116 116 static void adm1025_init_client(struct i2c_client *client); 117 117 static int adm1025_remove(struct i2c_client *client); ··· 409 409 }; 410 410 411 411 /* Return 0 if detection is successful, -ENODEV otherwise */ 412 - static int adm1025_detect(struct i2c_client *client, int kind, 412 + static int adm1025_detect(struct i2c_client *client, 413 413 struct i2c_board_info *info) 414 414 { 415 415 struct i2c_adapter *adapter = client->adapter;
+2 -2
drivers/hwmon/adm1026.c
··· 293 293 294 294 static int adm1026_probe(struct i2c_client *client, 295 295 const struct i2c_device_id *id); 296 - static int adm1026_detect(struct i2c_client *client, int kind, 296 + static int adm1026_detect(struct i2c_client *client, 297 297 struct i2c_board_info *info); 298 298 static int adm1026_remove(struct i2c_client *client); 299 299 static int adm1026_read_value(struct i2c_client *client, u8 reg); ··· 1650 1650 }; 1651 1651 1652 1652 /* Return 0 if detection is successful, -ENODEV otherwise */ 1653 - static int adm1026_detect(struct i2c_client *client, int kind, 1653 + static int adm1026_detect(struct i2c_client *client, 1654 1654 struct i2c_board_info *info) 1655 1655 { 1656 1656 struct i2c_adapter *adapter = client->adapter;
+2 -2
drivers/hwmon/adm1029.c
··· 117 117 118 118 static int adm1029_probe(struct i2c_client *client, 119 119 const struct i2c_device_id *id); 120 - static int adm1029_detect(struct i2c_client *client, int kind, 120 + static int adm1029_detect(struct i2c_client *client, 121 121 struct i2c_board_info *info); 122 122 static int adm1029_remove(struct i2c_client *client); 123 123 static struct adm1029_data *adm1029_update_device(struct device *dev); ··· 297 297 */ 298 298 299 299 /* Return 0 if detection is successful, -ENODEV otherwise */ 300 - static int adm1029_detect(struct i2c_client *client, int kind, 300 + static int adm1029_detect(struct i2c_client *client, 301 301 struct i2c_board_info *info) 302 302 { 303 303 struct i2c_adapter *adapter = client->adapter;
+2 -2
drivers/hwmon/adm1031.c
··· 102 102 103 103 static int adm1031_probe(struct i2c_client *client, 104 104 const struct i2c_device_id *id); 105 - static int adm1031_detect(struct i2c_client *client, int kind, 105 + static int adm1031_detect(struct i2c_client *client, 106 106 struct i2c_board_info *info); 107 107 static void adm1031_init_client(struct i2c_client *client); 108 108 static int adm1031_remove(struct i2c_client *client); ··· 813 813 }; 814 814 815 815 /* Return 0 if detection is successful, -ENODEV otherwise */ 816 - static int adm1031_detect(struct i2c_client *client, int kind, 816 + static int adm1031_detect(struct i2c_client *client, 817 817 struct i2c_board_info *info) 818 818 { 819 819 struct i2c_adapter *adapter = client->adapter;
+2 -2
drivers/hwmon/adm9240.c
··· 132 132 133 133 static int adm9240_probe(struct i2c_client *client, 134 134 const struct i2c_device_id *id); 135 - static int adm9240_detect(struct i2c_client *client, int kind, 135 + static int adm9240_detect(struct i2c_client *client, 136 136 struct i2c_board_info *info); 137 137 static void adm9240_init_client(struct i2c_client *client); 138 138 static int adm9240_remove(struct i2c_client *client); ··· 545 545 /*** sensor chip detect and driver install ***/ 546 546 547 547 /* Return 0 if detection is successful, -ENODEV otherwise */ 548 - static int adm9240_detect(struct i2c_client *new_client, int kind, 548 + static int adm9240_detect(struct i2c_client *new_client, 549 549 struct i2c_board_info *info) 550 550 { 551 551 struct i2c_adapter *adapter = new_client->adapter;
+2 -2
drivers/hwmon/ads7828.c
··· 72 72 }; 73 73 74 74 /* Function declaration - necessary due to function dependencies */ 75 - static int ads7828_detect(struct i2c_client *client, int kind, 75 + static int ads7828_detect(struct i2c_client *client, 76 76 struct i2c_board_info *info); 77 77 static int ads7828_probe(struct i2c_client *client, 78 78 const struct i2c_device_id *id); ··· 187 187 }; 188 188 189 189 /* Return 0 if detection is successful, -ENODEV otherwise */ 190 - static int ads7828_detect(struct i2c_client *client, int kind, 190 + static int ads7828_detect(struct i2c_client *client, 191 191 struct i2c_board_info *info) 192 192 { 193 193 struct i2c_adapter *adapter = client->adapter;
+2 -2
drivers/hwmon/adt7462.c
··· 237 237 238 238 static int adt7462_probe(struct i2c_client *client, 239 239 const struct i2c_device_id *id); 240 - static int adt7462_detect(struct i2c_client *client, int kind, 240 + static int adt7462_detect(struct i2c_client *client, 241 241 struct i2c_board_info *info); 242 242 static int adt7462_remove(struct i2c_client *client); 243 243 ··· 1902 1902 }; 1903 1903 1904 1904 /* Return 0 if detection is successful, -ENODEV otherwise */ 1905 - static int adt7462_detect(struct i2c_client *client, int kind, 1905 + static int adt7462_detect(struct i2c_client *client, 1906 1906 struct i2c_board_info *info) 1907 1907 { 1908 1908 struct i2c_adapter *adapter = client->adapter;
+2 -2
drivers/hwmon/adt7470.c
··· 177 177 178 178 static int adt7470_probe(struct i2c_client *client, 179 179 const struct i2c_device_id *id); 180 - static int adt7470_detect(struct i2c_client *client, int kind, 180 + static int adt7470_detect(struct i2c_client *client, 181 181 struct i2c_board_info *info); 182 182 static int adt7470_remove(struct i2c_client *client); 183 183 ··· 1225 1225 }; 1226 1226 1227 1227 /* Return 0 if detection is successful, -ENODEV otherwise */ 1228 - static int adt7470_detect(struct i2c_client *client, int kind, 1228 + static int adt7470_detect(struct i2c_client *client, 1229 1229 struct i2c_board_info *info) 1230 1230 { 1231 1231 struct i2c_adapter *adapter = client->adapter;
+2 -2
drivers/hwmon/adt7473.c
··· 166 166 167 167 static int adt7473_probe(struct i2c_client *client, 168 168 const struct i2c_device_id *id); 169 - static int adt7473_detect(struct i2c_client *client, int kind, 169 + static int adt7473_detect(struct i2c_client *client, 170 170 struct i2c_board_info *info); 171 171 static int adt7473_remove(struct i2c_client *client); 172 172 ··· 1085 1085 }; 1086 1086 1087 1087 /* Return 0 if detection is successful, -ENODEV otherwise */ 1088 - static int adt7473_detect(struct i2c_client *client, int kind, 1088 + static int adt7473_detect(struct i2c_client *client, 1089 1089 struct i2c_board_info *info) 1090 1090 { 1091 1091 struct i2c_adapter *adapter = client->adapter;
+1 -1
drivers/hwmon/adt7475.c
··· 1172 1172 static struct attribute_group in5_attr_group = { .attrs = in5_attrs }; 1173 1173 static struct attribute_group vid_attr_group = { .attrs = vid_attrs }; 1174 1174 1175 - static int adt7475_detect(struct i2c_client *client, int kind, 1175 + static int adt7475_detect(struct i2c_client *client, 1176 1176 struct i2c_board_info *info) 1177 1177 { 1178 1178 struct i2c_adapter *adapter = client->adapter;
+2 -2
drivers/hwmon/asb100.c
··· 209 209 210 210 static int asb100_probe(struct i2c_client *client, 211 211 const struct i2c_device_id *id); 212 - static int asb100_detect(struct i2c_client *client, int kind, 212 + static int asb100_detect(struct i2c_client *client, 213 213 struct i2c_board_info *info); 214 214 static int asb100_remove(struct i2c_client *client); 215 215 static struct asb100_data *asb100_update_device(struct device *dev); ··· 697 697 } 698 698 699 699 /* Return 0 if detection is successful, -ENODEV otherwise */ 700 - static int asb100_detect(struct i2c_client *client, int kind, 700 + static int asb100_detect(struct i2c_client *client, 701 701 struct i2c_board_info *info) 702 702 { 703 703 struct i2c_adapter *adapter = client->adapter;
+2 -3
drivers/hwmon/atxp1.c
··· 50 50 const struct i2c_device_id *id); 51 51 static int atxp1_remove(struct i2c_client *client); 52 52 static struct atxp1_data * atxp1_update_device(struct device *dev); 53 - static int atxp1_detect(struct i2c_client *client, int kind, 54 - struct i2c_board_info *info); 53 + static int atxp1_detect(struct i2c_client *client, struct i2c_board_info *info); 55 54 56 55 static const struct i2c_device_id atxp1_id[] = { 57 56 { "atxp1", atxp1 }, ··· 274 275 275 276 276 277 /* Return 0 if detection is successful, -ENODEV otherwise */ 277 - static int atxp1_detect(struct i2c_client *new_client, int kind, 278 + static int atxp1_detect(struct i2c_client *new_client, 278 279 struct i2c_board_info *info) 279 280 { 280 281 struct i2c_adapter *adapter = new_client->adapter;
+1 -1
drivers/hwmon/dme1737.c
··· 2208 2208 } 2209 2209 2210 2210 /* Return 0 if detection is successful, -ENODEV otherwise */ 2211 - static int dme1737_i2c_detect(struct i2c_client *client, int kind, 2211 + static int dme1737_i2c_detect(struct i2c_client *client, 2212 2212 struct i2c_board_info *info) 2213 2213 { 2214 2214 struct i2c_adapter *adapter = client->adapter;
+1 -1
drivers/hwmon/ds1621.c
··· 224 224 225 225 226 226 /* Return 0 if detection is successful, -ENODEV otherwise */ 227 - static int ds1621_detect(struct i2c_client *client, int kind, 227 + static int ds1621_detect(struct i2c_client *client, 228 228 struct i2c_board_info *info) 229 229 { 230 230 struct i2c_adapter *adapter = client->adapter;
+2 -2
drivers/hwmon/f75375s.c
··· 113 113 s8 temp_max_hyst[2]; 114 114 }; 115 115 116 - static int f75375_detect(struct i2c_client *client, int kind, 116 + static int f75375_detect(struct i2c_client *client, 117 117 struct i2c_board_info *info); 118 118 static int f75375_probe(struct i2c_client *client, 119 119 const struct i2c_device_id *id); ··· 677 677 } 678 678 679 679 /* Return 0 if detection is successful, -ENODEV otherwise */ 680 - static int f75375_detect(struct i2c_client *client, int kind, 680 + static int f75375_detect(struct i2c_client *client, 681 681 struct i2c_board_info *info) 682 682 { 683 683 struct i2c_adapter *adapter = client->adapter;
+2 -2
drivers/hwmon/fschmd.c
··· 221 221 222 222 static int fschmd_probe(struct i2c_client *client, 223 223 const struct i2c_device_id *id); 224 - static int fschmd_detect(struct i2c_client *client, int kind, 224 + static int fschmd_detect(struct i2c_client *client, 225 225 struct i2c_board_info *info); 226 226 static int fschmd_remove(struct i2c_client *client); 227 227 static struct fschmd_data *fschmd_update_device(struct device *dev); ··· 1000 1000 } 1001 1001 } 1002 1002 1003 - static int fschmd_detect(struct i2c_client *client, int _kind, 1003 + static int fschmd_detect(struct i2c_client *client, 1004 1004 struct i2c_board_info *info) 1005 1005 { 1006 1006 enum chips kind;
+2 -4
drivers/hwmon/gl518sm.c
··· 139 139 140 140 static int gl518_probe(struct i2c_client *client, 141 141 const struct i2c_device_id *id); 142 - static int gl518_detect(struct i2c_client *client, int kind, 143 - struct i2c_board_info *info); 142 + static int gl518_detect(struct i2c_client *client, struct i2c_board_info *info); 144 143 static void gl518_init_client(struct i2c_client *client); 145 144 static int gl518_remove(struct i2c_client *client); 146 145 static int gl518_read_value(struct i2c_client *client, u8 reg); ··· 483 484 */ 484 485 485 486 /* Return 0 if detection is successful, -ENODEV otherwise */ 486 - static int gl518_detect(struct i2c_client *client, int kind, 487 - struct i2c_board_info *info) 487 + static int gl518_detect(struct i2c_client *client, struct i2c_board_info *info) 488 488 { 489 489 struct i2c_adapter *adapter = client->adapter; 490 490 int rev;
+2 -4
drivers/hwmon/gl520sm.c
··· 81 81 82 82 static int gl520_probe(struct i2c_client *client, 83 83 const struct i2c_device_id *id); 84 - static int gl520_detect(struct i2c_client *client, int kind, 85 - struct i2c_board_info *info); 84 + static int gl520_detect(struct i2c_client *client, struct i2c_board_info *info); 86 85 static void gl520_init_client(struct i2c_client *client); 87 86 static int gl520_remove(struct i2c_client *client); 88 87 static int gl520_read_value(struct i2c_client *client, u8 reg); ··· 680 681 */ 681 682 682 683 /* Return 0 if detection is successful, -ENODEV otherwise */ 683 - static int gl520_detect(struct i2c_client *client, int kind, 684 - struct i2c_board_info *info) 684 + static int gl520_detect(struct i2c_client *client, struct i2c_board_info *info) 685 685 { 686 686 struct i2c_adapter *adapter = client->adapter; 687 687
+2 -3
drivers/hwmon/lm63.c
··· 134 134 135 135 static struct lm63_data *lm63_update_device(struct device *dev); 136 136 137 - static int lm63_detect(struct i2c_client *client, int kind, 138 - struct i2c_board_info *info); 137 + static int lm63_detect(struct i2c_client *client, struct i2c_board_info *info); 139 138 static void lm63_init_client(struct i2c_client *client); 140 139 141 140 /* ··· 422 423 */ 423 424 424 425 /* Return 0 if detection is successful, -ENODEV otherwise */ 425 - static int lm63_detect(struct i2c_client *new_client, int kind, 426 + static int lm63_detect(struct i2c_client *new_client, 426 427 struct i2c_board_info *info) 427 428 { 428 429 struct i2c_adapter *adapter = new_client->adapter;
+1 -1
drivers/hwmon/lm73.c
··· 151 151 MODULE_DEVICE_TABLE(i2c, lm73_ids); 152 152 153 153 /* Return 0 if detection is successful, -ENODEV otherwise */ 154 - static int lm73_detect(struct i2c_client *new_client, int kind, 154 + static int lm73_detect(struct i2c_client *new_client, 155 155 struct i2c_board_info *info) 156 156 { 157 157 struct i2c_adapter *adapter = new_client->adapter;
+1 -1
drivers/hwmon/lm75.c
··· 234 234 MODULE_DEVICE_TABLE(i2c, lm75_ids); 235 235 236 236 /* Return 0 if detection is successful, -ENODEV otherwise */ 237 - static int lm75_detect(struct i2c_client *new_client, int kind, 237 + static int lm75_detect(struct i2c_client *new_client, 238 238 struct i2c_board_info *info) 239 239 { 240 240 struct i2c_adapter *adapter = new_client->adapter;
+2 -3
drivers/hwmon/lm77.c
··· 66 66 67 67 static int lm77_probe(struct i2c_client *client, 68 68 const struct i2c_device_id *id); 69 - static int lm77_detect(struct i2c_client *client, int kind, 70 - struct i2c_board_info *info); 69 + static int lm77_detect(struct i2c_client *client, struct i2c_board_info *info); 71 70 static void lm77_init_client(struct i2c_client *client); 72 71 static int lm77_remove(struct i2c_client *client); 73 72 static u16 lm77_read_value(struct i2c_client *client, u8 reg); ··· 244 245 }; 245 246 246 247 /* Return 0 if detection is successful, -ENODEV otherwise */ 247 - static int lm77_detect(struct i2c_client *new_client, int kind, 248 + static int lm77_detect(struct i2c_client *new_client, 248 249 struct i2c_board_info *info) 249 250 { 250 251 struct i2c_adapter *adapter = new_client->adapter;
+2 -2
drivers/hwmon/lm78.c
··· 142 142 }; 143 143 144 144 145 - static int lm78_i2c_detect(struct i2c_client *client, int kind, 145 + static int lm78_i2c_detect(struct i2c_client *client, 146 146 struct i2c_board_info *info); 147 147 static int lm78_i2c_probe(struct i2c_client *client, 148 148 const struct i2c_device_id *id); ··· 558 558 return 1; 559 559 } 560 560 561 - static int lm78_i2c_detect(struct i2c_client *client, int kind, 561 + static int lm78_i2c_detect(struct i2c_client *client, 562 562 struct i2c_board_info *info) 563 563 { 564 564 int i;
+2 -4
drivers/hwmon/lm80.c
··· 133 133 134 134 static int lm80_probe(struct i2c_client *client, 135 135 const struct i2c_device_id *id); 136 - static int lm80_detect(struct i2c_client *client, int kind, 137 - struct i2c_board_info *info); 136 + static int lm80_detect(struct i2c_client *client, struct i2c_board_info *info); 138 137 static void lm80_init_client(struct i2c_client *client); 139 138 static int lm80_remove(struct i2c_client *client); 140 139 static struct lm80_data *lm80_update_device(struct device *dev); ··· 446 447 }; 447 448 448 449 /* Return 0 if detection is successful, -ENODEV otherwise */ 449 - static int lm80_detect(struct i2c_client *client, int kind, 450 - struct i2c_board_info *info) 450 + static int lm80_detect(struct i2c_client *client, struct i2c_board_info *info) 451 451 { 452 452 struct i2c_adapter *adapter = client->adapter; 453 453 int i, cur;
+2 -2
drivers/hwmon/lm83.c
··· 118 118 * Functions declaration 119 119 */ 120 120 121 - static int lm83_detect(struct i2c_client *new_client, int kind, 121 + static int lm83_detect(struct i2c_client *new_client, 122 122 struct i2c_board_info *info); 123 123 static int lm83_probe(struct i2c_client *client, 124 124 const struct i2c_device_id *id); ··· 291 291 */ 292 292 293 293 /* Return 0 if detection is successful, -ENODEV otherwise */ 294 - static int lm83_detect(struct i2c_client *new_client, int kind, 294 + static int lm83_detect(struct i2c_client *new_client, 295 295 struct i2c_board_info *info) 296 296 { 297 297 struct i2c_adapter *adapter = new_client->adapter;
+2 -4
drivers/hwmon/lm85.c
··· 323 323 struct lm85_zone zone[3]; 324 324 }; 325 325 326 - static int lm85_detect(struct i2c_client *client, int kind, 327 - struct i2c_board_info *info); 326 + static int lm85_detect(struct i2c_client *client, struct i2c_board_info *info); 328 327 static int lm85_probe(struct i2c_client *client, 329 328 const struct i2c_device_id *id); 330 329 static int lm85_remove(struct i2c_client *client); ··· 1155 1156 } 1156 1157 1157 1158 /* Return 0 if detection is successful, -ENODEV otherwise */ 1158 - static int lm85_detect(struct i2c_client *client, int kind, 1159 - struct i2c_board_info *info) 1159 + static int lm85_detect(struct i2c_client *client, struct i2c_board_info *info) 1160 1160 { 1161 1161 struct i2c_adapter *adapter = client->adapter; 1162 1162 int address = client->addr;
+2 -2
drivers/hwmon/lm87.c
··· 158 158 159 159 static int lm87_probe(struct i2c_client *client, 160 160 const struct i2c_device_id *id); 161 - static int lm87_detect(struct i2c_client *new_client, int kind, 161 + static int lm87_detect(struct i2c_client *new_client, 162 162 struct i2c_board_info *info); 163 163 static void lm87_init_client(struct i2c_client *client); 164 164 static int lm87_remove(struct i2c_client *client); ··· 662 662 }; 663 663 664 664 /* Return 0 if detection is successful, -ENODEV otherwise */ 665 - static int lm87_detect(struct i2c_client *new_client, int kind, 665 + static int lm87_detect(struct i2c_client *new_client, 666 666 struct i2c_board_info *info) 667 667 { 668 668 struct i2c_adapter *adapter = new_client->adapter;
+2 -3
drivers/hwmon/lm90.c
··· 152 152 * Functions declaration 153 153 */ 154 154 155 - static int lm90_detect(struct i2c_client *client, int kind, 156 - struct i2c_board_info *info); 155 + static int lm90_detect(struct i2c_client *client, struct i2c_board_info *info); 157 156 static int lm90_probe(struct i2c_client *client, 158 157 const struct i2c_device_id *id); 159 158 static void lm90_init_client(struct i2c_client *client); ··· 655 656 } 656 657 657 658 /* Return 0 if detection is successful, -ENODEV otherwise */ 658 - static int lm90_detect(struct i2c_client *new_client, int kind, 659 + static int lm90_detect(struct i2c_client *new_client, 659 660 struct i2c_board_info *info) 660 661 { 661 662 struct i2c_adapter *adapter = new_client->adapter;
+1 -1
drivers/hwmon/lm92.c
··· 319 319 }; 320 320 321 321 /* Return 0 if detection is successful, -ENODEV otherwise */ 322 - static int lm92_detect(struct i2c_client *new_client, int kind, 322 + static int lm92_detect(struct i2c_client *new_client, 323 323 struct i2c_board_info *info) 324 324 { 325 325 struct i2c_adapter *adapter = new_client->adapter;
+1 -2
drivers/hwmon/lm93.c
··· 2501 2501 } 2502 2502 2503 2503 /* Return 0 if detection is successful, -ENODEV otherwise */ 2504 - static int lm93_detect(struct i2c_client *client, int kind, 2505 - struct i2c_board_info *info) 2504 + static int lm93_detect(struct i2c_client *client, struct i2c_board_info *info) 2506 2505 { 2507 2506 struct i2c_adapter *adapter = client->adapter; 2508 2507 int mfr, ver;
+1 -1
drivers/hwmon/lm95241.c
··· 310 310 }; 311 311 312 312 /* Return 0 if detection is successful, -ENODEV otherwise */ 313 - static int lm95241_detect(struct i2c_client *new_client, int kind, 313 + static int lm95241_detect(struct i2c_client *new_client, 314 314 struct i2c_board_info *info) 315 315 { 316 316 struct i2c_adapter *adapter = new_client->adapter;
+2 -2
drivers/hwmon/max1619.c
··· 88 88 89 89 static int max1619_probe(struct i2c_client *client, 90 90 const struct i2c_device_id *id); 91 - static int max1619_detect(struct i2c_client *client, int kind, 91 + static int max1619_detect(struct i2c_client *client, 92 92 struct i2c_board_info *info); 93 93 static void max1619_init_client(struct i2c_client *client); 94 94 static int max1619_remove(struct i2c_client *client); ··· 226 226 */ 227 227 228 228 /* Return 0 if detection is successful, -ENODEV otherwise */ 229 - static int max1619_detect(struct i2c_client *client, int kind, 229 + static int max1619_detect(struct i2c_client *client, 230 230 struct i2c_board_info *info) 231 231 { 232 232 struct i2c_adapter *adapter = client->adapter;
+2 -2
drivers/hwmon/max6650.c
··· 116 116 117 117 static int max6650_probe(struct i2c_client *client, 118 118 const struct i2c_device_id *id); 119 - static int max6650_detect(struct i2c_client *client, int kind, 119 + static int max6650_detect(struct i2c_client *client, 120 120 struct i2c_board_info *info); 121 121 static int max6650_init_client(struct i2c_client *client); 122 122 static int max6650_remove(struct i2c_client *client); ··· 528 528 */ 529 529 530 530 /* Return 0 if detection is successful, -ENODEV otherwise */ 531 - static int max6650_detect(struct i2c_client *client, int kind, 531 + static int max6650_detect(struct i2c_client *client, 532 532 struct i2c_board_info *info) 533 533 { 534 534 struct i2c_adapter *adapter = client->adapter;
+1 -1
drivers/hwmon/pcf8591.c
··· 169 169 */ 170 170 171 171 /* Return 0 if detection is successful, -ENODEV otherwise */ 172 - static int pcf8591_detect(struct i2c_client *client, int kind, 172 + static int pcf8591_detect(struct i2c_client *client, 173 173 struct i2c_board_info *info) 174 174 { 175 175 struct i2c_adapter *adapter = client->adapter;
+2 -2
drivers/hwmon/smsc47m192.c
··· 115 115 116 116 static int smsc47m192_probe(struct i2c_client *client, 117 117 const struct i2c_device_id *id); 118 - static int smsc47m192_detect(struct i2c_client *client, int kind, 118 + static int smsc47m192_detect(struct i2c_client *client, 119 119 struct i2c_board_info *info); 120 120 static int smsc47m192_remove(struct i2c_client *client); 121 121 static struct smsc47m192_data *smsc47m192_update_device(struct device *dev); ··· 481 481 } 482 482 483 483 /* Return 0 if detection is successful, -ENODEV otherwise */ 484 - static int smsc47m192_detect(struct i2c_client *client, int kind, 484 + static int smsc47m192_detect(struct i2c_client *client, 485 485 struct i2c_board_info *info) 486 486 { 487 487 struct i2c_adapter *adapter = client->adapter;
+2 -2
drivers/hwmon/thmc50.c
··· 84 84 u8 alarms; 85 85 }; 86 86 87 - static int thmc50_detect(struct i2c_client *client, int kind, 87 + static int thmc50_detect(struct i2c_client *client, 88 88 struct i2c_board_info *info); 89 89 static int thmc50_probe(struct i2c_client *client, 90 90 const struct i2c_device_id *id); ··· 286 286 }; 287 287 288 288 /* Return 0 if detection is successful, -ENODEV otherwise */ 289 - static int thmc50_detect(struct i2c_client *client, int kind, 289 + static int thmc50_detect(struct i2c_client *client, 290 290 struct i2c_board_info *info) 291 291 { 292 292 unsigned company;
+2 -2
drivers/hwmon/tmp401.c
··· 98 98 99 99 static int tmp401_probe(struct i2c_client *client, 100 100 const struct i2c_device_id *id); 101 - static int tmp401_detect(struct i2c_client *client, int kind, 101 + static int tmp401_detect(struct i2c_client *client, 102 102 struct i2c_board_info *info); 103 103 static int tmp401_remove(struct i2c_client *client); 104 104 static struct tmp401_data *tmp401_update_device(struct device *dev); ··· 488 488 i2c_smbus_write_byte_data(client, TMP401_CONFIG_WRITE, config); 489 489 } 490 490 491 - static int tmp401_detect(struct i2c_client *client, int _kind, 491 + static int tmp401_detect(struct i2c_client *client, 492 492 struct i2c_board_info *info) 493 493 { 494 494 enum chips kind;
+1 -1
drivers/hwmon/tmp421.c
··· 223 223 return 0; 224 224 } 225 225 226 - static int tmp421_detect(struct i2c_client *client, int _kind, 226 + static int tmp421_detect(struct i2c_client *client, 227 227 struct i2c_board_info *info) 228 228 { 229 229 enum chips kind;
+1 -2
drivers/hwmon/w83781d.c
··· 1051 1051 1052 1052 /* Return 0 if detection is successful, -ENODEV otherwise */ 1053 1053 static int 1054 - w83781d_detect(struct i2c_client *client, int kind, 1055 - struct i2c_board_info *info) 1054 + w83781d_detect(struct i2c_client *client, struct i2c_board_info *info) 1056 1055 { 1057 1056 int val1, val2; 1058 1057 struct w83781d_data *isa = w83781d_data_if_isa();
+2 -2
drivers/hwmon/w83791d.c
··· 326 326 327 327 static int w83791d_probe(struct i2c_client *client, 328 328 const struct i2c_device_id *id); 329 - static int w83791d_detect(struct i2c_client *client, int kind, 329 + static int w83791d_detect(struct i2c_client *client, 330 330 struct i2c_board_info *info); 331 331 static int w83791d_remove(struct i2c_client *client); 332 332 ··· 1259 1259 1260 1260 1261 1261 /* Return 0 if detection is successful, -ENODEV otherwise */ 1262 - static int w83791d_detect(struct i2c_client *client, int kind, 1262 + static int w83791d_detect(struct i2c_client *client, 1263 1263 struct i2c_board_info *info) 1264 1264 { 1265 1265 struct i2c_adapter *adapter = client->adapter;
+2 -2
drivers/hwmon/w83792d.c
··· 302 302 303 303 static int w83792d_probe(struct i2c_client *client, 304 304 const struct i2c_device_id *id); 305 - static int w83792d_detect(struct i2c_client *client, int kind, 305 + static int w83792d_detect(struct i2c_client *client, 306 306 struct i2c_board_info *info); 307 307 static int w83792d_remove(struct i2c_client *client); 308 308 static struct w83792d_data *w83792d_update_device(struct device *dev); ··· 1263 1263 1264 1264 /* Return 0 if detection is successful, -ENODEV otherwise */ 1265 1265 static int 1266 - w83792d_detect(struct i2c_client *client, int kind, struct i2c_board_info *info) 1266 + w83792d_detect(struct i2c_client *client, struct i2c_board_info *info) 1267 1267 { 1268 1268 struct i2c_adapter *adapter = client->adapter; 1269 1269 int val1, val2;
+2 -2
drivers/hwmon/w83793.c
··· 230 230 static int w83793_write_value(struct i2c_client *client, u16 reg, u8 value); 231 231 static int w83793_probe(struct i2c_client *client, 232 232 const struct i2c_device_id *id); 233 - static int w83793_detect(struct i2c_client *client, int kind, 233 + static int w83793_detect(struct i2c_client *client, 234 234 struct i2c_board_info *info); 235 235 static int w83793_remove(struct i2c_client *client); 236 236 static void w83793_init_client(struct i2c_client *client); ··· 1161 1161 } 1162 1162 1163 1163 /* Return 0 if detection is successful, -ENODEV otherwise */ 1164 - static int w83793_detect(struct i2c_client *client, int kind, 1164 + static int w83793_detect(struct i2c_client *client, 1165 1165 struct i2c_board_info *info) 1166 1166 { 1167 1167 u8 tmp, bank, chip_id;
+2 -2
drivers/hwmon/w83l785ts.c
··· 83 83 84 84 static int w83l785ts_probe(struct i2c_client *client, 85 85 const struct i2c_device_id *id); 86 - static int w83l785ts_detect(struct i2c_client *client, int kind, 86 + static int w83l785ts_detect(struct i2c_client *client, 87 87 struct i2c_board_info *info); 88 88 static int w83l785ts_remove(struct i2c_client *client); 89 89 static u8 w83l785ts_read_value(struct i2c_client *client, u8 reg, u8 defval); ··· 146 146 */ 147 147 148 148 /* Return 0 if detection is successful, -ENODEV otherwise */ 149 - static int w83l785ts_detect(struct i2c_client *client, int kind, 149 + static int w83l785ts_detect(struct i2c_client *client, 150 150 struct i2c_board_info *info) 151 151 { 152 152 struct i2c_adapter *adapter = client->adapter;
+2 -3
drivers/hwmon/w83l786ng.c
··· 147 147 148 148 static int w83l786ng_probe(struct i2c_client *client, 149 149 const struct i2c_device_id *id); 150 - static int w83l786ng_detect(struct i2c_client *client, int kind, 150 + static int w83l786ng_detect(struct i2c_client *client, 151 151 struct i2c_board_info *info); 152 152 static int w83l786ng_remove(struct i2c_client *client); 153 153 static void w83l786ng_init_client(struct i2c_client *client); ··· 586 586 }; 587 587 588 588 static int 589 - w83l786ng_detect(struct i2c_client *client, int kind, 590 - struct i2c_board_info *info) 589 + w83l786ng_detect(struct i2c_client *client, struct i2c_board_info *info) 591 590 { 592 591 struct i2c_adapter *adapter = client->adapter; 593 592 u16 man_id;
+1 -1
drivers/i2c/i2c-core.c
··· 1184 1184 /* Finally call the custom detection function */ 1185 1185 memset(&info, 0, sizeof(struct i2c_board_info)); 1186 1186 info.addr = addr; 1187 - err = driver->detect(temp_client, -1, &info); 1187 + err = driver->detect(temp_client, &info); 1188 1188 if (err) { 1189 1189 /* -ENODEV is returned if the detection fails. We catch it 1190 1190 here as this isn't an error. */
+1 -2
drivers/misc/eeprom/eeprom.c
··· 135 135 }; 136 136 137 137 /* Return 0 if detection is successful, -ENODEV otherwise */ 138 - static int eeprom_detect(struct i2c_client *client, int kind, 139 - struct i2c_board_info *info) 138 + static int eeprom_detect(struct i2c_client *client, struct i2c_board_info *info) 140 139 { 141 140 struct i2c_adapter *adapter = client->adapter; 142 141
+2 -2
drivers/misc/ics932s401.c
··· 106 106 107 107 static int ics932s401_probe(struct i2c_client *client, 108 108 const struct i2c_device_id *id); 109 - static int ics932s401_detect(struct i2c_client *client, int kind, 109 + static int ics932s401_detect(struct i2c_client *client, 110 110 struct i2c_board_info *info); 111 111 static int ics932s401_remove(struct i2c_client *client); 112 112 ··· 413 413 } 414 414 415 415 /* Return 0 if detection is successful, -ENODEV otherwise */ 416 - static int ics932s401_detect(struct i2c_client *client, int kind, 416 + static int ics932s401_detect(struct i2c_client *client, 417 417 struct i2c_board_info *info) 418 418 { 419 419 struct i2c_adapter *adapter = client->adapter;
+1 -1
include/linux/i2c.h
··· 161 161 const struct i2c_device_id *id_table; 162 162 163 163 /* Device detection callback for automatic device creation */ 164 - int (*detect)(struct i2c_client *, int kind, struct i2c_board_info *); 164 + int (*detect)(struct i2c_client *, struct i2c_board_info *); 165 165 const struct i2c_client_address_data *address_data; 166 166 struct list_head clients; 167 167 };