Commit d9ff8a8e authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Lee Jones

leds: Switch i2c drivers back to use .probe()

After commit b8a1a4cd ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
03c835f4 ("i2c: Switch .probe() to not take an id parameter") convert
back to (the new) .probe() to be able to eventually drop .probe_new() from
struct i2c_driver.
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230517180559.166329-1-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarLee Jones <lee@kernel.org>
parent b0f379bd
...@@ -759,7 +759,7 @@ static struct i2c_driver as3645a_i2c_driver = { ...@@ -759,7 +759,7 @@ static struct i2c_driver as3645a_i2c_driver = {
.of_match_table = as3645a_of_table, .of_match_table = as3645a_of_table,
.name = AS_NAME, .name = AS_NAME,
}, },
.probe_new = as3645a_probe, .probe = as3645a_probe,
.remove = as3645a_remove, .remove = as3645a_remove,
.id_table = as3645a_id_table, .id_table = as3645a_id_table,
}; };
......
...@@ -471,7 +471,7 @@ static struct i2c_driver lm3601x_i2c_driver = { ...@@ -471,7 +471,7 @@ static struct i2c_driver lm3601x_i2c_driver = {
.name = "lm3601x", .name = "lm3601x",
.of_match_table = of_lm3601x_leds_match, .of_match_table = of_lm3601x_leds_match,
}, },
.probe_new = lm3601x_probe, .probe = lm3601x_probe,
.remove = lm3601x_remove, .remove = lm3601x_remove,
.id_table = lm3601x_id, .id_table = lm3601x_id,
}; };
......
...@@ -419,7 +419,7 @@ static struct i2c_driver rt4505_driver = { ...@@ -419,7 +419,7 @@ static struct i2c_driver rt4505_driver = {
.name = "rt4505", .name = "rt4505",
.of_match_table = of_match_ptr(rt4505_leds_match), .of_match_table = of_match_ptr(rt4505_leds_match),
}, },
.probe_new = rt4505_probe, .probe = rt4505_probe,
.remove = rt4505_remove, .remove = rt4505_remove,
.shutdown = rt4505_shutdown, .shutdown = rt4505_shutdown,
}; };
......
...@@ -346,7 +346,7 @@ static struct i2c_driver an30259a_driver = { ...@@ -346,7 +346,7 @@ static struct i2c_driver an30259a_driver = {
.name = "leds-an30259a", .name = "leds-an30259a",
.of_match_table = of_match_ptr(an30259a_match_table), .of_match_table = of_match_ptr(an30259a_match_table),
}, },
.probe_new = an30259a_probe, .probe = an30259a_probe,
.remove = an30259a_remove, .remove = an30259a_remove,
.id_table = an30259a_id, .id_table = an30259a_id,
}; };
......
...@@ -422,7 +422,7 @@ static struct i2c_driver aw2013_driver = { ...@@ -422,7 +422,7 @@ static struct i2c_driver aw2013_driver = {
.name = "leds-aw2013", .name = "leds-aw2013",
.of_match_table = of_match_ptr(aw2013_match_table), .of_match_table = of_match_ptr(aw2013_match_table),
}, },
.probe_new = aw2013_probe, .probe = aw2013_probe,
.remove = aw2013_remove, .remove = aw2013_remove,
}; };
......
...@@ -150,7 +150,7 @@ static struct i2c_driver bd2606mvv_driver = { ...@@ -150,7 +150,7 @@ static struct i2c_driver bd2606mvv_driver = {
.name = "leds-bd2606mvv", .name = "leds-bd2606mvv",
.of_match_table = of_match_ptr(of_bd2606mvv_leds_match), .of_match_table = of_match_ptr(of_bd2606mvv_leds_match),
}, },
.probe_new = bd2606mvv_probe, .probe = bd2606mvv_probe,
}; };
module_i2c_driver(bd2606mvv_driver); module_i2c_driver(bd2606mvv_driver);
......
...@@ -786,7 +786,7 @@ static struct i2c_driver bd2802_i2c_driver = { ...@@ -786,7 +786,7 @@ static struct i2c_driver bd2802_i2c_driver = {
.name = "BD2802", .name = "BD2802",
.pm = &bd2802_pm, .pm = &bd2802_pm,
}, },
.probe_new = bd2802_probe, .probe = bd2802_probe,
.remove = bd2802_remove, .remove = bd2802_remove,
.id_table = bd2802_id, .id_table = bd2802_id,
}; };
......
...@@ -730,7 +730,7 @@ static struct i2c_driver blinkm_driver = { ...@@ -730,7 +730,7 @@ static struct i2c_driver blinkm_driver = {
.driver = { .driver = {
.name = "blinkm", .name = "blinkm",
}, },
.probe_new = blinkm_probe, .probe = blinkm_probe,
.remove = blinkm_remove, .remove = blinkm_remove,
.id_table = blinkm_id, .id_table = blinkm_id,
.detect = blinkm_detect, .detect = blinkm_detect,
......
...@@ -602,7 +602,7 @@ static struct i2c_driver is31fl319x_driver = { ...@@ -602,7 +602,7 @@ static struct i2c_driver is31fl319x_driver = {
.name = "leds-is31fl319x", .name = "leds-is31fl319x",
.of_match_table = of_is31fl319x_match, .of_match_table = of_is31fl319x_match,
}, },
.probe_new = is31fl319x_probe, .probe = is31fl319x_probe,
.id_table = is31fl319x_id, .id_table = is31fl319x_id,
}; };
......
...@@ -488,7 +488,7 @@ static struct i2c_driver is31fl32xx_driver = { ...@@ -488,7 +488,7 @@ static struct i2c_driver is31fl32xx_driver = {
.name = "is31fl32xx", .name = "is31fl32xx",
.of_match_table = of_is31fl32xx_match, .of_match_table = of_is31fl32xx_match,
}, },
.probe_new = is31fl32xx_probe, .probe = is31fl32xx_probe,
.remove = is31fl32xx_remove, .remove = is31fl32xx_remove,
.id_table = is31fl32xx_id, .id_table = is31fl32xx_id,
}; };
......
...@@ -484,7 +484,7 @@ static const struct i2c_device_id lm3530_id[] = { ...@@ -484,7 +484,7 @@ static const struct i2c_device_id lm3530_id[] = {
MODULE_DEVICE_TABLE(i2c, lm3530_id); MODULE_DEVICE_TABLE(i2c, lm3530_id);
static struct i2c_driver lm3530_i2c_driver = { static struct i2c_driver lm3530_i2c_driver = {
.probe_new = lm3530_probe, .probe = lm3530_probe,
.remove = lm3530_remove, .remove = lm3530_remove,
.id_table = lm3530_id, .id_table = lm3530_id,
.driver = { .driver = {
......
...@@ -726,7 +726,7 @@ static const struct i2c_device_id lm3532_id[] = { ...@@ -726,7 +726,7 @@ static const struct i2c_device_id lm3532_id[] = {
MODULE_DEVICE_TABLE(i2c, lm3532_id); MODULE_DEVICE_TABLE(i2c, lm3532_id);
static struct i2c_driver lm3532_i2c_driver = { static struct i2c_driver lm3532_i2c_driver = {
.probe_new = lm3532_probe, .probe = lm3532_probe,
.remove = lm3532_remove, .remove = lm3532_remove,
.id_table = lm3532_id, .id_table = lm3532_id,
.driver = { .driver = {
......
...@@ -516,7 +516,7 @@ static struct i2c_driver lm355x_i2c_driver = { ...@@ -516,7 +516,7 @@ static struct i2c_driver lm355x_i2c_driver = {
.name = LM355x_NAME, .name = LM355x_NAME,
.pm = NULL, .pm = NULL,
}, },
.probe_new = lm355x_probe, .probe = lm355x_probe,
.remove = lm355x_remove, .remove = lm355x_remove,
.id_table = lm355x_id, .id_table = lm355x_id,
}; };
......
...@@ -401,7 +401,7 @@ static struct i2c_driver lm3642_i2c_driver = { ...@@ -401,7 +401,7 @@ static struct i2c_driver lm3642_i2c_driver = {
.name = LM3642_NAME, .name = LM3642_NAME,
.pm = NULL, .pm = NULL,
}, },
.probe_new = lm3642_probe, .probe = lm3642_probe,
.remove = lm3642_remove, .remove = lm3642_remove,
.id_table = lm3642_id, .id_table = lm3642_id,
}; };
......
...@@ -518,7 +518,7 @@ static struct i2c_driver lm3692x_driver = { ...@@ -518,7 +518,7 @@ static struct i2c_driver lm3692x_driver = {
.name = "lm3692x", .name = "lm3692x",
.of_match_table = of_lm3692x_leds_match, .of_match_table = of_lm3692x_leds_match,
}, },
.probe_new = lm3692x_probe, .probe = lm3692x_probe,
.remove = lm3692x_remove, .remove = lm3692x_remove,
.id_table = lm3692x_id, .id_table = lm3692x_id,
}; };
......
...@@ -376,7 +376,7 @@ static struct i2c_driver lm3697_driver = { ...@@ -376,7 +376,7 @@ static struct i2c_driver lm3697_driver = {
.name = "lm3697", .name = "lm3697",
.of_match_table = of_lm3697_leds_match, .of_match_table = of_lm3697_leds_match,
}, },
.probe_new = lm3697_probe, .probe = lm3697_probe,
.remove = lm3697_remove, .remove = lm3697_remove,
.id_table = lm3697_id, .id_table = lm3697_id,
}; };
......
...@@ -427,7 +427,7 @@ static struct i2c_driver lp3944_driver = { ...@@ -427,7 +427,7 @@ static struct i2c_driver lp3944_driver = {
.driver = { .driver = {
.name = "lp3944", .name = "lp3944",
}, },
.probe_new = lp3944_probe, .probe = lp3944_probe,
.remove = lp3944_remove, .remove = lp3944_remove,
.id_table = lp3944_id, .id_table = lp3944_id,
}; };
......
...@@ -273,7 +273,7 @@ static struct i2c_driver lp3952_i2c_driver = { ...@@ -273,7 +273,7 @@ static struct i2c_driver lp3952_i2c_driver = {
.driver = { .driver = {
.name = LP3952_NAME, .name = LP3952_NAME,
}, },
.probe_new = lp3952_probe, .probe = lp3952_probe,
.remove = lp3952_remove, .remove = lp3952_remove,
.id_table = lp3952_id, .id_table = lp3952_id,
}; };
......
...@@ -608,7 +608,7 @@ static struct i2c_driver lp50xx_driver = { ...@@ -608,7 +608,7 @@ static struct i2c_driver lp50xx_driver = {
.name = "lp50xx", .name = "lp50xx",
.of_match_table = of_lp50xx_leds_match, .of_match_table = of_lp50xx_leds_match,
}, },
.probe_new = lp50xx_probe, .probe = lp50xx_probe,
.remove = lp50xx_remove, .remove = lp50xx_remove,
.id_table = lp50xx_id, .id_table = lp50xx_id,
}; };
......
...@@ -607,7 +607,7 @@ static struct i2c_driver lp5521_driver = { ...@@ -607,7 +607,7 @@ static struct i2c_driver lp5521_driver = {
.name = "lp5521", .name = "lp5521",
.of_match_table = of_match_ptr(of_lp5521_leds_match), .of_match_table = of_match_ptr(of_lp5521_leds_match),
}, },
.probe_new = lp5521_probe, .probe = lp5521_probe,
.remove = lp5521_remove, .remove = lp5521_remove,
.id_table = lp5521_id, .id_table = lp5521_id,
}; };
......
...@@ -987,7 +987,7 @@ static struct i2c_driver lp5523_driver = { ...@@ -987,7 +987,7 @@ static struct i2c_driver lp5523_driver = {
.name = "lp5523x", .name = "lp5523x",
.of_match_table = of_match_ptr(of_lp5523_leds_match), .of_match_table = of_match_ptr(of_lp5523_leds_match),
}, },
.probe_new = lp5523_probe, .probe = lp5523_probe,
.remove = lp5523_remove, .remove = lp5523_remove,
.id_table = lp5523_id, .id_table = lp5523_id,
}; };
......
...@@ -603,7 +603,7 @@ static struct i2c_driver lp5562_driver = { ...@@ -603,7 +603,7 @@ static struct i2c_driver lp5562_driver = {
.name = "lp5562", .name = "lp5562",
.of_match_table = of_match_ptr(of_lp5562_leds_match), .of_match_table = of_match_ptr(of_lp5562_leds_match),
}, },
.probe_new = lp5562_probe, .probe = lp5562_probe,
.remove = lp5562_remove, .remove = lp5562_remove,
.id_table = lp5562_id, .id_table = lp5562_id,
}; };
......
...@@ -394,7 +394,7 @@ static struct i2c_driver lp8501_driver = { ...@@ -394,7 +394,7 @@ static struct i2c_driver lp8501_driver = {
.name = "lp8501", .name = "lp8501",
.of_match_table = of_match_ptr(of_lp8501_leds_match), .of_match_table = of_match_ptr(of_lp8501_leds_match),
}, },
.probe_new = lp8501_probe, .probe = lp8501_probe,
.remove = lp8501_remove, .remove = lp8501_remove,
.id_table = lp8501_id, .id_table = lp8501_id,
}; };
......
...@@ -475,7 +475,7 @@ static struct i2c_driver lp8860_driver = { ...@@ -475,7 +475,7 @@ static struct i2c_driver lp8860_driver = {
.name = "lp8860", .name = "lp8860",
.of_match_table = of_lp8860_leds_match, .of_match_table = of_lp8860_leds_match,
}, },
.probe_new = lp8860_probe, .probe = lp8860_probe,
.remove = lp8860_remove, .remove = lp8860_remove,
.id_table = lp8860_id, .id_table = lp8860_id,
}; };
......
...@@ -102,7 +102,7 @@ static struct i2c_driver pca9532_driver = { ...@@ -102,7 +102,7 @@ static struct i2c_driver pca9532_driver = {
.name = "leds-pca953x", .name = "leds-pca953x",
.of_match_table = of_match_ptr(of_pca9532_leds_match), .of_match_table = of_match_ptr(of_pca9532_leds_match),
}, },
.probe_new = pca9532_probe, .probe = pca9532_probe,
.remove = pca9532_remove, .remove = pca9532_remove,
.id_table = pca9532_id, .id_table = pca9532_id,
}; };
......
...@@ -668,7 +668,7 @@ static struct i2c_driver pca955x_driver = { ...@@ -668,7 +668,7 @@ static struct i2c_driver pca955x_driver = {
.name = "leds-pca955x", .name = "leds-pca955x",
.of_match_table = of_pca955x_match, .of_match_table = of_pca955x_match,
}, },
.probe_new = pca955x_probe, .probe = pca955x_probe,
.id_table = pca955x_id, .id_table = pca955x_id,
}; };
......
...@@ -431,7 +431,7 @@ static struct i2c_driver pca963x_driver = { ...@@ -431,7 +431,7 @@ static struct i2c_driver pca963x_driver = {
.name = "leds-pca963x", .name = "leds-pca963x",
.of_match_table = of_pca963x_match, .of_match_table = of_pca963x_match,
}, },
.probe_new = pca963x_probe, .probe = pca963x_probe,
.id_table = pca963x_id, .id_table = pca963x_id,
}; };
......
...@@ -808,7 +808,7 @@ static struct i2c_driver tca6507_driver = { ...@@ -808,7 +808,7 @@ static struct i2c_driver tca6507_driver = {
.name = "leds-tca6507", .name = "leds-tca6507",
.of_match_table = of_match_ptr(of_tca6507_leds_match), .of_match_table = of_match_ptr(of_tca6507_leds_match),
}, },
.probe_new = tca6507_probe, .probe = tca6507_probe,
.remove = tca6507_remove, .remove = tca6507_remove,
.id_table = tca6507_id, .id_table = tca6507_id,
}; };
......
...@@ -230,7 +230,7 @@ static struct i2c_driver tlc591xx_driver = { ...@@ -230,7 +230,7 @@ static struct i2c_driver tlc591xx_driver = {
.name = "tlc591xx", .name = "tlc591xx",
.of_match_table = of_match_ptr(of_tlc591xx_leds_match), .of_match_table = of_match_ptr(of_tlc591xx_leds_match),
}, },
.probe_new = tlc591xx_probe, .probe = tlc591xx_probe,
.id_table = tlc591xx_id, .id_table = tlc591xx_id,
}; };
......
...@@ -271,7 +271,7 @@ static const struct i2c_device_id omnia_id[] = { ...@@ -271,7 +271,7 @@ static const struct i2c_device_id omnia_id[] = {
MODULE_DEVICE_TABLE(i2c, omnia_id); MODULE_DEVICE_TABLE(i2c, omnia_id);
static struct i2c_driver omnia_leds_driver = { static struct i2c_driver omnia_leds_driver = {
.probe_new = omnia_leds_probe, .probe = omnia_leds_probe,
.remove = omnia_leds_remove, .remove = omnia_leds_remove,
.id_table = omnia_id, .id_table = omnia_id,
.driver = { .driver = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment