lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: hv: osd.c: coding style fixes

Browse Source 
Codingstyle fixes for osd.c

Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman
2009-08-19 16:19:23 -07:00
parent daaa8cc31f
commit 93b5c9e17a
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/staging/hv/osd.c
View File

@@ -37,18 +37,10 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/io.h>
#include <asm/io.h> #include <linux/bitops.h>
#include <asm/bitops.h>
#include <asm/kmap_types.h>
#include <asm/atomic.h>
#include "osd.h" #include "osd.h"
/* Data types */
struct osd_callback_struct { struct osd_callback_struct {
struct work_struct work; struct work_struct work;
void (*callback)(void *); void (*callback)(void *);
@@ -60,15 +52,18 @@ void *osd_VirtualAllocExec(unsigned int size)
#ifdef __x86_64__ #ifdef __x86_64__
return __vmalloc(size, GFP_KERNEL, PAGE_KERNEL_EXEC); return __vmalloc(size, GFP_KERNEL, PAGE_KERNEL_EXEC);
#else #else
return __vmalloc(size, GFP_KERNEL, __pgprot(__PAGE_KERNEL & (~_PAGE_NX))); return __vmalloc(size, GFP_KERNEL,
__pgprot(__PAGE_KERNEL & (~_PAGE_NX)));
#endif #endif
} }
void *osd_PageAlloc(unsigned int count) void *osd_PageAlloc(unsigned int count)
{ {
void *p; void *p;
p = (void *)__get_free_pages(GFP_KERNEL, get_order(count * PAGE_SIZE)); p = (void *)__get_free_pages(GFP_KERNEL, get_order(count * PAGE_SIZE));
if (p) memset(p, 0, count * PAGE_SIZE); if (p)
memset(p, 0, count * PAGE_SIZE);
return p; return p;
/* struct page* page = alloc_page(GFP_KERNEL|__GFP_ZERO); */ /* struct page* page = alloc_page(GFP_KERNEL|__GFP_ZERO); */
@@ -81,7 +76,7 @@ void *osd_PageAlloc(unsigned int count)
} }
EXPORT_SYMBOL_GPL(osd_PageAlloc); EXPORT_SYMBOL_GPL(osd_PageAlloc);
void osd_PageFree(void* page, unsigned int count) void osd_PageFree(void *page, unsigned int count)
{ {
free_pages((unsigned long)page, get_order(count * PAGE_SIZE)); free_pages((unsigned long)page, get_order(count * PAGE_SIZE));
/*struct page* p = virt_to_page(page); /*struct page* p = virt_to_page(page);
@@ -91,11 +86,10 @@ EXPORT_SYMBOL_GPL(osd_PageFree);
struct osd_waitevent *osd_WaitEventCreate(void) struct osd_waitevent *osd_WaitEventCreate(void)
{ {
struct osd_waitevent *wait = kmalloc(sizeof(struct osd_waitevent), GFP_KERNEL); struct osd_waitevent *wait = kmalloc(sizeof(struct osd_waitevent),
GFP_KERNEL);
if (!wait) if (!wait)
{
return NULL; return NULL;
}
wait->condition = 0; wait->condition = 0;
init_waitqueue_head(&wait->event); init_waitqueue_head(&wait->event);
@@ -112,7 +106,7 @@ EXPORT_SYMBOL_GPL(osd_WaitEventSet);
int osd_WaitEventWait(struct osd_waitevent *waitEvent) int osd_WaitEventWait(struct osd_waitevent *waitEvent)
{ {
int ret=0; int ret = 0;
ret = wait_event_interruptible(waitEvent->event, ret = wait_event_interruptible(waitEvent->event,
waitEvent->condition); waitEvent->condition);
@@ -123,7 +117,7 @@ EXPORT_SYMBOL_GPL(osd_WaitEventWait);
int osd_WaitEventWaitEx(struct osd_waitevent *waitEvent, u32 TimeoutInMs) int osd_WaitEventWaitEx(struct osd_waitevent *waitEvent, u32 TimeoutInMs)
{ {
int ret=0; int ret = 0;
ret = wait_event_interruptible_timeout(waitEvent->event, ret = wait_event_interruptible_timeout(waitEvent->event,
waitEvent->condition, waitEvent->condition,
@@ -136,10 +130,9 @@ EXPORT_SYMBOL_GPL(osd_WaitEventWaitEx);
static void osd_callback_work(struct work_struct *work) static void osd_callback_work(struct work_struct *work)
{ {
struct osd_callback_struct *cb = container_of(work, struct osd_callback_struct *cb = container_of(work,
struct osd_callback_struct, struct osd_callback_struct,
work); work);
(cb->callback)(cb->data); (cb->callback)(cb->data);
kfree(cb); kfree(cb);
} }
@@ -150,9 +143,8 @@ int osd_schedule_callback(struct workqueue_struct *wq,
struct osd_callback_struct *cb; struct osd_callback_struct *cb;
cb = kmalloc(sizeof(*cb), GFP_KERNEL); cb = kmalloc(sizeof(*cb), GFP_KERNEL);
if (!cb) if (!cb) {
{ printk(KERN_ERR "unable to allocate memory in osd_schedule_callback\n");
printk(KERN_ERR "unable to allocate memory in osd_schedule_callback");
return -1; return -1;
} }