Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2714909imj; Mon, 11 Feb 2019 07:24:12 -0800 (PST) X-Google-Smtp-Source: AHgI3IYBFLmwrBeFRGIDhMiru46WyjZCQJlapy8QicuqtEkMV5hU3JyZ7D7s2AniPauwjx+V1I39 X-Received: by 2002:a17:902:704c:: with SMTP id h12mr38907248plt.30.1549898652380; Mon, 11 Feb 2019 07:24:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549898652; cv=none; d=google.com; s=arc-20160816; b=KWi8eoKkkPCJ8615zkQluJvnCHCGOMAgaR612/5YYj4X1LEnYjgMT98O5kwf/Gv5mQ 38vKCVTMVHq9ZsRqpACCKT6d58cm8tfF7grDS9I17Qh8tL4WvSbmKt0K09+HTOnmHiQi Vl5vuFh1jwvrMkq3uWHpQ60cfz59j7yznYGiTMOHPv4XrT/e+Vo8SR5CY3wmocccyCHU iHFZAcXU9MPZ/g+P4u7mVTUQfcRFHe+pm/d7CvGWFWvlwiOqRxeiuPtQrQtigKKCVmoR 4HrxHiRNOVGIcviTVPQtcGsIopwAykC6RdxtRxLlDhDBHur4RjgJJKfBui90zL/q9kTr 3U4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:content-disposition :mime-version:message-id:subject:cc:to:from:date:dkim-signature; bh=ita72m0qHksZNcDB6Zg6zw5cSMfZ8ZcJBs3jNlyZozo=; b=CQSrYbqhK2eCUYCC3URRyetS7gc/AVWJM4D4JkuGhI5u4anE/oD0qCqUes+VFoNOZX IvdUrEOMLzQpkkZbzUpr8w4k3P0PMPEFXIyYJ2E2/42Bp83UdNoJW2Ss1WOxPJXd3wug 0pOl+Hms0VbQoHURNp/uua056EAaPnQGT2ElaJ8tRk3WTmSmCjt4rO91ElqbJYjJeBBr JwHfGjU3LVXSS2PQkQhOxe/gQhoM2sVmLrN/089Zmc2bzC5dPIAT/ZCyiayYOAP1aF0C KsE/Y6LJeyUARYGf8EtTQSj7e1jFSmkvpEbR4sfBrSvWZeDJy4QpKK2pvStxeNvx09ae 9BUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="KI/5R1YG"; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r7si10034114pfb.237.2019.02.11.07.23.56; Mon, 11 Feb 2019 07:24:12 -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; dkim=pass header.i=@gmail.com header.s=20161025 header.b="KI/5R1YG"; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391446AbfBKPVt (ORCPT + 99 others); Mon, 11 Feb 2019 10:21:49 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:42260 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390763AbfBKPVr (ORCPT ); Mon, 11 Feb 2019 10:21:47 -0500 Received: by mail-pg1-f196.google.com with SMTP id d72so5086181pga.9 for ; Mon, 11 Feb 2019 07:21:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=ita72m0qHksZNcDB6Zg6zw5cSMfZ8ZcJBs3jNlyZozo=; b=KI/5R1YGpvtTX4iijhHg4YkvRkCAlnKhcY2uD+qQaqWHB6hZH0VI4MsX/Nn8UaVTks yeKXtEM+UINne7hhjNibafyV9/o2a/JwdkA5DzlZDUT98lj1KAqSlHo7Xzk8zkboGnf5 om1wHusrSXgPAtA6y3NWIB84ARN/TtqlM2lY+7+QdXgw2o6t+8O3buPr/NBJdGQ0z+dH ZMYlzQnLNBpwBt/Z/52s2+4cObU6Y3MmqW6fzes6ogs+lA5LV/GTbsGIVfI5JU9Q/ue+ ax/k2lj3Vh+Cxb+QKphpW4UaOJBjXRXLsgThNhUbYcqvzLwHf8y14rl5EoSoYp94EWH2 FT0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=ita72m0qHksZNcDB6Zg6zw5cSMfZ8ZcJBs3jNlyZozo=; b=E85vZEilxE15g/mmaZ9lSQCsZKH08leOB7GS3yY/3ikkNjSdoTFGiOOHhNrbMNJlcI la6KUhAbI/hdfJeRGIgBfIIUHzmlQODFZRJyJVexLECDxhgGEVpisMxg9vs6j5j4XQ+f 8xkKQawWG+2rdS7z8iAuIJYm3/FeYiihtUW2VLXaVc0fMLwbJU5GeYywI/gLhAzsDpoo ggKgot9tZa4XF6cV+oq0P04JwGCxGM7/4i1DbOnQhaCRCEZ0c1SUQhsLFLksMyH5SNxl AwV2EhR7GsKhF+91kYg2sg/ShMfrIG133X3u6CZwwGIFLqL+Vwi4pjYqFcvXMi4eWXhB DcdQ== X-Gm-Message-State: AHQUAuZUtNhXqV0YbL6/deovT/NcFIAK7ca9jeEvB2dmCZI1kdN5fzpK j3h+7o22SiH+8LqP9nGpxB/7x4fq X-Received: by 2002:a63:4b5e:: with SMTP id k30mr19908828pgl.212.1549898506113; Mon, 11 Feb 2019 07:21:46 -0800 (PST) Received: from jordon-HP-15-Notebook-PC ([106.51.20.40]) by smtp.gmail.com with ESMTPSA id s14sm4078448pfe.171.2019.02.11.07.21.43 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Feb 2019 07:21:45 -0800 (PST) Date: Mon, 11 Feb 2019 20:56:02 +0530 From: Souptick Joarder To: arve@android.com, gregkh@linuxfoundation.org, tkjos@android.com, maco@android.com, christian@brauner.io Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging: android: vsoc: Remove VSOC_WAIT_FOR_INCOMING_INTERRUPT Message-ID: <20190211152602.GA5591@jordon-HP-15-Notebook-PC> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As mentioned in TODO list, Removed VSOC_WAIT_FOR_INCOMING_INTERRUPT ioctl. This functionality has been superseded by the futex and is there for legacy reasons. Signed-off-by: Souptick Joarder --- drivers/staging/android/uapi/vsoc_shm.h | 7 ------- drivers/staging/android/vsoc.c | 5 ----- 2 files changed, 12 deletions(-) diff --git a/drivers/staging/android/uapi/vsoc_shm.h b/drivers/staging/android/uapi/vsoc_shm.h index 6291fb2..69090cc 100644 --- a/drivers/staging/android/uapi/vsoc_shm.h +++ b/drivers/staging/android/uapi/vsoc_shm.h @@ -232,13 +232,6 @@ struct vsoc_shm_layout_descriptor { #define VSOC_MAYBE_SEND_INTERRUPT_TO_HOST _IO(0xF5, 2) /* - * When this returns the guest will scan host_to_guest_signal_table to - * check for new futexes to wake. - */ -/* TODO(ghartman): Consider moving this to the bottom half */ -#define VSOC_WAIT_FOR_INCOMING_INTERRUPT _IO(0xF5, 3) - -/* * Guest HALs will use this to retrieve the region description after * opening their device node. */ diff --git a/drivers/staging/android/vsoc.c b/drivers/staging/android/vsoc.c index 22571ab..a842ff7 100644 --- a/drivers/staging/android/vsoc.c +++ b/drivers/staging/android/vsoc.c @@ -592,11 +592,6 @@ static long vsoc_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) case VSOC_SEND_INTERRUPT_TO_HOST: writel(reg_num, vsoc_dev.regs + DOORBELL); return 0; - case VSOC_WAIT_FOR_INCOMING_INTERRUPT: - wait_event_interruptible - (reg_data->interrupt_wait_queue, - (atomic_read(reg_data->incoming_signalled) != 0)); - break; case VSOC_DESCRIBE_REGION: return do_vsoc_describe_region -- 1.9.1