From 35b6d1b4eeaf5f02a73b65f3357eb9eafbbb1963 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Tue, 4 Jul 2006 16:44:46 +1000 Subject: [PATCH] --- yaml --- r: 34027 b: refs/heads/master c: 980ffd3258dbcdb011e929de5d658ec81febba8d h: refs/heads/master i: 34025: c59da9c01faafa3d5358167c6657896fed2295a6 34023: 83bc51922ed5b5978b609cca0fa5d258d57f7b8c v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/of_device.c | 24 ------------------------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/[refs] b/[refs] index 90806506d627..4521f1df9d5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ed14c2177694ce086180eb9ca9ca4c6cd72c7ef +refs/heads/master: 980ffd3258dbcdb011e929de5d658ec81febba8d diff --git a/trunk/arch/powerpc/kernel/of_device.c b/trunk/arch/powerpc/kernel/of_device.c index 3262b73a3a68..397c83eda20e 100644 --- a/trunk/arch/powerpc/kernel/of_device.c +++ b/trunk/arch/powerpc/kernel/of_device.c @@ -189,27 +189,9 @@ void of_release_dev(struct device *dev) int of_device_register(struct of_device *ofdev) { int rc; - struct of_device **odprop; BUG_ON(ofdev->node == NULL); - odprop = (struct of_device **)get_property(ofdev->node, "linux,device", NULL); - if (!odprop) { - struct property *new_prop; - - new_prop = kmalloc(sizeof(struct property) + sizeof(struct of_device *), - GFP_KERNEL); - if (new_prop == NULL) - return -ENOMEM; - new_prop->name = "linux,device"; - new_prop->length = sizeof(sizeof(struct of_device *)); - new_prop->value = (unsigned char *)&new_prop[1]; - odprop = (struct of_device **)new_prop->value; - *odprop = NULL; - prom_add_property(ofdev->node, new_prop); - } - *odprop = ofdev; - rc = device_register(&ofdev->dev); if (rc) return rc; @@ -221,14 +203,8 @@ int of_device_register(struct of_device *ofdev) void of_device_unregister(struct of_device *ofdev) { - struct of_device **odprop; - device_remove_file(&ofdev->dev, &dev_attr_devspec); - odprop = (struct of_device **)get_property(ofdev->node, "linux,device", NULL); - if (odprop) - *odprop = NULL; - device_unregister(&ofdev->dev); }