From: Javier Martinez Canillas Date: Fri, 13 Jan 2017 13:34:07 +0000 (-0300) Subject: mfd: max77686: Use the struct i2c_driver .probe_new instead of .probe X-Git-Tag: v4.11-rc1~105^2~12 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=be1bb2355bf3a500d9eb4288f5a99225126b7453;p=linux.git mfd: max77686: Use the struct i2c_driver .probe_new instead of .probe If a driver is only used in DT platforms, there's no need to get the i2c_device_id as an argument of the probe function. Since this data can be get from the matching of_device_id. There's a temporary .probe_new field in struct i2c_driver that can be used as probe callback for the case when i2c_device_id won't be used. Signed-off-by: Javier Martinez Canillas Acked-by: Laxman Dewangan Reviewed-by: Krzysztof Kozlowski Tested-by: Krzysztof Kozlowski Reviewed-by: Chanwoo Choi Signed-off-by: Lee Jones --- diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c index 33dd09493605..896c1bf85acc 100644 --- a/drivers/mfd/max77686.c +++ b/drivers/mfd/max77686.c @@ -172,8 +172,7 @@ static const struct of_device_id max77686_pmic_dt_match[] = { }; MODULE_DEVICE_TABLE(of, max77686_pmic_dt_match); -static int max77686_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int max77686_i2c_probe(struct i2c_client *i2c) { struct max77686_dev *max77686 = NULL; unsigned int data; @@ -294,7 +293,7 @@ static struct i2c_driver max77686_i2c_driver = { .pm = &max77686_pm, .of_match_table = of_match_ptr(max77686_pmic_dt_match), }, - .probe = max77686_i2c_probe, + .probe_new = max77686_i2c_probe, .id_table = max77686_i2c_id, };