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

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

drivers/auxdisplay/ht16k33.c

+1 −1
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ static const struct of_device_id ht16k33_of_match[] = { 
MODULE_DEVICE_TABLE(of, ht16k33_of_match);



static struct i2c_driver ht16k33_driver = {

	.probe_new	= ht16k33_probe,

	.probe		= ht16k33_probe,

	.remove		= ht16k33_remove,

	.driver		= {

		.name		= DRIVER_NAME,

drivers/auxdisplay/lcd2s.c

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static struct i2c_driver lcd2s_i2c_driver = { 
		.name = "lcd2s",

		.of_match_table = lcd2s_of_table,

	},

	.probe_new = lcd2s_i2c_probe,

	.probe = lcd2s_i2c_probe,

	.remove = lcd2s_i2c_remove,

	.id_table = lcd2s_i2c_id,

};