Skip to content

Commit 780328a

Browse files
Uwe Kleine-Könighdeller
authored andcommitted
fbdev: matroxfb ssd1307fb: Switch i2c drivers back to use .probe()
After commit b8a1a4c ("i2c: Provide a temporary .probe_new() call-back type"), all drivers being converted to .probe_new() and then 03c835f ("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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Helge Deller <deller@gmx.de>
1 parent 44c026a commit 780328a

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/video/fbdev/matrox/matroxfb_maven.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1291,7 +1291,7 @@ static struct i2c_driver maven_driver={
12911291
.driver = {
12921292
.name = "maven",
12931293
},
1294-
.probe_new = maven_probe,
1294+
.probe = maven_probe,
12951295
.remove = maven_remove,
12961296
.id_table = maven_id,
12971297
};

drivers/video/fbdev/ssd1307fb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ static const struct i2c_device_id ssd1307fb_i2c_id[] = {
844844
MODULE_DEVICE_TABLE(i2c, ssd1307fb_i2c_id);
845845

846846
static struct i2c_driver ssd1307fb_driver = {
847-
.probe_new = ssd1307fb_probe,
847+
.probe = ssd1307fb_probe,
848848
.remove = ssd1307fb_remove,
849849
.id_table = ssd1307fb_i2c_id,
850850
.driver = {

0 commit comments

Comments
 (0)