Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

macintosh: therm_windtunnel: drop using attach_adapter

Browse Source 
As we now have deferred probing, we can use a custom mechanism and
finally get rid of the legacy interface from the i2c core.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Wolfram Sang 2018-08-21 17:02:39 +02:00
parent 33e17876ea
commit 3e7bed5271
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/macintosh/therm_windtunnel.c
View File

@ -432,7 +432,6 @@ static struct i2c_driver g4fan_driver = {
.driver = { .driver = {
.name = "therm_windtunnel", .name = "therm_windtunnel",
}, },
.attach_adapter = do_attach,
.probe = do_probe, .probe = do_probe,
.remove = do_remove, .remove = do_remove,
.id_table = therm_windtunnel_id, .id_table = therm_windtunnel_id,
@ -445,7 +444,29 @@ static struct i2c_driver g4fan_driver = {
static int therm_of_probe(struct platform_device *dev) static int therm_of_probe(struct platform_device *dev)
{ {
return i2c_add_driver( &g4fan_driver ); struct i2c_adapter *adap;
int ret, i = 0;
adap = i2c_get_adapter(0);
if (!adap)
return -EPROBE_DEFER;
ret = i2c_add_driver(&g4fan_driver);
if (ret) {
i2c_put_adapter(adap);
return ret;
}
/* We assume Macs have consecutive I2C bus numbers starting at 0 */
while (adap) {
do_attach(adap);
if (x.running)
return 0;
i2c_put_adapter(adap);
adap = i2c_get_adapter(++i);
}
return -ENODEV;
} }
static int static int