From patchwork Tue Dec 13 00:49:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 5615 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9F89F23E0C for ; Tue, 13 Dec 2011 00:49:52 +0000 (UTC) Received: from mail-bw0-f52.google.com (mail-bw0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 87C59A184C7 for ; Tue, 13 Dec 2011 00:49:52 +0000 (UTC) Received: by mail-bw0-f52.google.com with SMTP id 17so8358805bke.11 for ; Mon, 12 Dec 2011 16:49:52 -0800 (PST) Received: by 10.205.120.135 with SMTP id fy7mr6360736bkc.54.1323737392380; Mon, 12 Dec 2011 16:49:52 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.129.2 with SMTP id hg2cs64552bkc; Mon, 12 Dec 2011 16:49:52 -0800 (PST) Received: by 10.236.138.131 with SMTP id a3mr489591yhj.101.1323737390367; Mon, 12 Dec 2011 16:49:50 -0800 (PST) Received: from mail-yx0-f178.google.com (mail-yx0-f178.google.com [209.85.213.178]) by mx.google.com with ESMTPS id f4si32272ybe.2.2011.12.12.16.49.49 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 12 Dec 2011 16:49:50 -0800 (PST) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.213.178 as permitted sender) client-ip=209.85.213.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.213.178 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass (test mode) header.i=@gmail.com Received: by yenm5 with SMTP id m5so5302775yen.37 for ; Mon, 12 Dec 2011 16:49:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=hU5enMiY7Dfl2Y1eTgPQtcy7ArkeIqhqHVFGE0gqJpE=; b=I6GGmXbjh7FHyX6YbetUa9XMICh636bVUcu1jDiGH78fnjVpafUES7/lCLoQPl6NsF 2AgsXG0XFEWfwPDCMvNHKMmtElHU+UDL8ClrunS2xmMf5ENwNKH0nWy3HT4WjRnmMCgr MRD/UmDSuM06qlzHjjz5nerbQbAILsal91IMA= Received: by 10.236.92.168 with SMTP id j28mr666379yhf.59.1323737389855; Mon, 12 Dec 2011 16:49:49 -0800 (PST) Received: from localhost (ppp-70-253-156-7.dsl.rcsntx.swbell.net. [70.253.156.7]) by mx.google.com with ESMTPS id c44sm33546455yhm.5.2011.12.12.16.49.49 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 12 Dec 2011 16:49:49 -0800 (PST) Sender: Rob Clark From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: patches@linaro.org, Greg KH , Tomi Valkeinen , Rob Clark Subject: [PATCH 1/2] drm/omap: drm API update: make fops struct const Date: Mon, 12 Dec 2011 18:49:43 -0600 Message-Id: <1323737384-3145-2-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1323737384-3145-1-git-send-email-rob.clark@linaro.org> References: <1323737384-3145-1-git-send-email-rob.clark@linaro.org> From: Rob Clark Update to reflect changes in: "Make the per-driver file_operations struct const" Signed-off-by: Rob Clark --- drivers/staging/omapdrm/omap_drv.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/staging/omapdrm/omap_drv.c b/drivers/staging/omapdrm/omap_drv.c index 7ecf578..d05e2b4 100644 --- a/drivers/staging/omapdrm/omap_drv.c +++ b/drivers/staging/omapdrm/omap_drv.c @@ -708,6 +708,18 @@ static struct vm_operations_struct omap_gem_vm_ops = { .close = drm_gem_vm_close, }; +static const struct file_operations omapdriver_fops = { + .owner = THIS_MODULE, + .open = drm_open, + .unlocked_ioctl = drm_ioctl, + .release = drm_release, + .mmap = omap_gem_mmap, + .poll = drm_poll, + .fasync = drm_fasync, + .read = drm_read, + .llseek = noop_llseek, +}; + static struct drm_driver omap_drm_driver = { .driver_features = DRIVER_HAVE_IRQ | DRIVER_MODESET | DRIVER_GEM, @@ -734,17 +746,7 @@ static struct drm_driver omap_drm_driver = { .dumb_destroy = omap_gem_dumb_destroy, .ioctls = ioctls, .num_ioctls = DRM_OMAP_NUM_IOCTLS, - .fops = { - .owner = THIS_MODULE, - .open = drm_open, - .unlocked_ioctl = drm_ioctl, - .release = drm_release, - .mmap = omap_gem_mmap, - .poll = drm_poll, - .fasync = drm_fasync, - .read = drm_read, - .llseek = noop_llseek, - }, + .fops = &omapdriver_fops, .name = DRIVER_NAME, .desc = DRIVER_DESC, .date = DRIVER_DATE,