diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-27 16:51:50 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 11:35:41 -0700 |
| commit | 8b692e69c76592fd91ebfbb0e59faea3b6fda256 (patch) | |
| tree | 53356412bed89bc3c9c6f0bf3e90c44e6a384b5a /drivers/staging/dt3155 | |
| parent | 5019d2848c6773ee5815291e6d3fcc33d0f5345c (diff) | |
| download | op-kernel-dev-8b692e69c76592fd91ebfbb0e59faea3b6fda256.zip op-kernel-dev-8b692e69c76592fd91ebfbb0e59faea3b6fda256.tar.gz | |
Staging: dt3155: rename dt3155_config_s
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>
Diffstat (limited to 'drivers/staging/dt3155')
| -rw-r--r-- | drivers/staging/dt3155/dt3155.h | 6 | ||||
| -rw-r--r-- | drivers/staging/dt3155/dt3155_drv.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/dt3155/dt3155.h b/drivers/staging/dt3155/dt3155.h index 74a71f6..b99b527 100644 --- a/drivers/staging/dt3155/dt3155.h +++ b/drivers/staging/dt3155/dt3155.h @@ -60,7 +60,7 @@ MA 02111-1307 USA #endif /* Configuration structure */ -struct dt3155_config_s { +struct dt3155_config { u32 acq_mode; u32 cols, rows; u32 continuous; @@ -116,7 +116,7 @@ struct dt3155_status { u32 mem_addr; /* Buffer start addr for this card */ u32 mem_size; /* This is the amount of mem available */ 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 */ u32 state; /* this card's state */ 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_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_STOP _IO(DT3155_IOC_MAGIC, 3) #define DT3155_START _IO(DT3155_IOC_MAGIC, 4) diff --git a/drivers/staging/dt3155/dt3155_drv.c b/drivers/staging/dt3155/dt3155_drv.c index 3e8ceac..789d47a 100644 --- a/drivers/staging/dt3155/dt3155_drv.c +++ b/drivers/staging/dt3155/dt3155_drv.c @@ -546,7 +546,7 @@ static int dt3155_ioctl(struct inode *inode, return -EBUSY; { - struct dt3155_config_s tmp; + struct dt3155_config tmp; if (copy_from_user((void *)&tmp, (void *) arg, sizeof(tmp))) return -EFAULT; /* check for valid settings */ |
