diff options
Diffstat (limited to 'include/pcmcia/ss.h')
-rw-r--r-- | include/pcmcia/ss.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index e756069859b5..cfaccc224b50 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h | |||
@@ -134,7 +134,6 @@ struct pccard_operations { | |||
134 | 134 | ||
135 | struct pcmcia_socket { | 135 | struct pcmcia_socket { |
136 | struct module *owner; | 136 | struct module *owner; |
137 | spinlock_t lock; | ||
138 | socket_state_t socket; | 137 | socket_state_t socket; |
139 | u_int state; | 138 | u_int state; |
140 | u_int suspended_state; /* state before suspend */ | 139 | u_int suspended_state; /* state before suspend */ |
@@ -201,10 +200,12 @@ struct pcmcia_socket { | |||
201 | struct task_struct *thread; | 200 | struct task_struct *thread; |
202 | struct completion thread_done; | 201 | struct completion thread_done; |
203 | unsigned int thread_events; | 202 | unsigned int thread_events; |
204 | /* protects socket h/w state */ | 203 | |
204 | /* For the non-trivial interaction between these locks, | ||
205 | * see Documentation/pcmcia/locking.txt */ | ||
205 | struct mutex skt_mutex; | 206 | struct mutex skt_mutex; |
206 | /* protects PCMCIA state */ | ||
207 | struct mutex ops_mutex; | 207 | struct mutex ops_mutex; |
208 | |||
208 | /* protects thread_events */ | 209 | /* protects thread_events */ |
209 | spinlock_t thread_lock; | 210 | spinlock_t thread_lock; |
210 | 211 | ||