Merge branch 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (255 commits)
  [POWERPC] Remove dev_dbg redefinition in drivers/ps3/vuart.c
  [POWERPC] remove kernel module option for booke wdt
  [POWERPC] Avoid putting cpu node twice
  [POWERPC] Spinlock initializer cleanup
  [POWERPC] ppc4xx_sgdma needs dma-mapping.h
  [POWERPC] arch/powerpc/sysdev/timer.c build fix
  [POWERPC] get_property cleanups
  [POWERPC] Remove the unused HTDMSOUND driver
  [POWERPC] cell: cbe_cpufreq cleanup and crash fix
  [POWERPC] Declare enable_kernel_spe in a header
  [POWERPC] Add dt_xlate_addr() to bootwrapper
  [POWERPC] bootwrapper: CONFIG_ -> CONFIG_DEVICE_TREE
  [POWERPC] Don't define a custom bd_t for Xilixn Virtex based boards.
  [POWERPC] Add sane defaults for Xilinx EDK generated xparameters files
  [POWERPC] Add uartlite boot console driver for the zImage wrapper
  [POWERPC] Stop using ppc_sys for Xilinx Virtex boards
  [POWERPC] New registration for common Xilinx Virtex ppc405 platform devices
  [POWERPC] Merge common virtex header files
  [POWERPC] Rework Kconfig dependancies for Xilinx Virtex ppc405 platform
  [POWERPC] Clean up cpufreq Kconfig dependencies
  ...

1 files changed, 2 insertions, 98 deletions

diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index d56216067549..c96b7fe882a4 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -134,108 +134,12 @@ static int macio_device_resume(struct device * dev)
         return 0;
 }
 
-static int macio_uevent(struct device *dev, char **envp, int num_envp,
-                          char *buffer, int buffer_size)
-{
-        struct macio_dev * macio_dev;
-        struct of_device * of;
-        char *scratch;
-        const char *compat, *compat2;
-
-        int i = 0;
-        int length, cplen, cplen2, seen = 0;
-
-        if (!dev)
-                return -ENODEV;
-
-        macio_dev = to_macio_device(dev);
-        if (!macio_dev)
-                return -ENODEV;
-
-        of = &macio_dev->ofdev;
-
-        /* stuff we want to pass to /sbin/hotplug */
-        envp[i++] = scratch = buffer;
-        length = scnprintf (scratch, buffer_size, "OF_NAME=%s", of->node->name);
-        ++length;
-        buffer_size -= length;
-        if ((buffer_size <= 0) || (i >= num_envp))
-                return -ENOMEM;
-        scratch += length;
-
-        envp[i++] = scratch;
-        length = scnprintf (scratch, buffer_size, "OF_TYPE=%s", of->node->type);
-        ++length;
-        buffer_size -= length;
-        if ((buffer_size <= 0) || (i >= num_envp))
-                return -ENOMEM;
-        scratch += length;
-
-        /* Since the compatible field can contain pretty much anything
-         * it's not really legal to split it out with commas. We split it
-         * up using a number of environment variables instead. */
-
-        compat = get_property(of->node, "compatible", &cplen);
-        compat2 = compat;
-        cplen2= cplen;
-        while (compat && cplen > 0) {
-                envp[i++] = scratch;
-                length = scnprintf (scratch, buffer_size,
-                                     "OF_COMPATIBLE_%d=%s", seen, compat);
-                ++length;
-                buffer_size -= length;
-                if ((buffer_size <= 0) || (i >= num_envp))
-                        return -ENOMEM;
-                scratch += length;
-                length = strlen (compat) + 1;
-                compat += length;
-                cplen -= length;
-                seen++;
-        }
-
-        envp[i++] = scratch;
-        length = scnprintf (scratch, buffer_size, "OF_COMPATIBLE_N=%d", seen);
-        ++length;
-        buffer_size -= length;
-        if ((buffer_size <= 0) || (i >= num_envp))
-                return -ENOMEM;
-        scratch += length;
-
-        envp[i++] = scratch;
-        length = scnprintf (scratch, buffer_size, "MODALIAS=of:N%sT%s",
-                        of->node->name, of->node->type);
-        /* overwrite '\0' */
-        buffer_size -= length;
-        if ((buffer_size <= 0) || (i >= num_envp))
-                return -ENOMEM;
-        scratch += length;
-
-        if (!compat2) {
-                compat2 = "";
-                cplen2 = 1;
-        }
-        while (cplen2 > 0) {
-                length = snprintf (scratch, buffer_size, "C%s", compat2);
-                buffer_size -= length;
-                if (buffer_size <= 0)
-                        return -ENOMEM;
-                scratch += length;
-                length = strlen (compat2) + 1;
-                compat2 += length;
-                cplen2 -= length;
-        }
-
-        envp[i] = NULL;
-
-        return 0;
-}
-
 extern struct device_attribute macio_dev_attrs[];
 
 struct bus_type macio_bus_type = {
        .name    = "macio",
        .match   = macio_bus_match,
-       .uevent = macio_uevent,
+       .uevent = of_device_uevent,
        .probe   = macio_device_probe,
        .remove  = macio_device_remove,
        .shutdown = macio_device_shutdown,
@@ -491,7 +395,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
 #endif
                         MAX_NODE_NAME_SIZE, np->name);
         } else {
-                reg = get_property(np, "reg", NULL);
+                reg = of_get_property(np, "reg", NULL);
                 sprintf(dev->ofdev.dev.bus_id, "%1d.%08x:%.*s",
                         chip->lbus.index,
                         reg ? *reg : 0, MAX_NODE_NAME_SIZE, np->name);