From patchwork Wed Dec 2 19:35:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jin Qian X-Patchwork-Id: 57577 Delivered-To: patch@linaro.org Received: by 10.202.179.86 with SMTP id c83csp3216521oif; Wed, 2 Dec 2015 11:42:57 -0800 (PST) X-Received: by 10.66.234.226 with SMTP id uh2mr7178466pac.6.1449085377707; Wed, 02 Dec 2015 11:42:57 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zm10si6549136pac.26.2015.12.02.11.42.57; Wed, 02 Dec 2015 11:42:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@android.com; dmarc=fail (p=NONE dis=NONE) header.from=android.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751983AbbLBTmz (ORCPT + 28 others); Wed, 2 Dec 2015 14:42:55 -0500 Received: from mail-pf0-f171.google.com ([209.85.192.171]:34486 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751078AbbLBTmy (ORCPT ); Wed, 2 Dec 2015 14:42:54 -0500 X-Greylist: delayed 387 seconds by postgrey-1.27 at vger.kernel.org; Wed, 02 Dec 2015 14:42:54 EST Received: by pfbg73 with SMTP id g73so1507042pfb.1 for ; Wed, 02 Dec 2015 11:42:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=android.com; s=20120917; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=9RTtjodi3tic56/IpOGq3cXbGnoSgJoPsrHJR8SkLU8=; b=qlVKodR8PPm1pNi57h0YQ8nuu45nLlz64LRDdNqmeqfRy3fxkeEQY+3yHCpfqpo1fx m+M4WC0J0SYmsIeEKu+o78WY5pNrjvIRYBks4g1hUz4eUkyQRPVYOurCA3M5QluUeps1 MZ7D5WJraG7RqLgYv+9HYpGQoaCOAuGP1F5+7cr9r5YSxzScv2zj+8phUAepvHQdfFuS ppxScPMFH0fv7WcaNf8Y5LAqCN/KAnlJbE3fwDoMu8g480wYFzY7PlwSdi+j4dEilguv 7/fjhLDtEhGNzlqOwUgq3gcQ1OWSXbf3hIIw4THEK3TXqSKkLXpkSuJyUZMux9mPZBUm 3DJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=9RTtjodi3tic56/IpOGq3cXbGnoSgJoPsrHJR8SkLU8=; b=jqNtR7Xz1Qb4nBDX3f7Aw+OlcgYghQMp6XJRD4jm3sE2V91JQVkv+sToyQEGz7A6By aCPEicvh1S6LuW2s2sFJtLq1A8xNjA5KXUFUPSrIEF6v4CUnhX8Bu98GFQaxkLBYjkZP 09EF1KZmy68QshIrAJUz/Wvf75icLi3k5l61BkFq7tb5Nb0e3pAjGdz8xHszlh+z2ghN Tx6aTk6nSPNbBmrxmYeUD+Z+D/ia+tfQC052XbPCuHOK+WxTz15DmN2YPEjfcEHloBTn bdRDP/00gDV0J6fUb1IZtvUoPg+5iDsruFsq+Lc2Q3bH/McMabClzPZP3mAbwfy+jcsD 7nDA== X-Gm-Message-State: ALoCoQmMsjlDPRyWyohHQFavsdKIBJvF7hsl3OAYACFzYSHkQb7+RMmDgdi4o+NiAWe13OQuCt3V X-Received: by 10.98.71.217 with SMTP id p86mr7206544pfi.162.1449084986974; Wed, 02 Dec 2015 11:36:26 -0800 (PST) Received: from jinqian.mtv.corp.google.com ([172.22.126.125]) by smtp.gmail.com with ESMTPSA id q129sm5944118pfq.19.2015.12.02.11.36.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Dec 2015 11:36:25 -0800 (PST) From: Jin Qian To: Greg Kroah-Hartman , Greg Hackmann , Joe Perches , Christoffer Dall , Peter Senna Tschudin , Jason Hu , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Yu Ning , linux-kernel@vger.kernel.org Cc: Jin Qian Subject: [PATCH v3 2/8] android_pipe: don't be clever with #define offsets Date: Wed, 2 Dec 2015 11:35:57 -0800 Message-Id: <1449084968-30211-2-git-send-email-jinqian@android.com> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1449084968-30211-1-git-send-email-jinqian@android.com> References: <1449084968-30211-1-git-send-email-jinqian@android.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alex Bennée You just make it harder to figure out when commands are being used. Signed-off-by: Alex Bennée Signed-off-by: Jin Qian --- drivers/platform/goldfish/goldfish_pipe.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) -- 2.6.0.rc2.230.g3dd15c0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c index e7a29e2..0fb3a34 100644 --- a/drivers/platform/goldfish/goldfish_pipe.c +++ b/drivers/platform/goldfish/goldfish_pipe.c @@ -90,12 +90,6 @@ #define CMD_WRITE_BUFFER 4 /* send a user buffer to the emulator */ #define CMD_WAKE_ON_WRITE 5 /* tell the emulator to wake us when writing is possible */ - -/* The following commands are related to read operations, they must be - * listed in the same order than the corresponding write ones, since we - * will use (CMD_READ_BUFFER - CMD_WRITE_BUFFER) as a special offset - * in goldfish_pipe_read_write() below. - */ #define CMD_READ_BUFFER 6 /* receive a user buffer from the emulator */ #define CMD_WAKE_ON_READ 7 /* tell the emulator to wake us when reading * is possible */ @@ -272,8 +266,6 @@ static ssize_t goldfish_pipe_read_write(struct file *filp, char __user *buffer, unsigned long irq_flags; struct goldfish_pipe *pipe = filp->private_data; struct goldfish_pipe_dev *dev = pipe->dev; - const int cmd_offset = is_write ? 0 - : (CMD_READ_BUFFER - CMD_WRITE_BUFFER); unsigned long address, address_end; int ret = 0; @@ -325,7 +317,8 @@ static ssize_t goldfish_pipe_read_write(struct file *filp, char __user *buffer, /* Now, try to transfer the bytes in the current page */ spin_lock_irqsave(&dev->lock, irq_flags); - if (access_with_param(dev, CMD_WRITE_BUFFER + cmd_offset, + if (access_with_param(dev, + is_write ? CMD_WRITE_BUFFER : CMD_READ_BUFFER, address, avail, pipe, &status)) { gf_write_ptr(pipe, dev->base + PIPE_REG_CHANNEL, dev->base + PIPE_REG_CHANNEL_HIGH); @@ -333,7 +326,7 @@ static ssize_t goldfish_pipe_read_write(struct file *filp, char __user *buffer, gf_write_ptr((void *)address, dev->base + PIPE_REG_ADDRESS, dev->base + PIPE_REG_ADDRESS_HIGH); - writel(CMD_WRITE_BUFFER + cmd_offset, + writel(is_write ? CMD_WRITE_BUFFER : CMD_READ_BUFFER, dev->base + PIPE_REG_COMMAND); status = readl(dev->base + PIPE_REG_STATUS); } @@ -370,7 +363,8 @@ static ssize_t goldfish_pipe_read_write(struct file *filp, char __user *buffer, set_bit(wakeBit, &pipe->flags); /* Tell the emulator we're going to wait for a wake event */ - goldfish_cmd(pipe, CMD_WAKE_ON_WRITE + cmd_offset); + goldfish_cmd(pipe, + is_write ? CMD_WAKE_ON_WRITE : CMD_WAKE_ON_READ); /* Unlock the pipe, then wait for the wake signal */ mutex_unlock(&pipe->lock);