[PATCH] powerpc/powernv Adapt opal-elog and opal-dump to new sysfs_remove_file_self API from (removed) sysfs_schedule_callback

[Stewart Smith]

A merge fix for powernv opal-dump and opal-elog code with driver-next

Signed-off-by: Stewart Smith <stew...@linux.vnet.ibm.com>
---
 arch/powerpc/platforms/powernv/opal-dump.c |    9 ++-------
 arch/powerpc/platforms/powernv/opal-elog.c |    9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/arch/powerpc/platforms/powernv/opal-dump.c 
b/arch/powerpc/platforms/powernv/opal-dump.c
index 0c767c5..b9827b0 100644
--- a/arch/powerpc/platforms/powernv/opal-dump.c
+++ b/arch/powerpc/platforms/powernv/opal-dump.c
@@ -86,19 +86,14 @@ static int64_t dump_send_ack(uint32_t dump_id)
        return rc;
 }
 
-static void delay_release_kobj(void *kobj)
-{
-       kobject_put((struct kobject *)kobj);
-}
-
 static ssize_t dump_ack_store(struct dump_obj *dump_obj,
                              struct dump_attribute *attr,
                              const char *buf,
                              size_t count)
 {
        dump_send_ack(dump_obj->id);
-       sysfs_schedule_callback(&dump_obj->kobj, delay_release_kobj,
-                               &dump_obj->kobj, THIS_MODULE);
+       sysfs_remove_file_self(&dump_obj->kobj, &attr->attr);
+       kobject_put(&dump_obj->kobj);
        return count;
 }
 
diff --git a/arch/powerpc/platforms/powernv/opal-elog.c 
b/arch/powerpc/platforms/powernv/opal-elog.c
index 1d7355b..ef7bc2a 100644
--- a/arch/powerpc/platforms/powernv/opal-elog.c
+++ b/arch/powerpc/platforms/powernv/opal-elog.c
@@ -70,19 +70,14 @@ static ssize_t elog_ack_show(struct elog_obj *elog_obj,
        return sprintf(buf, "ack - acknowledge log message\n");
 }
 
-static void delay_release_kobj(void *kobj)
-{
-       kobject_put((struct kobject *)kobj);
-}
-
 static ssize_t elog_ack_store(struct elog_obj *elog_obj,
                              struct elog_attribute *attr,
                              const char *buf,
                              size_t count)
 {
        opal_send_ack_elog(elog_obj->id);
-       sysfs_schedule_callback(&elog_obj->kobj, delay_release_kobj,
-                               &elog_obj->kobj, THIS_MODULE);
+       sysfs_remove_file_self(&elog_obj->kobj, &attr->attr);
+       kobject_put(&elog_obj->kobj);
        return count;
 }
 
-- 
1.7.10.4

_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev