From patchwork Mon Aug 27 19:56:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 145210 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp342009ljw; Mon, 27 Aug 2018 12:57:39 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbRDbqpV1NJxCSo9PLlCghJW/ndYQTZLoybOX9kA4eMqQG16Af+RsMnmIspTCvFJEI3JDRP X-Received: by 2002:a63:380d:: with SMTP id f13-v6mr13483046pga.124.1535399859238; Mon, 27 Aug 2018 12:57:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535399859; cv=none; d=google.com; s=arc-20160816; b=nVZ9u3XZ0nN1l0Qt4eGChSXl7Wh+dZhX4uu0CbvZlW7LS5GfJj7cTRHweBp7j34MF5 O9jNmRnch90AzU6/SYUWVUsjTrxfRYoDBb9acUs2DdBBJ4WGw92EpFhGl3avrFxMcH/Q j4jqj1eSV3/Xey0O+qf97m94pNgNMj1qHSCmyESaLAseSwdQJJOiu9gFZgNGRoho/ek5 WQqL6hTMeJQ3yVjnGl50ZwmNUqStuifRh7/E8HCoIv7lyfhMANTIvtWX8bIMqRS1/R6o ibzZNyK6cyE8sBqvF1DBluNv9mLrJ4DyJAh30rkodMd4jNgSaeI/2IqH+Tbp89lbr0gT zMQg== 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=9PgDszU5rMDcdECsrj0I+t/nul///VfMWBRhWYhKIiM=; b=fvOb0y+NUXPDY7ok9mp1F8sAtrK2t+cb+Mdx7PsmzhSCtIEQ3mbmukMlKBectetP4s /qyKgyOXDdiI9kJagNvOwP3P8Vb+ljutmCAws0nQSiqU8yd7LbQ+6GnOV6v9AJLl8Xcw DbrgqvWSOtmMwHrzlT2cOhlyP1SEh404vpTXsjVfLxPeHMGZGl8kDXHugmp/uLRXka5T apKZkuVPInrmrGQ1i7s+p5yzvRj32RXrfsDocWpvDBsHgPUU4LbwkinS6BOJ8waHFhgJ bPvsryEiOZNnTvNFDsv4kDQw4+cxxAnQBpg5OWvO5v73/GL7RcLhjmwbxzBUeYoly9Tx M7ng== 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 x69-v6si125943pfe.318.2018.08.27.12.57.34; Mon, 27 Aug 2018 12:57:39 -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 S1727397AbeH0Xpe (ORCPT + 32 others); Mon, 27 Aug 2018 19:45:34 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:48751 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726826AbeH0Xpe (ORCPT ); Mon, 27 Aug 2018 19:45:34 -0400 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0MYtjH-1gPwsS1p6x-00VgKm; Mon, 27 Aug 2018 21:57:23 +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 2/5] media: dvb: dmxdev: move compat_ioctl handling to dmxdev.c Date: Mon, 27 Aug 2018 21:56:22 +0200 Message-Id: <20180827195649.4170969-2-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:yTkrd/yrjsF6qtZdVKa/vLv63bnVKSH1NuE9jpO3NEH7s1zpvS7 u2e1jccmxFmgrH3egH+2ieGwATqsEsoyBfgs+obMnr0LDH0EEWKk0bMFlTfahG1aWZjaKE+ 9YRHqv0N2+Qe67nyXso4EuFRSC809cVMPBoDJcdScA649ObAGkLWNe5OpTzC/TXPLikgWH9 a7bKUyHu8+qJf9yaxE8VQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:7zi6iiAcuBM=:oqJE6+6IuJyI7LJucSvC+d 81o5oURdZIDYptMOHo4MvX9FwCoOSUMF8CJYIsgwpLFM3jsCpQ+cLCHR1O9IvggtzgdjJrQEE vR7s0fFID7RSlZAIky8LCZCuXrvZ5dyJl153xEVrlEASgsh4JpTdI5d6p5BK0CaIBmul+QRjV NLP9uxDQ1mtFpFoHHwjlRAtC62I3dvQvbVoOKyrAINaCXyQBwY2KDVWC5nB4R7U+TpQOwnJaP 6N/vnFuKN32oYgEJVS6lqazonAr2+YepxWgTXoZkAXJmLOeKV3dElZoxRPp/DU1+0IoshyYxb SJht8zgbmIDlaYpIxjpSSUsvc0UmtSU/L+SxC47mby5TGiabQ+3RCxkXwvlDgypOxgCdd+7NR t535hc3mv+aEyY8Bp4iu4+4dFRtVtnOvxEypmKIO3HuN0NZ3fv1hU9ccOJz3TonfxY9Rw3+sX 60haI1U2PkjmAeNqYKgZFrEJfK99xdtB+o468ChRKNNy3zijdqafnCOMQ4KcrpjSpEnznOCe7 eJ3uXMd030T3w/HJFVQAOfv1T6YYBTzSOoQERhF/2BjDmpnv5r1HPODCUDv9EUeT0owwXp4lF +QYlw1HXE0DRiNVNJkD5YnFXAvOy75yoosK34Yblic3GomIafpCwJoSzGVEjsxOKo7haZ9g+t 80UkcjvH36L8HuP6dYwOIhcqR0Si/E8yOPuWyxNs0IBI5abcnBNrdQX6ZhC3cxSZa1H4= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org All dmx ioctls are compatible, and they are only implemented in one file, so we can replace the list of commands in fs/compat_ioctl.c with a single line in dmxdev. Signed-off-by: Arnd Bergmann --- drivers/media/dvb-core/dmxdev.c | 1 + fs/compat_ioctl.c | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) -- 2.18.0 diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c index d548f98c7a67..1544e8cef564 100644 --- a/drivers/media/dvb-core/dmxdev.c +++ b/drivers/media/dvb-core/dmxdev.c @@ -1265,6 +1265,7 @@ static const struct file_operations dvb_demux_fops = { .owner = THIS_MODULE, .read = dvb_demux_read, .unlocked_ioctl = dvb_demux_ioctl, + .compat_ioctl = dvb_demux_ioctl, .open = dvb_demux_open, .release = dvb_demux_release, .poll = dvb_demux_poll, diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 0c46ce224590..e38e6c785459 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -1180,18 +1180,6 @@ COMPATIBLE_IOCTL(AUDIO_CLEAR_BUFFER) COMPATIBLE_IOCTL(AUDIO_SET_ID) COMPATIBLE_IOCTL(AUDIO_SET_MIXER) COMPATIBLE_IOCTL(AUDIO_SET_STREAMTYPE) -COMPATIBLE_IOCTL(DMX_START) -COMPATIBLE_IOCTL(DMX_STOP) -COMPATIBLE_IOCTL(DMX_SET_FILTER) -COMPATIBLE_IOCTL(DMX_SET_PES_FILTER) -COMPATIBLE_IOCTL(DMX_SET_BUFFER_SIZE) -COMPATIBLE_IOCTL(DMX_GET_PES_PIDS) -COMPATIBLE_IOCTL(DMX_GET_STC) -COMPATIBLE_IOCTL(DMX_REQBUFS) -COMPATIBLE_IOCTL(DMX_QUERYBUF) -COMPATIBLE_IOCTL(DMX_EXPBUF) -COMPATIBLE_IOCTL(DMX_QBUF) -COMPATIBLE_IOCTL(DMX_DQBUF) COMPATIBLE_IOCTL(VIDEO_STOP) COMPATIBLE_IOCTL(VIDEO_PLAY) COMPATIBLE_IOCTL(VIDEO_FREEZE)