Commit:     c847c853a5c562bac940c544748525d038167275
Parent:     1f9ffc049d7a88c8489b883b6fc0a25185062002
Author:     Paul Mackerras <[EMAIL PROTECTED]>
AuthorDate: Sun Jan 27 11:45:30 2008 +1100
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Sun Jan 27 15:01:39 2008 -0800

    PPC: Fix powerpc vio_find_name to not use devices_subsys
    This fixes vio_find_name() in arch/powerpc/kernel/vio.c, which is
    currently broken because it tries to use devices_subsys.  That is bad
    for two reasons: (1) it's doing (or trying to do) a scan of all
    devices when it should only be scanning those on the vio bus, and
    (2) devices_subsys was an internal symbol of the device system code
    which was never meant for external use and has now gone away, and
    thus the kernel fails to compile on pSeries.
    The new version uses bus_find_device_by_name() on the vio bus
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
 arch/powerpc/kernel/vio.c |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 19a5656..f0bad70 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -37,8 +37,6 @@
 #include <asm/iseries/hv_call_xm.h>
 #include <asm/iseries/iommu.h>
-extern struct kset devices_subsys; /* needed for vio_find_name() */
 static struct bus_type vio_bus_type;
 static struct vio_dev vio_bus_device  = { /* fake "parent" device */
@@ -361,19 +359,16 @@ EXPORT_SYMBOL(vio_get_attribute);
 /* vio_find_name() - internal because only vio.c knows how we formatted the
  * kobject name
- * XXX once vio_bus_type.devices is actually used as a kset in
- * drivers/base/bus.c, this function should be removed in favor of
- * "device_find(kobj_name, &vio_bus_type)"
-static struct vio_dev *vio_find_name(const char *kobj_name)
+static struct vio_dev *vio_find_name(const char *name)
-       struct kobject *found;
+       struct device *found;
-       found = kset_find_obj(&devices_subsys, kobj_name);
+       found = bus_find_device_by_name(&vio_bus_type, NULL, name);
        if (!found)
                return NULL;
-       return to_vio_dev(container_of(found, struct device, kobj));
+       return to_vio_dev(found);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to