Commit e802b4b7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8b692e69
...@@ -78,7 +78,7 @@ struct frame_info { ...@@ -78,7 +78,7 @@ struct frame_info {
* Structure for interrupt and buffer handling. * Structure for interrupt and buffer handling.
* This is the setup for 1 card * This is the setup for 1 card
*/ */
struct dt3155_fbuffer_s { struct dt3155_fbuffer {
int nbuffers; int nbuffers;
struct frame_info frame_info[BOARD_MAX_BUFFS]; struct frame_info frame_info[BOARD_MAX_BUFFS];
...@@ -117,7 +117,7 @@ struct dt3155_status { ...@@ -117,7 +117,7 @@ struct dt3155_status {
u32 mem_size; /* This is the amount of mem available */ u32 mem_size; /* This is the amount of mem available */
u32 irq; /* this card's irq */ u32 irq; /* this card's irq */
struct dt3155_config config; /* configuration struct */ 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 state; /* this card's state */
u32 device_installed; /* Flag if installed. 1=installed */ u32 device_installed; /* Flag if installed. 1=installed */
}; };
......
...@@ -60,7 +60,7 @@ Purpose: Buffer management routines, and other routines for the ISR ...@@ -60,7 +60,7 @@ Purpose: Buffer management routines, and other routines for the ISR
/* Pointer into global structure for handling buffers */ /* 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 #if MAXBOARDS == 2
, NULL , NULL
#endif #endif
...@@ -317,7 +317,7 @@ u32 dt3155_setup_buffers(u32 *allocatorAddr) ...@@ -317,7 +317,7 @@ u32 dt3155_setup_buffers(u32 *allocatorAddr)
/* Make sure the buffering variables are consistent */ /* Make sure the buffering variables are consistent */
{ {
u8 *ptr = (u8 *) dt3155_fbuffer[m]; 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; *(ptr++) = 0;
} }
} }
......
...@@ -36,7 +36,7 @@ MA 02111-1307 USA ...@@ -36,7 +36,7 @@ MA 02111-1307 USA
#ifndef DT3155_ISR_H #ifndef DT3155_ISR_H
#define 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 */ /* User functions for buffering */
/* Initialize the buffering system. This should */ /* Initialize the buffering system. This should */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment