{
        unsigned nl = be16_to_cpu(ev->event_name_len);
        __be16 *desc_len = (__be16 *)(ev->remainder + nl - 2);
+
        *len = be16_to_cpu(*desc_len) - 2;
        return (char *)ev->remainder + nl;
 }
        __be16 *desc_len_ = (__be16 *)(ev->remainder + nl - 2);
        unsigned desc_len = be16_to_cpu(*desc_len_);
        __be16 *long_desc_len = (__be16 *)(ev->remainder + nl + desc_len - 2);
+
        *len = be16_to_cpu(*long_desc_len) - 2;
        return (char *)ev->remainder + nl + desc_len;
 }
                                              unsigned long index)
 {
        pr_devel("h_get_24x7_catalog_page(0x%lx, %lu, %lu)",
-                       phys_4096,
-                       version,
-                       index);
+                       phys_4096, version, index);
+
        WARN_ON(!IS_ALIGNED(phys_4096, 4096));
+
        return plpar_hcall_norets(H_GET_24X7_CATALOG_PAGE,
-                       phys_4096,
-                       version,
-                       index);
+                       phys_4096, version, index);
 }
 
 static unsigned long h_get_24x7_catalog_page(char page[],
        struct dev_ext_attribute *d;
 
        d = container_of(attr, struct dev_ext_attribute, attr);
+
        return sprintf(buf, "%s\n", (char *)d->var);
 }
 
        attr->attr.attr.name = name;
        attr->attr.attr.mode = 0444;
        attr->attr.show = device_show_string;
+
        return &attr->attr.attr;
 }
 
                a_ev_name = kasprintf(GFP_KERNEL, "%.*s%s__%d",
                                (int)event_name_len, ev_name, ev_suffix, nonce);
 
-
        if (!a_ev_name)
                goto out_val;
 
        uint64_t catalog_version_num = 0;
        void *page = kmem_cache_alloc(hv_page_cache, GFP_USER);
        struct hv_24x7_catalog_page_0 *page_0 = page;
+
        if (!page)
                return -ENOMEM;
 
        }
 
        resb = &result_buffer->results[0];
-
        *count = be64_to_cpu(resb->elements[0].element_data[0]);
 out:
        return ret;
 {
        s64 prev;
        u64 now;
+
        now = h_24x7_get_value(event);
        prev = local64_xchg(&event->hw.prev_count, now);
        local64_add(now - prev, &event->count);