From patchwork Thu Mar 3 19:40:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 8495781 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3ACF59F38C for ; Thu, 3 Mar 2016 19:41:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 681682038E for ; Thu, 3 Mar 2016 19:41:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 843452037C for ; Thu, 3 Mar 2016 19:41:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1B4A26EAFB; Thu, 3 Mar 2016 19:41:02 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yk0-f178.google.com (mail-yk0-f178.google.com [209.85.160.178]) by gabe.freedesktop.org (Postfix) with ESMTPS id 10C156EAFB for ; Thu, 3 Mar 2016 19:41:00 +0000 (UTC) Received: by mail-yk0-f178.google.com with SMTP id v186so13749927yke.2 for ; Thu, 03 Mar 2016 11:41:00 -0800 (PST) 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; bh=ksXtsLmaAjg/BOCYX6FmmgBYXLBRDn+aWZmv3ZLaWAw=; b=hp4DBWuGxpgECbKG9Dy9he9AS0Ql6P/X0+oVz85Hw0XsNJ/yborXLXbwyClD2Or83+ oG1EsVziD3oxiZkosQrP0L/GIiny+mcp29a93+OXDNcuY61pZDlZUpRobhuW7z2voTdF 3nPOItdtdGyX6PJ6Y6SHLpmglLmrJlX0NDekXyznRGh3J3zINS47aDg1vcrBD6BerEyR Vkue3e9w+P2ryUtnvopwlmn+7RKHW7IxkXg3YexDD9fNMQNjxWGBZQjS9JXmrKOVU+Dq MN3YPMMDc6GEHJ8oSTPGwmUi0zWk+KY/6dHvONZUpadaEXQWa3uy/rwQEf36y1ipbUEO 3ahg== X-Gm-Message-State: AD7BkJJvmROdaDUGUyKey2qFw0HlBMmG7QwhP+W/+inFrhEVREx/P3x1upMHy1/W8wmucQ== X-Received: by 10.37.35.67 with SMTP id j64mr1736024ybj.87.1457034058888; Thu, 03 Mar 2016 11:40:58 -0800 (PST) Received: from jade.localdomain ([177.194.47.65]) by smtp.gmail.com with ESMTPSA id f186sm28850ywa.6.2016.03.03.11.40.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Mar 2016 11:40:58 -0800 (PST) From: Gustavo Padovan To: Greg Kroah-Hartman Subject: [PATCH v7 2/5] staging/android: rename SYNC_IOC_FENCE_INFO Date: Thu, 3 Mar 2016 16:40:43 -0300 Message-Id: <1457034046-27678-2-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457034046-27678-1-git-send-email-gustavo@padovan.org> References: <1457034046-27678-1-git-send-email-gustavo@padovan.org> Cc: devel@driverdev.osuosl.org, Daniel Stone , Daniel Vetter , Riley Andrews , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Gustavo Padovan , John Harrison X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Gustavo Padovan We don't use the 'fence' name to refer to sync_file anymore. So rename it to SYNC_IOC_FILE_INFO. Signed-off-by: Gustavo Padovan Reviewed-by: Maarten Lankhorst --- drivers/staging/android/sync.c | 2 +- drivers/staging/android/uapi/sync.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index 31aa462..dc5f382 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -562,7 +562,7 @@ static long sync_file_ioctl(struct file *file, unsigned int cmd, case SYNC_IOC_MERGE: return sync_file_ioctl_merge(sync_file, arg); - case SYNC_IOC_FENCE_INFO: + case SYNC_IOC_FILE_INFO: return sync_file_ioctl_fence_info(sync_file, arg); default: diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h index 4ffb7cc..dd0dd84 100644 --- a/drivers/staging/android/uapi/sync.h +++ b/drivers/staging/android/uapi/sync.h @@ -81,6 +81,6 @@ struct sync_file_info { * pt_info is a buffer containing sync_pt_infos for every sync_pt in the fence. * To iterate over the sync_pt_infos, use the sync_pt_info.len field. */ -#define SYNC_IOC_FENCE_INFO _IOWR(SYNC_IOC_MAGIC, 2, struct sync_file_info) +#define SYNC_IOC_FILE_INFO _IOWR(SYNC_IOC_MAGIC, 2, struct sync_file_info) #endif /* _UAPI_LINUX_SYNC_H */