aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2010-12-08 10:57:30 +0000
committerAlan Cox <alan@linux.intel.com>2010-12-08 10:57:30 +0000
commit554dcfc13529cafedfb1adb1e99892ae2da4c6ce (patch)
tree85c2ee46f9d2ccebee48e12849daf2f9d3d73fe6
parent996d5d22b14f68f8e0fb521140788338fad76341 (diff)
downloadmrst-s0i3-test-554dcfc13529cafedfb1adb1e99892ae2da4c6ce.tar.gz
mrst-s0i3-test-554dcfc13529cafedfb1adb1e99892ae2da4c6ce.tar.xz
mrst-s0i3-test-554dcfc13529cafedfb1adb1e99892ae2da4c6ce.zip
sep: Clean up the ioctls a bit more
Remove the weird _stru _struc bits Rename all the unused fields as unused Signed-off-by: Alan Cox <alan@linux.intel.com>
-rw-r--r--drivers/staging/sep/sep_driver.c26
-rw-r--r--drivers/staging/sep/sep_driver_api.h50
2 files changed, 38 insertions, 38 deletions
diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
index 22cee0a7b1f..01fea026908 100644
--- a/drivers/staging/sep/sep_driver.c
+++ b/drivers/staging/sep/sep_driver.c
@@ -1025,7 +1025,7 @@ static int sep_init_caller_id(struct sep_device *sep)
* inserts the data into the caller id table
* note that this function does fall under the ioctl lock
* @sep: sep device
- * @arg: pointer to struct caller_id_stru
+ * @arg: pointer to struct caller_id_struct
*/
static int sep_set_caller_id_handler(struct sep_device *sep, u32 arg)
{
@@ -1036,7 +1036,7 @@ static int sep_set_caller_id_handler(struct sep_device *sep, u32 arg)
int i;
/* command arguments */
- struct caller_id_stru command_args;
+ struct caller_id_struct command_args;
dev_dbg(&sep->pdev->dev,
"sep_set_caller_id_handler start\n");
@@ -2853,7 +2853,7 @@ end_function:
* Note that all bus addresses that are passed to the sep
* are in 32 bit format; the SEP is a 32 bit device
* @sep: pointer to struct sep_device
- * @arg: pointer to struct bld_syn_tab_struc
+ * @arg: pointer to struct bld_syn_tab_struct
*/
static int sep_create_sync_dma_tables_handler(struct sep_device *sep,
unsigned long arg)
@@ -2861,13 +2861,13 @@ static int sep_create_sync_dma_tables_handler(struct sep_device *sep,
int error = 0;
/* command arguments */
- struct bld_syn_tab_struc command_args;
+ struct bld_syn_tab_struct command_args;
dev_dbg(&sep->pdev->dev,
"sep_create_sync_dma_tables_handler start\n");
error = copy_from_user(&command_args, (void __user *)arg,
- sizeof(struct bld_syn_tab_struc));
+ sizeof(struct bld_syn_tab_struct));
if (error) {
dev_warn(&sep->pdev->dev, "create dma tables;"
" copy_from_user fails\n");
@@ -2979,7 +2979,7 @@ static int sep_get_static_pool_addr_handler(struct sep_device *sep,
unsigned long arg)
{
int error = 0;
- struct stat_pool_addr_struc command_args;
+ struct stat_pool_addr_struct command_args;
u32 *static_pool_addr = 0;
@@ -3001,7 +3001,7 @@ static int sep_get_static_pool_addr_handler(struct sep_device *sep,
/* send the parameters to user application */
error = copy_to_user((void *) arg, &command_args,
- sizeof(struct stat_pool_addr_struc));
+ sizeof(struct stat_pool_addr_struct));
dev_dbg(&sep->pdev->dev, "sep_get_static_pool_addr_handler end\n");
@@ -3072,7 +3072,7 @@ static int sep_init_handler(struct sep_device *sep, unsigned long arg)
int error = 0;
u32 reg_val;
dma_addr_t new_base_addr;
- struct init_stru command_args;
+ struct init_struct command_args;
dev_dbg(&sep->pdev->dev, "sep_init_handler start\n");
error = 0;
@@ -3097,7 +3097,7 @@ static int sep_init_handler(struct sep_device *sep, unsigned long arg)
/* copy in the parameters */
error = copy_from_user(&command_args, (void __user *) arg,
- sizeof(struct init_stru));
+ sizeof(struct init_struct));
if (error) {
dev_warn(&sep->pdev->dev,
@@ -3269,13 +3269,13 @@ static int sep_prepare_dcb_handler(struct sep_device *sep, unsigned long arg)
int error = 0;
/* command arguments */
- struct build_dcb_struc command_args;
+ struct build_dcb_struct command_args;
dev_dbg(&sep->pdev->dev, "sep_prepare_dcb_handler start\n");
/* get the command arguments */
if (copy_from_user(&command_args, (void __user *)arg,
- sizeof(struct build_dcb_struc))) {
+ sizeof(struct build_dcb_struct))) {
dev_warn(&sep->pdev->dev,
"prepare dcb handler: copy_from_user failed\n");
@@ -3339,7 +3339,7 @@ static int sep_rar_prepare_output_msg_handler(struct sep_device *sep,
int error = 0;
/* command args */
- struct rar_hndl_to_bus_stru command_args;
+ struct rar_hndl_to_bus_struct command_args;
struct RAR_buffer rar_buf;
/* bus address */
@@ -3407,7 +3407,7 @@ static int sep_realloc_ext_cache_handler(struct sep_device *sep,
{
int error = 0;
- struct realloc_ext_struc command_args;
+ struct realloc_ext_struct command_args;
/* holds the new ext cache address in the system memory offset */
u32 *system_addr;
diff --git a/drivers/staging/sep/sep_driver_api.h b/drivers/staging/sep/sep_driver_api.h
index 03986767033..f518b15935d 100644
--- a/drivers/staging/sep/sep_driver_api.h
+++ b/drivers/staging/sep/sep_driver_api.h
@@ -50,35 +50,35 @@
/*
init command struct
*/
-struct init_stru {
- /* -not used- address that SEP can access */
+struct init_struct {
+ /* address that SEP can access */
u32 *message_addr;
- /* -not used- start address of resident */
- u32 message_size_in_words;
+ /* start address of resident */
+ u32 message_size_in_words;
/* offset of the init message in the sep sram */
- u32 sep_sram_addr;
+ u32 sep_sram_addr;
/* -not used- resident size in bytes*/
- u32 resident_size_in_bytes;
+ u32 unused_resident_size_in_bytes;
/* -not used- cache size in bytes*/
- u32 cache_size_in_bytes;
+ u32 unused_cache_size_in_bytes;
/* -not used- ext cache current address */
- void *extcache_addr;
+ void *unused_extcache_addr;
/* -not used- ext cache size in bytes*/
- u32 extcache_size_in_bytes;
+ u32 unused_extcache_size_in_bytes;
};
-struct realloc_ext_struc {
+struct realloc_ext_struct {
/* -not used- current external cache address */
- void *ext_cache_addr;
+ void *unused_ext_cache_addr;
/* -not used- external cache size in bytes*/
- u32 ext_cache_size_in_bytes;
+ u32 unused_ext_cache_size_in_bytes;
};
struct alloc_struct {
@@ -91,7 +91,7 @@ struct alloc_struct {
/*
*/
-struct bld_syn_tab_struc {
+struct bld_syn_tab_struct {
/* address value of the data in (user space addr) */
unsigned long app_in_address;
@@ -106,12 +106,12 @@ struct bld_syn_tab_struc {
u32 block_size;
/* -not used- distinct user/kernel layout */
- bool isKernelVirtualAddress;
+ bool unused_isKernelVirtualAddress;
};
/* command struct for static pool addresses */
-struct stat_pool_addr_struc {
+struct stat_pool_addr_struct {
/* virtual address of the static pool */
void *static_virt_address;
@@ -119,7 +119,7 @@ struct stat_pool_addr_struc {
/* command struct for getting time value and address */
-struct caller_id_stru {
+struct caller_id_struct {
/* pid of the process */
u32 pid;
@@ -170,7 +170,7 @@ struct sep_caller_id_entry {
/*
command structure for building dcb block (currently for ext app only
*/
-struct build_dcb_struc {
+struct build_dcb_struct {
/* address value of the data in */
unsigned long app_in_address;
@@ -237,7 +237,7 @@ struct sep_dma_resource {
/* command struct for translating rar handle to bus address
and setting it at predefined location */
-struct rar_hndl_to_bus_stru {
+struct rar_hndl_to_bus_struct {
/* rar handle */
void *rar_handle;
@@ -275,7 +275,7 @@ struct sep_lli_entry {
/* create sym dma lli tables */
#define SEP_IOCCREATESYMDMATABLE \
- _IOW(SEP_IOC_MAGIC_NUMBER, 5, struct bld_syn_tab_struc)
+ _IOW(SEP_IOC_MAGIC_NUMBER, 5, struct bld_syn_tab_struct)
/* free dynamic data aalocated during table creation */
#define SEP_IOCFREEDMATABLEDATA \
@@ -283,7 +283,7 @@ struct sep_lli_entry {
/* get the static pool area addersses (physical and virtual) */
#define SEP_IOCGETSTATICPOOLADDR \
- _IOR(SEP_IOC_MAGIC_NUMBER, 8, struct stat_pool_addr_struc)
+ _IOR(SEP_IOC_MAGIC_NUMBER, 8, struct stat_pool_addr_struct)
/* set flow id command */
#define SEP_IOCSETFLOWID \
@@ -303,7 +303,7 @@ struct sep_lli_entry {
/* init sep command */
#define SEP_IOCSEPINIT \
- _IOW(SEP_IOC_MAGIC_NUMBER, 13, struct init_stru)
+ _IOW(SEP_IOC_MAGIC_NUMBER, 13, struct init_struct)
/* end transaction command */
#define SEP_IOCENDTRANSACTION \
@@ -311,10 +311,10 @@ struct sep_lli_entry {
/* reallocate external app */
#define SEP_IOCREALLOCEXTCACHE \
- _IOW(SEP_IOC_MAGIC_NUMBER, 18, struct realloc_ext_struc)
+ _IOW(SEP_IOC_MAGIC_NUMBER, 18, struct realloc_ext_struct)
#define SEP_IOCRARPREPAREMESSAGE \
- _IOW(SEP_IOC_MAGIC_NUMBER, 20, struct rar_hndl_to_bus_stru)
+ _IOW(SEP_IOC_MAGIC_NUMBER, 20, struct rar_hndl_to_bus_struct)
#define SEP_IOCTLSINGLETONLOCK \
_IO(SEP_IOC_MAGIC_NUMBER, 32)
@@ -323,10 +323,10 @@ struct sep_lli_entry {
_IO(SEP_IOC_MAGIC_NUMBER, 33)
#define SEP_IOCTLSETCALLERID \
- _IOW(SEP_IOC_MAGIC_NUMBER, 34, struct caller_id_stru)
+ _IOW(SEP_IOC_MAGIC_NUMBER, 34, struct caller_id_struct)
#define SEP_IOCPREPAREDCB \
- _IOW(SEP_IOC_MAGIC_NUMBER, 35, struct build_dcb_struc)
+ _IOW(SEP_IOC_MAGIC_NUMBER, 35, struct build_dcb_struct)
#define SEP_IOCFREEDCB \
_IO(SEP_IOC_MAGIC_NUMBER, 36)