diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-26 09:42:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-26 09:42:03 -0700 |
| commit | 1f268d6d2c244baf2c7769f33782ca532717723d (patch) | |
| tree | 48add37e5d3dd33fc21afd9f19d96a32c0243741 /drivers | |
| parent | a1257b5e3b7f8a21faf462d0118067fe31e71ffb (diff) | |
| parent | def85dce1451ec276b8047da2010b6e6a159c2b6 (diff) | |
| download | linux-stable-1f268d6d2c244baf2c7769f33782ca532717723d.tar.gz linux-stable-1f268d6d2c244baf2c7769f33782ca532717723d.tar.bz2 linux-stable-1f268d6d2c244baf2c7769f33782ca532717723d.zip | |
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()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/auxdisplay/ht16k33.c | 2 | ||||
| -rw-r--r-- | drivers/auxdisplay/lcd2s.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/auxdisplay/ht16k33.c b/drivers/auxdisplay/ht16k33.c index 02425991c159..d44814b9562a 100644 --- a/drivers/auxdisplay/ht16k33.c +++ b/drivers/auxdisplay/ht16k33.c @@ -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, diff --git a/drivers/auxdisplay/lcd2s.c b/drivers/auxdisplay/lcd2s.c index 135831a16514..6422be0dfe20 100644 --- a/drivers/auxdisplay/lcd2s.c +++ b/drivers/auxdisplay/lcd2s.c @@ -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, }; |