diff options
| author | Greg Kroah-Hartman | 2009-08-20 01:16:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-09-15 21:01:56 +0200 |
| commit | 0ccafb365803b3256aa75fd07bf9e5c6814a260d (patch) | |
| tree | d179aadcdfade939705c796771244d67941000ad /drivers/staging/hv/osd.h | |
| parent | Staging: hv: move osd.h (diff) | |
| download | kernel-qcow2-linux-0ccafb365803b3256aa75fd07bf9e5c6814a260d.tar.gz kernel-qcow2-linux-0ccafb365803b3256aa75fd07bf9e5c6814a260d.tar.xz kernel-qcow2-linux-0ccafb365803b3256aa75fd07bf9e5c6814a260d.zip | |
Staging: hv: osd.h: codingstyle cleanups
This fixes up the coding style issues in osd.h, with the exception of
the typedefs, they will be removed later.
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/osd.h')
| -rw-r--r-- | drivers/staging/hv/osd.h | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/drivers/staging/hv/osd.h b/drivers/staging/hv/osd.h index 949c273e576d..1723248db910 100644 --- a/drivers/staging/hv/osd.h +++ b/drivers/staging/hv/osd.h @@ -27,32 +27,28 @@ /* Defines */ +#define ALIGN_UP(value, align) (((value) & (align-1)) ? \ + (((value) + (align-1)) & ~(align-1)) : \ + (value)) +#define ALIGN_DOWN(value, align) ((value) & ~(align-1)) +#define NUM_PAGES_SPANNED(addr, len) ((ALIGN_UP(addr+len, PAGE_SIZE) - \ + ALIGN_DOWN(addr, PAGE_SIZE)) >> \ + PAGE_SHIFT) - - -#define ALIGN_UP(value, align) ( ((value) & (align-1))? ( ((value) + (align-1)) & ~(align-1) ): (value) ) -#define ALIGN_DOWN(value, align) ( (value) & ~(align-1) ) -#define NUM_PAGES_SPANNED(addr, len) ( (ALIGN_UP(addr+len, PAGE_SIZE) - ALIGN_DOWN(addr, PAGE_SIZE)) >> PAGE_SHIFT ) - -#define LOWORD(dw) ((unsigned short) (dw)) -#define HIWORD(dw) ((unsigned short) (((unsigned int) (dw) >> 16) & 0xFFFF)) +#define LOWORD(dw) ((unsigned short)(dw)) +#define HIWORD(dw) ((unsigned short)(((unsigned int) (dw) >> 16) & 0xFFFF)) typedef struct _DLIST_ENTRY { - struct _DLIST_ENTRY *Flink; - struct _DLIST_ENTRY *Blink; + struct _DLIST_ENTRY *Flink; + struct _DLIST_ENTRY *Blink; } DLIST_ENTRY; - -/* Other types */ - -/* typedef unsigned char GUID[16]; */ - typedef struct { - unsigned char Data[16]; + unsigned char Data[16]; } GUID; struct osd_waitevent { - int condition; + int condition; wait_queue_head_t event; }; @@ -61,15 +57,15 @@ struct osd_waitevent { extern void *osd_VirtualAllocExec(unsigned int size); extern void *osd_PageAlloc(unsigned int count); -extern void osd_PageFree(void* page, unsigned int count); +extern void osd_PageFree(void *page, unsigned int count); extern struct osd_waitevent *osd_WaitEventCreate(void); extern void osd_WaitEventSet(struct osd_waitevent *waitEvent); extern int osd_WaitEventWait(struct osd_waitevent *waitEvent); /* If >0, waitEvent got signaled. If ==0, timeout. If < 0, error */ -extern int osd_WaitEventWaitEx(struct osd_waitevent *waitEvent, u32 TimeoutInMs); - +extern int osd_WaitEventWaitEx(struct osd_waitevent *waitEvent, + u32 TimeoutInMs); int osd_schedule_callback(struct workqueue_struct *wq, void (*func)(void *), |