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: 145211 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp342468ljw; Mon, 27 Aug 2018 12:58:08 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaPHEjH+n+/KMj9ida89ZOi42p9VyMKqOGoGzO5CESyucPzd6+boleSKzVJzR+hCMCo9K3V X-Received: by 2002:a62:e008:: with SMTP id f8-v6mr15758172pfh.208.1535399888607; Mon, 27 Aug 2018 12:58:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535399888; cv=none; d=google.com; s=arc-20160816; b=Rehe+Ui2nqcynz7ijDd23Y2sfCPcDedXh1EQoRJ7VLDkitJqzL+Atvz4r1DG65UXec 5Yabmtd5aIIrkSaA4tXPvPZ0DMxdSnShLEBXA4HZrn+OVrzUWXonkPBAxozJiTqUNfN9 Ys4GMGTudnkuqrm4jrkRXG58qdPHAA21AesDsi+5mCo4xUkwPA5FULk/+6ooXlSSZcVH t4KONV6iZ9vO4tEv3V+8o2Kg3xMZQoYHY62/yExax4wYGpLnhhjX37+X8cW3YLCSzi3E jo1caS5xaUX6pJQisuUOmNkCDsOsKeK7IZZuWfemfO0N/IgxLACsB0H/XvSq72scCpIG oVpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=u3YN7bEdb6qiutx4g577nl7rkhtRaIcAE77tkkiGpf0=; b=JLvyVmeY6fufplnKx4ts4Drz6+PHL1r1gvQhUQGzdVC/KgZ5m9I6dEfFfCM8Fv7EKA dv/CV/N7rGmSfe0KD/eq+YlqyfU/s+h2XozItvGxSSm4hA6CwQ5kSuaXn18UxakGWdWi WMzHKmdD3jTBHngEXThjzd8T6eYLM5jUCeUOtKWJywxJ4bj+ARxNjpiwVjJGjUT0KFLP Wil/iu8KeaSfDA30EsFuUdZABFLSViMrTCNMfxW/o6CD2Rf4PKKMbC+CB8Scg4qOWxTl SrhkXn92FGfxhPoJylGkYVLmoU3HhaGl2uSN7lcf/1xQWp3VseJ4JfPi3EQHa6l5st/h rowg== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 17-v6si148769pgl.35.2018.08.27.12.58.08; Mon, 27 Aug 2018 12:58:08 -0700 (PDT) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727454AbeH0XqI (ORCPT + 32 others); 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/media/cec/cec-api.c | 1 + fs/compat_ioctl.c | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) -- 2.18.0 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)