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

Staging: dream: pmem: remove casts from void*

Browse Source 
Remove unnesessary casts from void*.

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kulikov Vasiliy
2010-06-29 14:15:56 +04:00
committed by Greg Kroah-Hartman
parent 764f2ca6e4
commit 37157cc4b7
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/staging/dream/pmem.c
View File

@@ -209,7 +209,7 @@ static int has_allocation(struct file *file)
if (unlikely(!file->private_data)) if (unlikely(!file->private_data))
return 0; return 0;
data = (struct pmem_data *)file->private_data; data = file->private_data;
if (unlikely(data->index < 0)) if (unlikely(data->index < 0))
return 0; return 0;
return 1; return 1;
@@ -223,7 +223,7 @@ static int is_master_owner(struct file *file)
if (!is_pmem_file(file) || !has_allocation(file)) if (!is_pmem_file(file) || !has_allocation(file))
return 0; return 0;
data = (struct pmem_data *)file->private_data; data = file->private_data;
if (PMEM_FLAGS_MASTERMAP & data->flags) if (PMEM_FLAGS_MASTERMAP & data->flags)
return 1; return 1;
master_file = fget_light(data->master_fd, &put_needed); master_file = fget_light(data->master_fd, &put_needed);
@@ -268,7 +268,7 @@ static void pmem_revoke(struct file *file, struct pmem_data *data);
static int pmem_release(struct inode *inode, struct file *file) static int pmem_release(struct inode *inode, struct file *file)
{ {
struct pmem_data *data = (struct pmem_data *)file->private_data; struct pmem_data *data = file->private_data;
struct pmem_region_node *region_node; struct pmem_region_node *region_node;
struct list_head *elt, *elt2; struct list_head *elt, *elt2;
int id = get_id(file), ret = 0; int id = get_id(file), ret = 0;
@@ -591,7 +591,7 @@ static int pmem_mmap(struct file *file, struct vm_area_struct *vma)
return -EINVAL; return -EINVAL;
} }
data = (struct pmem_data *)file->private_data; data = file->private_data;
down_write(&data->sem); down_write(&data->sem);
/* check this file isn't already mmaped, for submaps check this file /* check this file isn't already mmaped, for submaps check this file
* has never been mmaped */ * has never been mmaped */
@@ -690,7 +690,7 @@ int get_pmem_user_addr(struct file *file, unsigned long *start,
#endif #endif
return -1; return -1;
} }
data = (struct pmem_data *)file->private_data; data = file->private_data;
down_read(&data->sem); down_read(&data->sem);
if (data->vma) { if (data->vma) {
*start = data->vma->vm_start; *start = data->vma->vm_start;
@@ -712,7 +712,7 @@ int get_pmem_addr(struct file *file, unsigned long *start,
if (!is_pmem_file(file) || !has_allocation(file)) if (!is_pmem_file(file) || !has_allocation(file))
return -1; return -1;
data = (struct pmem_data *)file->private_data; data = file->private_data;
if (data->index == -1) { if (data->index == -1) {
#if PMEM_DEBUG #if PMEM_DEBUG
printk(KERN_INFO "pmem: requested pmem data from file with no " printk(KERN_INFO "pmem: requested pmem data from file with no "
@@ -766,7 +766,7 @@ void put_pmem_file(struct file *file)
if (!is_pmem_file(file)) if (!is_pmem_file(file))
return; return;
id = get_id(file); id = get_id(file);
data = (struct pmem_data *)file->private_data; data = file->private_data;
#if PMEM_DEBUG #if PMEM_DEBUG
down_write(&data->sem); down_write(&data->sem);
if (data->ref == 0) { if (data->ref == 0) {
@@ -793,7 +793,7 @@ void flush_pmem_file(struct file *file, unsigned long offset, unsigned long len)
return; return;
id = get_id(file); id = get_id(file);
data = (struct pmem_data *)file->private_data; data = file->private_data;
if (!pmem[id].cached) if (!pmem[id].cached)
return; return;
@@ -822,7 +822,7 @@ end:
static int pmem_connect(unsigned long connect, struct file *file) static int pmem_connect(unsigned long connect, struct file *file)
{ {
struct pmem_data *data = (struct pmem_data *)file->private_data; struct pmem_data *data = file->private_data;
struct pmem_data *src_data; struct pmem_data *src_data;
struct file *src_file; struct file *src_file;
int ret = 0, put_needed; int ret = 0, put_needed;
@@ -842,7 +842,7 @@ static int pmem_connect(unsigned long connect, struct file *file)
ret = -EINVAL; ret = -EINVAL;
goto err_bad_file; goto err_bad_file;
} }
src_data = (struct pmem_data *)src_file->private_data; src_data = src_file->private_data;
if (has_allocation(file) && (data->index != src_data->index)) { if (has_allocation(file) && (data->index != src_data->index)) {
printk(KERN_INFO "pmem: file is already mapped but doesn't " printk(KERN_INFO "pmem: file is already mapped but doesn't "
@@ -929,7 +929,7 @@ int pmem_remap(struct pmem_region *region, struct file *file,
struct mm_struct *mm = NULL; struct mm_struct *mm = NULL;
struct list_head *elt, *elt2; struct list_head *elt, *elt2;
int id = get_id(file); int id = get_id(file);
struct pmem_data *data = (struct pmem_data *)file->private_data; struct pmem_data *data = file->private_data;
/* pmem region must be aligned on a page boundry */ /* pmem region must be aligned on a page boundry */
if (unlikely(!PMEM_IS_PAGE_ALIGNED(region->offset) || if (unlikely(!PMEM_IS_PAGE_ALIGNED(region->offset) ||
@@ -1053,7 +1053,7 @@ static void pmem_revoke(struct file *file, struct pmem_data *data)
static void pmem_get_size(struct pmem_region *region, struct file *file) static void pmem_get_size(struct pmem_region *region, struct file *file)
{ {
struct pmem_data *data = (struct pmem_data *)file->private_data; struct pmem_data *data = file->private_data;
int id = get_id(file); int id = get_id(file);
if (!has_allocation(file)) { if (!has_allocation(file)) {
@@ -1082,7 +1082,7 @@ static long pmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
region.offset = 0; region.offset = 0;
region.len = 0; region.len = 0;
} else { } else {
data = (struct pmem_data *)file->private_data; data = file->private_data;
region.offset = pmem_start_addr(id, data); region.offset = pmem_start_addr(id, data);
region.len = pmem_len(id, data); region.len = pmem_len(id, data);
} }
@@ -1099,7 +1099,7 @@ static long pmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
if (copy_from_user(&region, (void __user *)arg, if (copy_from_user(&region, (void __user *)arg,
sizeof(struct pmem_region))) sizeof(struct pmem_region)))
return -EFAULT; return -EFAULT;
data = (struct pmem_data *)file->private_data; data = file->private_data;
return pmem_remap(&region, file, PMEM_MAP); return pmem_remap(&region, file, PMEM_MAP);
} }
break; break;
@@ -1109,7 +1109,7 @@ static long pmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
if (copy_from_user(&region, (void __user *)arg, if (copy_from_user(&region, (void __user *)arg,
sizeof(struct pmem_region))) sizeof(struct pmem_region)))
return -EFAULT; return -EFAULT;
data = (struct pmem_data *)file->private_data; data = file->private_data;
return pmem_remap(&region, file, PMEM_UNMAP); return pmem_remap(&region, file, PMEM_UNMAP);
break; break;
} }
@@ -1139,7 +1139,7 @@ static long pmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{ {
if (has_allocation(file)) if (has_allocation(file))
return -EINVAL; return -EINVAL;
data = (struct pmem_data *)file->private_data; data = file->private_data;
data->index = pmem_allocate(id, arg); data->index = pmem_allocate(id, arg);
break; break;
} }