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

powerpc/spufs: Use simple_write_to_buffer

Browse Source 
Simplify several write fileoperations for spufs by using
simple_write_to_buffer().

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Akinobu Mita
2010-12-24 20:03:56 +00:00
committed by Benjamin Herrenschmidt
parent 06ca2188ec
commit 63c3b9d71b
1 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
arch/powerpc/platforms/cell/spufs/file.c
View File

@@ -219,24 +219,17 @@ spufs_mem_write(struct file *file, const char __user *buffer,
loff_t pos = *ppos; loff_t pos = *ppos;
int ret; int ret;
if (pos < 0)
return -EINVAL;
if (pos > LS_SIZE) if (pos > LS_SIZE)
return -EFBIG; return -EFBIG;
if (size > LS_SIZE - pos)
size = LS_SIZE - pos;
ret = spu_acquire(ctx); ret = spu_acquire(ctx);
if (ret) if (ret)
return ret; return ret;
local_store = ctx->ops->get_ls(ctx); local_store = ctx->ops->get_ls(ctx);
ret = copy_from_user(local_store + pos, buffer, size); size = simple_write_to_buffer(local_store, LS_SIZE, ppos, buffer, size);
spu_release(ctx); spu_release(ctx);
if (ret)
return -EFAULT;
*ppos = pos + size;
return size; return size;
} }
@@ -574,18 +567,15 @@ spufs_regs_write(struct file *file, const char __user *buffer,
if (*pos >= sizeof(lscsa->gprs)) if (*pos >= sizeof(lscsa->gprs))
return -EFBIG; return -EFBIG;
size = min_t(ssize_t, sizeof(lscsa->gprs) - *pos, size);
*pos += size;
ret = spu_acquire_saved(ctx); ret = spu_acquire_saved(ctx);
if (ret) if (ret)
return ret; return ret;
ret = copy_from_user((char *)lscsa->gprs + *pos - size, size = simple_write_to_buffer(lscsa->gprs, sizeof(lscsa->gprs), pos,
buffer, size) ? -EFAULT : size; buffer, size);
spu_release_saved(ctx); spu_release_saved(ctx);
return ret; return size;
} }
static const struct file_operations spufs_regs_fops = { static const struct file_operations spufs_regs_fops = {
@@ -630,18 +620,15 @@ spufs_fpcr_write(struct file *file, const char __user * buffer,
if (*pos >= sizeof(lscsa->fpcr)) if (*pos >= sizeof(lscsa->fpcr))
return -EFBIG; return -EFBIG;
size = min_t(ssize_t, sizeof(lscsa->fpcr) - *pos, size);
ret = spu_acquire_saved(ctx); ret = spu_acquire_saved(ctx);
if (ret) if (ret)
return ret; return ret;
*pos += size; size = simple_write_to_buffer(&lscsa->fpcr, sizeof(lscsa->fpcr), pos,
ret = copy_from_user((char *)&lscsa->fpcr + *pos - size, buffer, size);
buffer, size) ? -EFAULT : size;
spu_release_saved(ctx); spu_release_saved(ctx);
return ret; return size;
} }
static const struct file_operations spufs_fpcr_fops = { static const struct file_operations spufs_fpcr_fops = {