From patchwork Sat Dec 25 06:03:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 76644 X-Patchwork-Delegate: benh@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id DB0A9B7356 for ; Sat, 25 Dec 2010 17:03:41 +1100 (EST) Received: from mail-iw0-f179.google.com (mail-iw0-f179.google.com [209.85.214.179]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id E795FB70DA; Sat, 25 Dec 2010 17:03:34 +1100 (EST) Received: by iwn42 with SMTP id 42so8264311iwn.38 for ; Fri, 24 Dec 2010 22:03:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=NMyP7bgeTZnlVs3J2S0ORz4vDSsvJW6QA3wE2kU9/Hk=; b=F9Z/hJbelGQfiggsuh96/2XUgmo6cxhzozMLsA5NDXiotw93Ta63O8n0W8psg9LysM 0ROiq4uH7XWYk7Y10mm76VAUTnG4X4nhpVYhjoXB/MlOwspJ1qfmzCYmv5FDomVdwCSU nHRY5fjlU4HK6b5LRUDeqLaglWFfNJoG1038g= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=PS1l/QaIYblUanv7n5gykCTCrF0f9rWRoFH66FpAk2mlzbjXY+2EKA6LKz3Aqty5aG hJLHyJRLTi75Qz7qRXkzgBV9VokZdq4LhIKeRIvje4qQSD2mYKi9vvyOzA9aJOr+nrxr NZQqXo5fi8rntqfx1JPdhVD1dLrpYYX14oxxE= Received: by 10.42.169.2 with SMTP id z2mr10230125icy.436.1293257011489; Fri, 24 Dec 2010 22:03:31 -0800 (PST) Received: from localhost.localdomain (p8025-adsao01yokonib2-acca.kanagawa.ocn.ne.jp [219.161.30.25]) by mx.google.com with ESMTPS id y7sm4086877ici.23.2010.12.24.22.03.27 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 24 Dec 2010 22:03:30 -0800 (PST) From: Akinobu Mita To: linux-kernel@vger.kernel.org Subject: [PATCH] spufs: use simple_write_to_buffer Date: Sat, 25 Dec 2010 15:03:56 +0900 Message-Id: <1293257039-2580-1-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: Cc: cbe-oss-dev@lists.ozlabs.org, Akinobu Mita , Paul Mackerras , Jeremy Kerr , linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Simplify several write fileoperations for spufs by using simple_write_to_buffer(). Signed-off-by: Akinobu Mita Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Jeremy Kerr Cc: linuxppc-dev@lists.ozlabs.org Cc: cbe-oss-dev@lists.ozlabs.org Acked-by: Arnd Bergmann --- arch/powerpc/platforms/cell/spufs/file.c | 27 +++++++-------------------- 1 files changed, 7 insertions(+), 20 deletions(-) diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c index 02f7b11..3c7c3f8 100644 --- a/arch/powerpc/platforms/cell/spufs/file.c +++ b/arch/powerpc/platforms/cell/spufs/file.c @@ -219,24 +219,17 @@ spufs_mem_write(struct file *file, const char __user *buffer, loff_t pos = *ppos; int ret; - if (pos < 0) - return -EINVAL; if (pos > LS_SIZE) return -EFBIG; - if (size > LS_SIZE - pos) - size = LS_SIZE - pos; ret = spu_acquire(ctx); if (ret) return ret; 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); - if (ret) - return -EFAULT; - *ppos = pos + size; return size; } @@ -574,18 +567,15 @@ spufs_regs_write(struct file *file, const char __user *buffer, if (*pos >= sizeof(lscsa->gprs)) return -EFBIG; - size = min_t(ssize_t, sizeof(lscsa->gprs) - *pos, size); - *pos += size; - ret = spu_acquire_saved(ctx); if (ret) return ret; - ret = copy_from_user((char *)lscsa->gprs + *pos - size, - buffer, size) ? -EFAULT : size; + size = simple_write_to_buffer(lscsa->gprs, sizeof(lscsa->gprs), pos, + buffer, size); spu_release_saved(ctx); - return ret; + return size; } 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)) return -EFBIG; - size = min_t(ssize_t, sizeof(lscsa->fpcr) - *pos, size); - ret = spu_acquire_saved(ctx); if (ret) return ret; - *pos += size; - ret = copy_from_user((char *)&lscsa->fpcr + *pos - size, - buffer, size) ? -EFAULT : size; + size = simple_write_to_buffer(&lscsa->fpcr, sizeof(lscsa->fpcr), pos, + buffer, size); spu_release_saved(ctx); - return ret; + return size; } static const struct file_operations spufs_fpcr_fops = {