leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: dt3155: remove frame_info_t

Browse Source 
The typedef is 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>
This commit is contained in:
Greg Kroah-Hartman 2010-04-27 16:45:27 -07:00
parent ffefea4711
commit 7f76c52fb0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/dt3155/dt3155.h
View File

@ -68,11 +68,11 @@ struct dt3155_config_s {
/* hold data for each frame */ /* hold data for each frame */
typedef struct { struct frame_info {
u32 addr; /* address of the buffer with the frame */ u32 addr; /* address of the buffer with the frame */
u32 tag; /* unique number for the frame */ u32 tag; /* unique number for the frame */
struct timeval time; /* time that capture took place */ struct timeval time; /* time that capture took place */
} frame_info_t; };
/* /*
* Structure for interrupt and buffer handling. * Structure for interrupt and buffer handling.
@ -81,7 +81,7 @@ typedef struct {
struct dt3155_fbuffer_s { struct dt3155_fbuffer_s {
int nbuffers; int nbuffers;
frame_info_t frame_info[BOARD_MAX_BUFFS]; struct frame_info frame_info[BOARD_MAX_BUFFS];
int empty_buffers[BOARD_MAX_BUFFS]; /* indexes empty frames */ int empty_buffers[BOARD_MAX_BUFFS]; /* indexes empty frames */
int empty_len; /* Number of empty buffers */ int empty_len; /* Number of empty buffers */
@ -155,7 +155,7 @@ typedef struct dt3155_read_s {
u32 frame_seq; u32 frame_seq;
u32 state; u32 state;
frame_info_t frame_info; struct frame_info frame_info;
} dt3155_read_t; } dt3155_read_t;
#endif /* _DT3155_inc */ #endif /* _DT3155_inc */

8
drivers/staging/dt3155/dt3155_drv.c
View File

@ -757,7 +757,7 @@ static ssize_t dt3155_read(struct file *filep, char __user *buf,
int minor = MINOR(filep->f_dentry->d_inode->i_rdev); int minor = MINOR(filep->f_dentry->d_inode->i_rdev);
u32 offset; u32 offset;
int frame_index; int frame_index;
frame_info_t *frame_info_p; struct frame_info *frame_info;
/* TODO: this should check the error flag and */ /* TODO: this should check the error flag and */
/* return an error on hardware failures */ /* return an error on hardware failures */
@ -807,10 +807,10 @@ static ssize_t dt3155_read(struct file *filep, char __user *buf,
} }
} }
frame_info_p = &dt3155_status[minor].fbuffer.frame_info[frame_index]; frame_info = &dt3155_status[minor].fbuffer.frame_info[frame_index];
/* make this an offset */ /* make this an offset */
offset = frame_info_p->addr - dt3155_status[minor].mem_addr; offset = frame_info->addr - dt3155_status[minor].mem_addr;
put_user(offset, (unsigned int *) buf); put_user(offset, (unsigned int *) buf);
buf += sizeof(u32); buf += sizeof(u32);
@ -818,7 +818,7 @@ static ssize_t dt3155_read(struct file *filep, char __user *buf,
buf += sizeof(u32); buf += sizeof(u32);
put_user(dt3155_status[minor].state, (unsigned int *) buf); put_user(dt3155_status[minor].state, (unsigned int *) buf);
buf += sizeof(u32); buf += sizeof(u32);
if (copy_to_user(buf, frame_info_p, sizeof(frame_info_t))) if (copy_to_user(buf, frame_info, sizeof(*frame_info)))
return -EFAULT; return -EFAULT;
return sizeof(dt3155_read_t); return sizeof(dt3155_read_t);