Commit 1f268d6d authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'auxdisplay-6.5' of https://github.com/ojeda/linux

Pull auxdisplay update from Miguel Ojeda:
 "A single cleanup for i2c drivers to switch them back to use
  '.probe()'"

* tag 'auxdisplay-6.5' of https://github.com/ojeda/linux:
  auxdisplay: Switch i2c drivers back to use .probe()
parents a1257b5e def85dce
...@@ -820,7 +820,7 @@ static const struct of_device_id ht16k33_of_match[] = { ...@@ -820,7 +820,7 @@ static const struct of_device_id ht16k33_of_match[] = {
MODULE_DEVICE_TABLE(of, ht16k33_of_match); MODULE_DEVICE_TABLE(of, ht16k33_of_match);
static struct i2c_driver ht16k33_driver = { static struct i2c_driver ht16k33_driver = {
.probe_new = ht16k33_probe, .probe = ht16k33_probe,
.remove = ht16k33_remove, .remove = ht16k33_remove,
.driver = { .driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
......
...@@ -365,7 +365,7 @@ static struct i2c_driver lcd2s_i2c_driver = { ...@@ -365,7 +365,7 @@ static struct i2c_driver lcd2s_i2c_driver = {
.name = "lcd2s", .name = "lcd2s",
.of_match_table = lcd2s_of_table, .of_match_table = lcd2s_of_table,
}, },
.probe_new = lcd2s_i2c_probe, .probe = lcd2s_i2c_probe,
.remove = lcd2s_i2c_remove, .remove = lcd2s_i2c_remove,
.id_table = lcd2s_i2c_id, .id_table = lcd2s_i2c_id,
}; };
......
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