lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: dt3155: remove dt3155_status_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:47:55 -07:00
parent 7f76c52fb0
commit 923c1244fc
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,7 @@ struct dt3155_fbuffer_s {
#define DT3155_ACQ 2
/* There is one status structure for each card. */
typedef struct dt3155_status_s {
struct dt3155_status {
int fixed_mode; /* if 1, we are in fixed frame mode */
u32 reg_addr; /* Register address for a single card */
u32 mem_addr; /* Buffer start addr for this card */
@@ -120,10 +120,10 @@ typedef struct dt3155_status_s {
struct dt3155_fbuffer_s fbuffer; /* frame buffer state struct */
u32 state; /* this card's state */
u32 device_installed; /* Flag if installed. 1=installed */
} dt3155_status_t;
};
/* Reference to global status structure */
extern struct dt3155_status_s dt3155_status[MAXBOARDS];
extern struct dt3155_status dt3155_status[MAXBOARDS];
#define DT3155_STATE_IDLE 0x00
#define DT3155_STATE_FRAME 0x01
@@ -135,7 +135,7 @@ extern struct dt3155_status_s dt3155_status[MAXBOARDS];
#define DT3155_IOC_MAGIC '!'
#define DT3155_SET_CONFIG _IOW(DT3155_IOC_MAGIC, 1, struct dt3155_config_s)
#define DT3155_GET_CONFIG _IOR(DT3155_IOC_MAGIC, 2, struct dt3155_status_s)
#define DT3155_GET_CONFIG _IOR(DT3155_IOC_MAGIC, 2, struct dt3155_status)
#define DT3155_STOP _IO(DT3155_IOC_MAGIC, 3)
#define DT3155_START _IO(DT3155_IOC_MAGIC, 4)
#define DT3155_FLUSH _IO(DT3155_IOC_MAGIC, 5)

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

@@ -112,7 +112,7 @@ int dt3155_major = 0;
/* Global structures and variables */
/* Status of each device */
struct dt3155_status_s dt3155_status[MAXBOARDS];
struct dt3155_status dt3155_status[MAXBOARDS];
/* kernel logical address of the board */
u8 *dt3155_lbase[MAXBOARDS] = { NULL
@@ -566,7 +566,7 @@ static int dt3155_ioctl(struct inode *inode,
case DT3155_GET_CONFIG:
{
if (copy_to_user((void *) arg, (void *) &dt3155_status[minor],
sizeof(dt3155_status_t)))
sizeof(struct dt3155_status)))
return -EFAULT;
return 0;
}
@@ -587,7 +587,7 @@ static int dt3155_ioctl(struct inode *inode,
quick_stop(minor);
if (copy_to_user((void *) arg, (void *) &dt3155_status[minor],
sizeof(dt3155_status_t)))
sizeof(struct dt3155_status)))
return -EFAULT;
return 0;
}
@@ -611,7 +611,7 @@ static int dt3155_ioctl(struct inode *inode,
dt3155_init_isr(minor);
if (copy_to_user((void *) arg, (void *) &dt3155_status[minor],
sizeof(dt3155_status_t)))
sizeof(struct dt3155_status)))
return -EFAULT;
return 0;
}