diff options
Diffstat (limited to 'drivers/isdn/gigaset/gigaset.h')
-rw-r--r-- | drivers/isdn/gigaset/gigaset.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h index 8303625d0401..92986a5d4055 100644 --- a/drivers/isdn/gigaset/gigaset.h +++ b/drivers/isdn/gigaset/gigaset.h | |||
@@ -307,7 +307,7 @@ struct inbuf_t { | |||
307 | struct bc_state *bcs; | 307 | struct bc_state *bcs; |
308 | struct cardstate *cs; | 308 | struct cardstate *cs; |
309 | int inputstate; | 309 | int inputstate; |
310 | atomic_t head, tail; | 310 | int head, tail; |
311 | unsigned char data[RBUFSIZE]; | 311 | unsigned char data[RBUFSIZE]; |
312 | }; | 312 | }; |
313 | 313 | ||
@@ -329,9 +329,9 @@ struct inbuf_t { | |||
329 | * are also filled with that value | 329 | * are also filled with that value |
330 | */ | 330 | */ |
331 | struct isowbuf_t { | 331 | struct isowbuf_t { |
332 | atomic_t read; | 332 | int read; |
333 | atomic_t nextread; | 333 | int nextread; |
334 | atomic_t write; | 334 | int write; |
335 | atomic_t writesem; | 335 | atomic_t writesem; |
336 | int wbits; | 336 | int wbits; |
337 | unsigned char data[BAS_OUTBUFSIZE + BAS_OUTBUFPAD]; | 337 | unsigned char data[BAS_OUTBUFSIZE + BAS_OUTBUFPAD]; |
@@ -441,8 +441,8 @@ struct cardstate { | |||
441 | /* Stuff to handle communication */ | 441 | /* Stuff to handle communication */ |
442 | wait_queue_head_t waitqueue; | 442 | wait_queue_head_t waitqueue; |
443 | int waiting; | 443 | int waiting; |
444 | atomic_t mode; /* see M_XXXX */ | 444 | int mode; /* see M_XXXX */ |
445 | atomic_t mstate; /* Modem state: see MS_XXXX */ | 445 | int mstate; /* Modem state: see MS_XXXX */ |
446 | /* only changed by the event layer */ | 446 | /* only changed by the event layer */ |
447 | int cmd_result; | 447 | int cmd_result; |
448 | 448 | ||
@@ -499,7 +499,7 @@ struct cardstate { | |||
499 | processed */ | 499 | processed */ |
500 | int curchannel; /* channel those commands are meant | 500 | int curchannel; /* channel those commands are meant |
501 | for */ | 501 | for */ |
502 | atomic_t commands_pending; /* flag(s) in xxx.commands_pending have | 502 | int commands_pending; /* flag(s) in xxx.commands_pending have |
503 | been set */ | 503 | been set */ |
504 | struct tasklet_struct event_tasklet; | 504 | struct tasklet_struct event_tasklet; |
505 | /* tasklet for serializing AT commands. | 505 | /* tasklet for serializing AT commands. |
@@ -555,7 +555,7 @@ struct cmdbuf_t { | |||
555 | 555 | ||
556 | struct bas_bc_state { | 556 | struct bas_bc_state { |
557 | /* isochronous output state */ | 557 | /* isochronous output state */ |
558 | atomic_t running; | 558 | int running; |
559 | atomic_t corrbytes; | 559 | atomic_t corrbytes; |
560 | spinlock_t isooutlock; | 560 | spinlock_t isooutlock; |
561 | struct isow_urbctx_t isoouturbs[BAS_OUTURBS]; | 561 | struct isow_urbctx_t isoouturbs[BAS_OUTURBS]; |