leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/perf/hv-24x7: Whitespace cleanup

Browse Source 
Fix minor whitespace damages.

Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Sukadev Bhattiprolu 2015-03-30 18:53:45 -07:00 committed by Michael Ellerman
parent e3ee15dc5d
commit 3ca4ea71cb
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/powerpc/perf/hv-24x7.c
View File

@ -161,6 +161,7 @@ static char *event_desc(struct hv_24x7_event_data *ev, int *len)
{ {
unsigned nl = be16_to_cpu(ev->event_name_len); unsigned nl = be16_to_cpu(ev->event_name_len);
__be16 *desc_len = (__be16 *)(ev->remainder + nl - 2); __be16 *desc_len = (__be16 *)(ev->remainder + nl - 2);
*len = be16_to_cpu(*desc_len) - 2; *len = be16_to_cpu(*desc_len) - 2;
return (char *)ev->remainder + nl; return (char *)ev->remainder + nl;
} }
@ -171,6 +172,7 @@ static char *event_long_desc(struct hv_24x7_event_data *ev, int *len)
__be16 *desc_len_ = (__be16 *)(ev->remainder + nl - 2); __be16 *desc_len_ = (__be16 *)(ev->remainder + nl - 2);
unsigned desc_len = be16_to_cpu(*desc_len_); unsigned desc_len = be16_to_cpu(*desc_len_);
__be16 *long_desc_len = (__be16 *)(ev->remainder + nl + desc_len - 2); __be16 *long_desc_len = (__be16 *)(ev->remainder + nl + desc_len - 2);
*len = be16_to_cpu(*long_desc_len) - 2; *len = be16_to_cpu(*long_desc_len) - 2;
return (char *)ev->remainder + nl + desc_len; return (char *)ev->remainder + nl + desc_len;
} }
@ -248,14 +250,12 @@ static unsigned long h_get_24x7_catalog_page_(unsigned long phys_4096,
unsigned long index) unsigned long index)
{ {
pr_devel("h_get_24x7_catalog_page(0x%lx, %lu, %lu)", pr_devel("h_get_24x7_catalog_page(0x%lx, %lu, %lu)",
phys_4096, phys_4096, version, index);
version,
index);
WARN_ON(!IS_ALIGNED(phys_4096, 4096)); WARN_ON(!IS_ALIGNED(phys_4096, 4096));
return plpar_hcall_norets(H_GET_24X7_CATALOG_PAGE, return plpar_hcall_norets(H_GET_24X7_CATALOG_PAGE,
phys_4096, phys_4096, version, index);
version,
index);
} }
static unsigned long h_get_24x7_catalog_page(char page[], static unsigned long h_get_24x7_catalog_page(char page[],
@ -309,6 +309,7 @@ static ssize_t device_show_string(struct device *dev,
struct dev_ext_attribute *d; struct dev_ext_attribute *d;
d = container_of(attr, struct dev_ext_attribute, attr); d = container_of(attr, struct dev_ext_attribute, attr);
return sprintf(buf, "%s\n", (char *)d->var); return sprintf(buf, "%s\n", (char *)d->var);
} }
@ -323,6 +324,7 @@ static struct attribute *device_str_attr_create_(char *name, char *str)
attr->attr.attr.name = name; attr->attr.attr.name = name;
attr->attr.attr.mode = 0444; attr->attr.attr.mode = 0444;
attr->attr.show = device_show_string; attr->attr.show = device_show_string;
return &attr->attr.attr; return &attr->attr.attr;
} }
@ -396,7 +398,6 @@ static struct attribute *event_to_attr(unsigned ix,
a_ev_name = kasprintf(GFP_KERNEL, "%.*s%s__%d", a_ev_name = kasprintf(GFP_KERNEL, "%.*s%s__%d",
(int)event_name_len, ev_name, ev_suffix, nonce); (int)event_name_len, ev_name, ev_suffix, nonce);
if (!a_ev_name) if (!a_ev_name)
goto out_val; goto out_val;
@ -881,6 +882,7 @@ static ssize_t catalog_read(struct file *filp, struct kobject *kobj,
uint64_t catalog_version_num = 0; uint64_t catalog_version_num = 0;
void *page = kmem_cache_alloc(hv_page_cache, GFP_USER); void *page = kmem_cache_alloc(hv_page_cache, GFP_USER);
struct hv_24x7_catalog_page_0 *page_0 = page; struct hv_24x7_catalog_page_0 *page_0 = page;
if (!page) if (!page)
return -ENOMEM; return -ENOMEM;
@ -1077,7 +1079,6 @@ static unsigned long single_24x7_request(struct perf_event *event, u64 *count)
} }
resb = &result_buffer->results[0]; resb = &result_buffer->results[0];
*count = be64_to_cpu(resb->elements[0].element_data[0]); *count = be64_to_cpu(resb->elements[0].element_data[0]);
out: out:
return ret; return ret;
@ -1175,6 +1176,7 @@ static void h_24x7_event_read(struct perf_event *event)
{ {
s64 prev; s64 prev;
u64 now; u64 now;
now = h_24x7_get_value(event); now = h_24x7_get_value(event);
prev = local64_xchg(&event->hw.prev_count, now); prev = local64_xchg(&event->hw.prev_count, now);
local64_add(now - prev, &event->count); local64_add(now - prev, &event->count);