diff options
Diffstat (limited to 'drivers/macintosh')
-rw-r--r-- | drivers/macintosh/macio_asic.c | 1 | ||||
-rw-r--r-- | drivers/macintosh/mediabay.c | 6 | ||||
-rw-r--r-- | drivers/macintosh/rack-meter.c | 8 |
3 files changed, 9 insertions, 6 deletions
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c index 40390ac01309..b6e7ddc09d76 100644 --- a/drivers/macintosh/macio_asic.c +++ b/drivers/macintosh/macio_asic.c | |||
@@ -526,7 +526,6 @@ static void macio_pci_add_devices(struct macio_chip *chip) | |||
526 | int macio_register_driver(struct macio_driver *drv) | 526 | int macio_register_driver(struct macio_driver *drv) |
527 | { | 527 | { |
528 | /* initialize common driver fields */ | 528 | /* initialize common driver fields */ |
529 | drv->driver.name = drv->name; | ||
530 | drv->driver.bus = &macio_bus_type; | 529 | drv->driver.bus = &macio_bus_type; |
531 | 530 | ||
532 | /* register with core */ | 531 | /* register with core */ |
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index 288acce76b74..2fd435bc542e 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c | |||
@@ -728,8 +728,10 @@ static struct of_device_id media_bay_match[] = | |||
728 | 728 | ||
729 | static struct macio_driver media_bay_driver = | 729 | static struct macio_driver media_bay_driver = |
730 | { | 730 | { |
731 | .name = "media-bay", | 731 | .driver = { |
732 | .match_table = media_bay_match, | 732 | .name = "media-bay", |
733 | .of_match_table = media_bay_match, | ||
734 | }, | ||
733 | .probe = media_bay_attach, | 735 | .probe = media_bay_attach, |
734 | .suspend = media_bay_suspend, | 736 | .suspend = media_bay_suspend, |
735 | .resume = media_bay_resume | 737 | .resume = media_bay_resume |
diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c index 12946c5f583f..53cce3a5da23 100644 --- a/drivers/macintosh/rack-meter.c +++ b/drivers/macintosh/rack-meter.c | |||
@@ -584,9 +584,11 @@ static struct of_device_id rackmeter_match[] = { | |||
584 | }; | 584 | }; |
585 | 585 | ||
586 | static struct macio_driver rackmeter_driver = { | 586 | static struct macio_driver rackmeter_driver = { |
587 | .name = "rackmeter", | 587 | .driver = { |
588 | .owner = THIS_MODULE, | 588 | .name = "rackmeter", |
589 | .match_table = rackmeter_match, | 589 | .owner = THIS_MODULE, |
590 | .of_match_table = rackmeter_match, | ||
591 | }, | ||
590 | .probe = rackmeter_probe, | 592 | .probe = rackmeter_probe, |
591 | .remove = __devexit_p(rackmeter_remove), | 593 | .remove = __devexit_p(rackmeter_remove), |
592 | .shutdown = rackmeter_shutdown, | 594 | .shutdown = rackmeter_shutdown, |