]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
mfd: max77686: Use the struct i2c_driver .probe_new instead of .probe
authorJavier Martinez Canillas <javier@osg.samsung.com>
Fri, 13 Jan 2017 13:34:07 +0000 (10:34 -0300)
committerLee Jones <lee.jones@linaro.org>
Mon, 13 Feb 2017 09:29:43 +0000 (09:29 +0000)
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 <javier@osg.samsung.com>
Acked-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Tested-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/max77686.c

index 33dd094936059f873c45478416361f8e65a4fd83..896c1bf85acce5eb69c3f1309c9afb629d69eaa7 100644 (file)
@@ -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,
 };