diff options
Diffstat (limited to 'drivers/macintosh/therm_windtunnel.c')
-rw-r--r-- | drivers/macintosh/therm_windtunnel.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c index c89f396e4c53..46c4e95f10d6 100644 --- a/drivers/macintosh/therm_windtunnel.c +++ b/drivers/macintosh/therm_windtunnel.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #include <asm/sections.h> | 45 | #include <asm/sections.h> |
46 | #include <asm/macio.h> | 46 | #include <asm/macio.h> |
47 | 47 | ||
48 | #define LOG_TEMP 0 /* continously log temperature */ | 48 | #define LOG_TEMP 0 /* continuously log temperature */ |
49 | 49 | ||
50 | static struct { | 50 | static struct { |
51 | volatile int running; | 51 | volatile int running; |
@@ -443,8 +443,7 @@ static struct i2c_driver g4fan_driver = { | |||
443 | /* initialization / cleanup */ | 443 | /* initialization / cleanup */ |
444 | /************************************************************************/ | 444 | /************************************************************************/ |
445 | 445 | ||
446 | static int | 446 | static int therm_of_probe(struct platform_device *dev) |
447 | therm_of_probe( struct platform_device *dev, const struct of_device_id *match ) | ||
448 | { | 447 | { |
449 | return i2c_add_driver( &g4fan_driver ); | 448 | return i2c_add_driver( &g4fan_driver ); |
450 | } | 449 | } |
@@ -462,7 +461,7 @@ static const struct of_device_id therm_of_match[] = {{ | |||
462 | }, {} | 461 | }, {} |
463 | }; | 462 | }; |
464 | 463 | ||
465 | static struct of_platform_driver therm_of_driver = { | 464 | static struct platform_driver therm_of_driver = { |
466 | .driver = { | 465 | .driver = { |
467 | .name = "temperature", | 466 | .name = "temperature", |
468 | .owner = THIS_MODULE, | 467 | .owner = THIS_MODULE, |
@@ -509,14 +508,14 @@ g4fan_init( void ) | |||
509 | return -ENODEV; | 508 | return -ENODEV; |
510 | } | 509 | } |
511 | 510 | ||
512 | of_register_platform_driver( &therm_of_driver ); | 511 | platform_driver_register( &therm_of_driver ); |
513 | return 0; | 512 | return 0; |
514 | } | 513 | } |
515 | 514 | ||
516 | static void __exit | 515 | static void __exit |
517 | g4fan_exit( void ) | 516 | g4fan_exit( void ) |
518 | { | 517 | { |
519 | of_unregister_platform_driver( &therm_of_driver ); | 518 | platform_driver_unregister( &therm_of_driver ); |
520 | 519 | ||
521 | if( x.of_dev ) | 520 | if( x.of_dev ) |
522 | of_device_unregister( x.of_dev ); | 521 | of_device_unregister( x.of_dev ); |