From 81ab8d82a2b1fabb81edfe0878489b483017821f Mon Sep 17 00:00:00 2001 From: SeongJae Park Date: Tue, 16 Oct 2012 16:47:50 +0900 Subject: [PATCH] --- yaml --- r: 337135 b: refs/heads/master c: cf174b0ef52ad8184779e1da4132e2d9d17247e5 h: refs/heads/master i: 337133: e8f03e64a3e929e4375026226d45242a07bb0618 337131: 5befc74980b06237521822e554a46dba7acc7c45 337127: 89ae6db961cc962e8a76a546d2fc49031e9b1087 337119: 069ba23ea9ce912f6d7c6270c14403f70126238e v: v3 --- [refs] | 2 +- .../staging/csr/csr_framework_ext_types.h | 33 +++++++++---------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index f20bc4422aea..94db53f32af7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f38ea7de4eb36dcb7eb05827d9ffb8a817b6563 +refs/heads/master: cf174b0ef52ad8184779e1da4132e2d9d17247e5 diff --git a/trunk/drivers/staging/csr/csr_framework_ext_types.h b/trunk/drivers/staging/csr/csr_framework_ext_types.h index 57194ee911ea..0d06d95d04f5 100644 --- a/trunk/drivers/staging/csr/csr_framework_ext_types.h +++ b/trunk/drivers/staging/csr/csr_framework_ext_types.h @@ -2,11 +2,11 @@ #define CSR_FRAMEWORK_EXT_TYPES_H__ /***************************************************************************** - (c) Cambridge Silicon Radio Limited 2010 - All rights reserved and confidential information of CSR + (c) Cambridge Silicon Radio Limited 2010 + All rights reserved and confidential information of CSR - Refer to LICENSE.txt included with this source for details - on the license terms. + Refer to LICENSE.txt included with this source for details + on the license terms. *****************************************************************************/ @@ -24,17 +24,15 @@ extern "C" { #ifdef __KERNEL__ -struct CsrThread -{ - struct task_struct *thread_task; - char name[16]; +struct CsrThread { + struct task_struct *thread_task; + char name[16]; }; -struct CsrEvent -{ - /* wait_queue for waking the kernel thread */ - wait_queue_head_t wakeup_q; - unsigned int wakeup_flag; +struct CsrEvent { + /* wait_queue for waking the kernel thread */ + wait_queue_head_t wakeup_q; + unsigned int wakeup_flag; }; typedef struct CsrEvent CsrEventHandle; @@ -43,11 +41,10 @@ typedef struct CsrThread CsrThreadHandle; #else /* __KERNEL __ */ -struct CsrEvent -{ - pthread_cond_t event; - pthread_mutex_t mutex; - u32 eventBits; +struct CsrEvent { + pthread_cond_t event; + pthread_mutex_t mutex; + u32 eventBits; }; typedef struct CsrEvent CsrEventHandle;