Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/macio: Fix probing of macio devices by using the right of match table
  agp/uninorth: Fix oops caused by flushing too much
  powerpc/pasemi: Update MAINTAINERS file
  powerpc/cell: Fix integer constant warning
  powerpc/kprobes: Remove resume_execution() in kprobes
  powerpc/macio: Don't dereference pointer before null check

3 files changed, 13 insertions, 9 deletions

diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index 97147804a49c..b6e7ddc09d76 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -492,8 +492,8 @@ static void macio_pci_add_devices(struct macio_chip *chip)
         }
 
         /* Add media bay devices if any */
-        pnode = mbdev->ofdev.dev.of_node;
-        if (mbdev)
+        if (mbdev) {
+                pnode = mbdev->ofdev.dev.of_node;
                 for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) {
                         if (macio_skip_device(np))
                                 continue;
@@ -502,10 +502,11 @@ static void macio_pci_add_devices(struct macio_chip *chip)
                                                  mbdev,  root_res) == NULL)
                                 of_node_put(np);
                 }
+        }
 
         /* Add serial ports if any */
-        pnode = sdev->ofdev.dev.of_node;
         if (sdev) {
+                pnode = sdev->ofdev.dev.of_node;
                 for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) {
                         if (macio_skip_device(np))
                                 continue;
@@ -525,7 +526,6 @@ static void macio_pci_add_devices(struct macio_chip *chip)
 int macio_register_driver(struct macio_driver *drv)
 {
         /* initialize common driver fields */
-        drv->driver.name = drv->name;
         drv->driver.bus = &macio_bus_type;
 
         /* 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[] =
 
 static struct macio_driver media_bay_driver =
 {
-        .name           = "media-bay",
-        .match_table    = media_bay_match,
+        .driver = {
+                .name           = "media-bay",
+                .of_match_table = media_bay_match,
+        },
         .probe          = media_bay_attach,
         .suspend        = media_bay_suspend,
         .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[] = {
 };
 
 static struct macio_driver rackmeter_driver = {
-        .name = "rackmeter",
-        .owner = THIS_MODULE,
-        .match_table = rackmeter_match,
+        .driver = {
+                .name = "rackmeter",
+                .owner = THIS_MODULE,
+                .of_match_table = rackmeter_match,
+        },
         .probe = rackmeter_probe,
         .remove = __devexit_p(rackmeter_remove),
         .shutdown = rackmeter_shutdown,