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

Staging: dt3155: rename dt3155_config_s

Browse Source 
Drop the "_s", as it's not needed.

Now, dt3155.h is checkpatch.pl clean.

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:51:50 -07:00
parent 5019d2848c
commit 8b692e69c7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@ MA 02111-1307 USA
#endif #endif
/* Configuration structure */ /* Configuration structure */
struct dt3155_config_s { struct dt3155_config {
u32 acq_mode; u32 acq_mode;
u32 cols, rows; u32 cols, rows;
u32 continuous; u32 continuous;
@@ -116,7 +116,7 @@ struct dt3155_status {
u32 mem_addr; /* Buffer start addr for this card */ u32 mem_addr; /* Buffer start addr for this card */
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_s config; /* configuration struct */ struct dt3155_config config; /* configuration struct */
struct dt3155_fbuffer_s fbuffer; /* frame buffer state struct */ struct dt3155_fbuffer_s 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 */
@@ -134,7 +134,7 @@ extern struct dt3155_status dt3155_status[MAXBOARDS];
#define DT3155_IOC_MAGIC '!' #define DT3155_IOC_MAGIC '!'
#define DT3155_SET_CONFIG _IOW(DT3155_IOC_MAGIC, 1, struct dt3155_config_s) #define DT3155_SET_CONFIG _IOW(DT3155_IOC_MAGIC, 1, struct dt3155_config)
#define DT3155_GET_CONFIG _IOR(DT3155_IOC_MAGIC, 2, struct dt3155_status) #define DT3155_GET_CONFIG _IOR(DT3155_IOC_MAGIC, 2, struct dt3155_status)
#define DT3155_STOP _IO(DT3155_IOC_MAGIC, 3) #define DT3155_STOP _IO(DT3155_IOC_MAGIC, 3)
#define DT3155_START _IO(DT3155_IOC_MAGIC, 4) #define DT3155_START _IO(DT3155_IOC_MAGIC, 4)

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

@@ -546,7 +546,7 @@ static int dt3155_ioctl(struct inode *inode,
return -EBUSY; return -EBUSY;
{ {
struct dt3155_config_s tmp; struct dt3155_config tmp;
if (copy_from_user((void *)&tmp, (void *) arg, sizeof(tmp))) if (copy_from_user((void *)&tmp, (void *) arg, sizeof(tmp)))
return -EFAULT; return -EFAULT;
/* check for valid settings */ /* check for valid settings */