diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-27 16:53:59 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 11:35:41 -0700 |
| commit | e802b4b79d2b25c47736c135a709b6c31e95fc39 (patch) | |
| tree | 3a30ff0ece35fca30af767a71c6ee691f935f8f4 /drivers | |
| parent | 8b692e69c76592fd91ebfbb0e59faea3b6fda256 (diff) | |
Staging: dt3155: rename dt3155_fbuffer_s
drop the "_s" as it's not needed.
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Scott Smedley <ss@aao.gov.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/dt3155/dt3155.h | 4 | ||||
| -rw-r--r-- | drivers/staging/dt3155/dt3155_isr.c | 4 | ||||
| -rw-r--r-- | drivers/staging/dt3155/dt3155_isr.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/dt3155/dt3155.h b/drivers/staging/dt3155/dt3155.h index b99b5271d15..793e2fcf446 100644 --- a/drivers/staging/dt3155/dt3155.h +++ b/drivers/staging/dt3155/dt3155.h @@ -78,7 +78,7 @@ struct frame_info { * Structure for interrupt and buffer handling. * This is the setup for 1 card */ -struct dt3155_fbuffer_s { +struct dt3155_fbuffer { int nbuffers; struct frame_info frame_info[BOARD_MAX_BUFFS]; @@ -117,7 +117,7 @@ struct dt3155_status { u32 mem_size; /* This is the amount of mem available */ u32 irq; /* this card's irq */ struct dt3155_config config; /* configuration struct */ - struct dt3155_fbuffer_s fbuffer; /* frame buffer state struct */ + struct dt3155_fbuffer fbuffer; /* frame buffer state struct */ u32 state; /* this card's state */ u32 device_installed; /* Flag if installed. 1=installed */ }; diff --git a/drivers/staging/dt3155/dt3155_isr.c b/drivers/staging/dt3155/dt3155_isr.c index 1ebcec0c309..61f74b6a70f 100644 --- a/drivers/staging/dt3155/dt3155_isr.c +++ b/drivers/staging/dt3155/dt3155_isr.c @@ -60,7 +60,7 @@ Purpose: Buffer management routines, and other routines for the ISR /* Pointer into global structure for handling buffers */ -struct dt3155_fbuffer_s *dt3155_fbuffer[MAXBOARDS] = {NULL +struct dt3155_fbuffer *dt3155_fbuffer[MAXBOARDS] = {NULL #if MAXBOARDS == 2 , NULL #endif @@ -317,7 +317,7 @@ u32 dt3155_setup_buffers(u32 *allocatorAddr) /* Make sure the buffering variables are consistent */ { u8 *ptr = (u8 *) dt3155_fbuffer[m]; - for (index = 0; index < sizeof(struct dt3155_fbuffer_s); index++) + for (index = 0; index < sizeof(struct dt3155_fbuffer); index++) *(ptr++) = 0; } } diff --git a/drivers/staging/dt3155/dt3155_isr.h b/drivers/staging/dt3155/dt3155_isr.h index 7595cb16c98..7d474cf743d 100644 --- a/drivers/staging/dt3155/dt3155_isr.h +++ b/drivers/staging/dt3155/dt3155_isr.h @@ -36,7 +36,7 @@ MA 02111-1307 USA #ifndef DT3155_ISR_H #define DT3155_ISR_H -extern struct dt3155_fbuffer_s *dt3155_fbuffer[MAXBOARDS]; +extern struct dt3155_fbuffer *dt3155_fbuffer[MAXBOARDS]; /* User functions for buffering */ /* Initialize the buffering system. This should */ |