Subject: [merged] drivers-misc-sgi-gru-grukdumpc-cleanup-gru_dump_context-a-little.patch removed from -mm tree To: dan.carpenter@xxxxxxxxxx,sivanich@xxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 08 Apr 2014 14:31:13 -0700 The patch titled Subject: drivers/misc/sgi-gru/grukdump.c: cleanup gru_dump_context() a little has been removed from the -mm tree. Its filename was drivers-misc-sgi-gru-grukdumpc-cleanup-gru_dump_context-a-little.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Subject: drivers/misc/sgi-gru/grukdump.c: cleanup gru_dump_context() a little "ret" is zero here so we can remove the "!ret" part of the condition. "uhdr" is alread a __user pointer so we can remove the cast. Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Acked-by: Dimitri Sivanich <sivanich@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/misc/sgi-gru/grukdump.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/misc/sgi-gru/grukdump.c~drivers-misc-sgi-gru-grukdumpc-cleanup-gru_dump_context-a-little drivers/misc/sgi-gru/grukdump.c --- a/drivers/misc/sgi-gru/grukdump.c~drivers-misc-sgi-gru-grukdumpc-cleanup-gru_dump_context-a-little +++ a/drivers/misc/sgi-gru/grukdump.c @@ -178,10 +178,10 @@ static int gru_dump_context(struct gru_s hdr.cbrcnt = cbrcnt; hdr.dsrcnt = dsrcnt; hdr.cch_locked = cch_locked; - if (!ret && copy_to_user((void __user *)uhdr, &hdr, sizeof(hdr))) - ret = -EFAULT; + if (copy_to_user(uhdr, &hdr, sizeof(hdr))) + return -EFAULT; - return ret ? ret : bytes; + return bytes; } int gru_dump_chiplet_request(unsigned long arg) _ Patches currently in -mm which might be from dan.carpenter@xxxxxxxxxx are origin.patch ncpfs-cleanup-indenting-in-ncp_lookup.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html