From patchwork Wed Oct 7 14:16:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 268297 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F00EFC41604 for ; Wed, 7 Oct 2020 14:17:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A4121208C7 for ; Wed, 7 Oct 2020 14:17:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728551AbgJGORS (ORCPT ); Wed, 7 Oct 2020 10:17:18 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:43469 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728177AbgJGORR (ORCPT ); Wed, 7 Oct 2020 10:17:17 -0400 Received: from threadripper.lan ([46.223.126.90]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1M597q-1kP3n2444S-001Eed; Wed, 07 Oct 2020 16:17:05 +0200 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Arnd Bergmann , Christoph Hellwig , Sakari Ailus , Hans Verkuil , Greg Kroah-Hartman , linux-media@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] media: atomisp: stop compiling compat_ioctl32 code Date: Wed, 7 Oct 2020 16:16:39 +0200 Message-Id: <20201007141702.655724-1-arnd@arndb.de> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:Y8yolA+G5ABS7GY1qc04KI0g31bAJ4qFTOWrC7wB9JyqMFjVS39 ggTk2D4jUgQc5Vj/zfr03QPo9rC7xsWQryhUAkc4EMD+9QO0LaO307+WDqxh5zxPgn2RPWK Wl8tk40ej/pMYPgpWEN0RRB9eobSSF8sWLrJ+83GE5Ze1uRnMQC6boJGXgxJsfZyp1/MFDV WWcBPROsuVRl5H7sZjUnw== X-UI-Out-Filterresults: notjunk:1; V03:K0:MTEbSjwluXQ=:bWkB9PicYlG4gxTxdFLtVA JGHZQHMszSUGvpCliIMJPHiQgHJID1ohNsejHNqy+Fuqum8B9wxGeP3b0UzGjsRRZFJWPPg0I hmj29ZfsOGli7iRbU5+RrwbLQtbvOxKK/Tp7LXLbPdGDdwg1uHNDDiAaN1/IV5pbbe32NRj74 s7wa1AorADScK51cQllqF0LRwTDZWmXmrpxodm07dW+ymvf01WQvb0U7YW0d1nkLq1uLfTUwv bfozCgrPAKkwww928BsruKB9Rs8shu3VU0FdBigOps6O1ioqrYopJWSpIHwqyZ/pdVhep++6o XD7ylMxdbGAEZdium6DRifZU6VHeldqiUdZH0bpiaNuVuHMb8cnpi3Lm/nft27H0bVgPO+qsw 57lVp4bzNeVHmPoNcbVZmT/kpDD04ym8vVjYiHhURgR3z52Ml5YtR1kpDqpFoqqH0+jKR/eM9 rc3cvUSIZ0fDSLOB5vxzE9zld/8fFrCx850EEL+24jOCXe9rZnsMuBgfHubsB/Kdrs0N5Ds6k MFDOZtT0Wi2DvzrC6hde7gCjmJFiNiEfBFp/3/yEVZYTJnqa/3HHPkpoVdZGuVg0PmtkxQLbu 7mRcvLcmDaHdu3EvsWT26Of/bSBKc2VbCbxSg4b2UX9Ak6L9jrl4jrLgTXMCki8PnX8tUUofi e7AInCix0kkkNxTgttzxd39uY0QbZyG4J4l8F1dj9FDpsulTiuqbbqk4L0w7Yp0xKMbJgt4a4 Qock1uVdrEPqgYRGWs4UdQ/qWJmsr0qvzPYgg/DuxOsKAEZhDQd6K0cQppL4CFm8p2GYy7uEX 4y3fi7p1xc9nCAnNIWjhCCkIElkhUwW/D/oEyzllZ2iFja/uRFspUACvVUq+pcmyakBRGEC Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This is one of the last remaining users of compat_alloc_user_space() and copy_in_user(), which are in the process of getting removed. As of commit 57e6b6f2303e ("media: atomisp_fops.c: disable atomisp_compat_ioctl32"), nothing in this file is actually getting used as the only reference has been stubbed out. Do the same thing here and stub out the implementation as well while leaving it in place, with a comment explaining the problem. Alternatively, the entire file could just be removed, since anyone willing to restore the functionality can equally well just look up the contents in the git history if needed. Cc: Christoph Hellwig Cc: Sakari Ailus Cc: Hans Verkuil Signed-off-by: Arnd Bergmann --- .../staging/media/atomisp/pci/atomisp_compat_ioctl32.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_ioctl32.c b/drivers/staging/media/atomisp/pci/atomisp_compat_ioctl32.c index e5553df5bad4..bc6ef902a520 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_compat_ioctl32.c +++ b/drivers/staging/media/atomisp/pci/atomisp_compat_ioctl32.c @@ -15,7 +15,15 @@ * * */ -#ifdef CONFIG_COMPAT + +/* + * The compat code is disabled for now, as compat_alloc_user_space() + * is in the process of getting removed. The compat_ioctl implementation + * here was already disabled in commit 57e6b6f2303e ("media: atomisp_fops.c: + * disable atomisp_compat_ioctl32"), so this is all dead code, but it + * is left for reference as long as something like it is in fact needed. + */ +#if 0 /* #ifdef CONFIG_COMPAT */ #include #include