From patchwork Mon Aug 27 19:56:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10577551 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CD8D4174A for ; Mon, 27 Aug 2018 19:58:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF610295B3 for ; Mon, 27 Aug 2018 19:58:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B39382963E; Mon, 27 Aug 2018 19:58:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A2E2D295B3 for ; Mon, 27 Aug 2018 19:58:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727111AbeH0XqI (ORCPT ); Mon, 27 Aug 2018 19:46:08 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:53547 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726826AbeH0XqH (ORCPT ); Mon, 27 Aug 2018 19:46:07 -0400 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0LvhpU-1frAcS1Kyi-017Ual; Mon, 27 Aug 2018 21:57:48 +0200 From: Arnd Bergmann To: linux-media@vger.kernel.org Cc: y2038@lists.linaro.org, awalls@md.metrocast.net, hans.verkuil@cisco.com, mchehab@kernel.org, Arnd Bergmann , Alexander Viro , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 3/5] media: cec: move compat_ioctl handling to cec-api.c Date: Mon, 27 Aug 2018 21:56:23 +0200 Message-Id: <20180827195649.4170969-3-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180827195649.4170969-1-arnd@arndb.de> References: <20180827195649.4170969-1-arnd@arndb.de> X-Provags-ID: V03:K1:/0iNC4cnGPCle1odQAbs0mrIC1/OQGCfCsm/8n+B3StjPExvtlz eP6xpslKXsoTBmV1oGPUoXZ54KJtEsBSf1mU2ToNfG1jRIDY6IywLrfAaxWDW5g/bbk3ML1 VxrzKXVplT0znJa1giAUfiVWgJKwvDUgRGWjyYy0mOWo0ahINHQbi+fFVIsk2sy2FAyC5B9 vIhTyYHcwmeMHhOpOPayQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:L/QihZtH7rk=:fTjOl6Xr9HFl+q1frMpSKZ uME5psjSb8/clsVj6Rdw2oXwbEs2bt+6eoZloHbAdMQYlM1je2ZhAhpfuvV/AJ0mhuEbHIrHN 8hafgFMNLZvNrwWJ4YHj8/ySKcDLq/7YYameA6EHYSVTP3IoFvpCDQhKbcFXBlBBFzYnJujKK Odd/8/L6jbavYvn3z/J5rvgd5PcAqA2s8VJvZWE+8s/SGUVwzrwNIZ33I6X8d/MJEG2xgIgE1 K0DcklQ/Q9VrZGPu7x/8+k02ES+p/nI2opMSO8EDd37qYeQopORVI+rJOxo/+SZocngO5teAm 1XPI1u3D5G56xkWyi1MO2uPJXJSRcDNI84ckwtn2AY920+eaJZYDWqAV7bZqqsKAmieredFhA AELlPOh+es2B6clgMuvMo8Uz8vX23xo/Gd1s60MSWo67LogWGcBRWDTQ3Sl8X/jkDEYT12Iop gFgmDRnPL+fVlpls6A5GCIk87h3X/SWOkon+izuAxJfmLM6zijsJ0/+dEMWJZoLNPxZ7hPsM0 vuZngtbC0PPgyDgVtCc9FhWi2J92AuGwxhNI3kj8PWlOArwawpuLDp+tq4Hh8GG3dbl/ulV3l nBTlY69DhGkYEXB1204aPiZsQEPgs2iLz7dsbETzp7PZFTf1FTpKBHUlr2KpNXh7VPI9M0JPA yitNSK9GVjETd63DaiKTD1ZDIPwyY+8+ZHcGQplZHvrPOpJ0W1T7EItmlzDj9uFXOmbQ= Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP All the CEC ioctls are compatible, and they are only implemented in one driver, so we can simply let this driver handle them natively. Signed-off-by: Arnd Bergmann Reviewed-by: Hans Verkuil --- drivers/media/cec/cec-api.c | 1 + fs/compat_ioctl.c | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/media/cec/cec-api.c b/drivers/media/cec/cec-api.c index b6536bbad530..9067728feb60 100644 --- a/drivers/media/cec/cec-api.c +++ b/drivers/media/cec/cec-api.c @@ -665,6 +665,7 @@ const struct file_operations cec_devnode_fops = { .owner = THIS_MODULE, .open = cec_open, .unlocked_ioctl = cec_ioctl, + .compat_ioctl = cec_ioctl, .release = cec_release, .poll = cec_poll, .llseek = no_llseek, diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index e38e6c785459..33f48933a865 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -1195,18 +1195,6 @@ COMPATIBLE_IOCTL(VIDEO_CLEAR_BUFFER) COMPATIBLE_IOCTL(VIDEO_SET_STREAMTYPE) COMPATIBLE_IOCTL(VIDEO_SET_FORMAT) COMPATIBLE_IOCTL(VIDEO_GET_SIZE) -/* cec */ -COMPATIBLE_IOCTL(CEC_ADAP_G_CAPS) -COMPATIBLE_IOCTL(CEC_ADAP_G_LOG_ADDRS) -COMPATIBLE_IOCTL(CEC_ADAP_S_LOG_ADDRS) -COMPATIBLE_IOCTL(CEC_ADAP_G_PHYS_ADDR) -COMPATIBLE_IOCTL(CEC_ADAP_S_PHYS_ADDR) -COMPATIBLE_IOCTL(CEC_G_MODE) -COMPATIBLE_IOCTL(CEC_S_MODE) -COMPATIBLE_IOCTL(CEC_TRANSMIT) -COMPATIBLE_IOCTL(CEC_RECEIVE) -COMPATIBLE_IOCTL(CEC_DQEVENT) - /* joystick */ COMPATIBLE_IOCTL(JSIOCGVERSION) COMPATIBLE_IOCTL(JSIOCGAXES)