Commit 93b5c9e1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: hv: osd.c: coding style fixes 



Codingstyle fixes for osd.c

Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent daaa8cc3

drivers/staging/hv/osd.c

+16 −24
Original line number Diff line number Diff line
@@ -37,18 +37,10 @@ 
#include <linux/jiffies.h>

#include <linux/delay.h>

#include <linux/time.h>



#include <asm/io.h>

#include <asm/bitops.h>

#include <asm/kmap_types.h>

#include <asm/atomic.h>



#include <linux/io.h>

#include <linux/bitops.h>

#include "osd.h"





/* Data types */





struct osd_callback_struct {

	struct work_struct work;

	void (*callback)(void *);
@@ -60,15 +52,18 @@ void *osd_VirtualAllocExec(unsigned int size) 
#ifdef __x86_64__

	return __vmalloc(size, GFP_KERNEL, PAGE_KERNEL_EXEC);

#else

	return __vmalloc(size, GFP_KERNEL, __pgprot(__PAGE_KERNEL & (~_PAGE_NX)));

	return __vmalloc(size, GFP_KERNEL,

			 __pgprot(__PAGE_KERNEL & (~_PAGE_NX)));

#endif

}



void *osd_PageAlloc(unsigned int count)

{

	void *p;



	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;



	/* struct page* page = alloc_page(GFP_KERNEL|__GFP_ZERO); */
@@ -91,11 +86,10 @@ EXPORT_SYMBOL_GPL(osd_PageFree); 


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)

	{

		return NULL;

	}



	wait->condition = 0;

	init_waitqueue_head(&wait->event);
@@ -139,7 +133,6 @@ static void osd_callback_work(struct work_struct *work) 
						struct osd_callback_struct,

						work);

	(cb->callback)(cb->data);



	kfree(cb);

}
@@ -150,9 +143,8 @@ int osd_schedule_callback(struct workqueue_struct *wq, 
	struct osd_callback_struct *cb;



	cb = kmalloc(sizeof(*cb), GFP_KERNEL);

	if (!cb)

	{

		printk(KERN_ERR "unable to allocate memory in osd_schedule_callback");

	if (!cb) {

		printk(KERN_ERR "unable to allocate memory in osd_schedule_callback\n");

		return -1;

	}