We don't need to go to the labal of out when of_property_read_u64_array
fails, as there is nothing to do. Just return.
And we can remove the redundant assignments to attr and name.

Signed-off-by: Qiujun Huang <hqjag...@gmail.com>
Reviewed-by: Oliver O'Halloran <ooh...@gmail.com>
---
 arch/powerpc/platforms/powernv/opal.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/platforms/powernv/opal.c 
b/arch/powerpc/platforms/powernv/opal.c
index 2b3dfd0b6cdd..71af1cbc6334 100644
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -801,14 +801,14 @@ static ssize_t export_attr_read(struct file *fp, struct 
kobject *kobj,
 static int opal_add_one_export(struct kobject *parent, const char *export_name,
                               struct device_node *np, const char *prop_name)
 {
-       struct bin_attribute *attr = NULL;
-       const char *name = NULL;
+       struct bin_attribute *attr;
+       const char *name;
        u64 vals[2];
        int rc;
 
        rc = of_property_read_u64_array(np, prop_name, &vals[0], 2);
        if (rc)
-               goto out;
+               return rc;
 
        attr = kzalloc(sizeof(*attr), GFP_KERNEL);
        name = kstrdup(export_name, GFP_KERNEL);
-- 
2.17.1

Reply via email to