From patchwork Tue Aug 8 17:21:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scheller X-Patchwork-Id: 9888847 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1736C60363 for ; Tue, 8 Aug 2017 17:21:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF6FA289A9 for ; Tue, 8 Aug 2017 17:21:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E41C1289AB; Tue, 8 Aug 2017 17:21:27 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 7A10F289D4 for ; Tue, 8 Aug 2017 17:21:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752227AbdHHRV0 (ORCPT ); Tue, 8 Aug 2017 13:21:26 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34757 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752218AbdHHRVZ (ORCPT ); Tue, 8 Aug 2017 13:21:25 -0400 Received: by mail-wm0-f68.google.com with SMTP id x64so4217240wmg.1 for ; Tue, 08 Aug 2017 10:21:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=krMj1fTIBSwcG+Krgur7SyHgqRaf//NXizaFXBXdMbc=; b=aWN+g3Il3NizvQ1Xz+XE3kno1lN4PGhv/j0uOziM3JCHNCcXhzozhZMyNl4gFoV4hg IWNaclI1E6wZSDHtKPIKOet5CZqSWpPM9dPs+JyQazzuSYveQH3z/H2WjafRtmBvP+Mo MNbgj2y8lrEquvvcm6xT3DqnCq57IJ2RZ98XphiI/sfgqDWstYbHlrSexo3cJvO/IQRD Y7zP5+ibZdk42bVe08P4QPC9j7glZ7jH2oUEexe8TiI5Ibv+ckwNzNJYySc9KYw4JgZi 83m3TyglfR3c27g2wchpSne/F+8XqXZfZ5sw36Q/e78wu4IDSfISbwSaNwF84+5B6xiI jkpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=krMj1fTIBSwcG+Krgur7SyHgqRaf//NXizaFXBXdMbc=; b=pnACr8XWQ9XWZdyShrNWHemp/7f3KmPoxWEje25zARrdwhdA2WqNhY5NXse8qUERjv vZBFuJsVh+oYwlfIovyGVuUJg5xdkhnMbVB7eCT4asESYVzRGONnJKD8LHlN0HciL1Y3 MC2KqypJ9fL1bttGYoA8FKOKyOuckYZduk5IC3pokLvC1/PWGzrzQWxRNZxHO9Rpcipk Qo1+N4eSMh4qHMZ5d5JfWCej7oFmCwsrhTtLuSxk+BjwKK2KxyrKUKCMkPeF8NNDzyeU jUDOaw+hmZFyVz5PZGAXB+OmMZKB0Di7vs90rMrXenRTqm1903W8ZbFsfERI0iywyj0/ pUxQ== X-Gm-Message-State: AHYfb5jON4SfpYmVElj1h3oNdS+Gt4LOQhUGC0C2hJOV7IJ50wn9cJJH EmHBOMdtvkzR4Wcb X-Received: by 10.28.87.193 with SMTP id l184mr3180185wmb.121.1502212884252; Tue, 08 Aug 2017 10:21:24 -0700 (PDT) Received: from dvbdev.wuest.de (ip-84-118-193-88.unity-media.net. [84.118.193.88]) by smtp.gmail.com with ESMTPSA id x4sm1677042wrd.66.2017.08.08.10.21.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Aug 2017 10:21:23 -0700 (PDT) From: Daniel Scheller To: linux-media@vger.kernel.org, hverkuil@xs4all.nl Cc: mchehab@kernel.org, jasmin@anw.at Subject: [PATCH] [media_build] Fixup api_version.patch after version field removals Date: Tue, 8 Aug 2017 19:21:21 +0200 Message-Id: <20170808172121.10932-1-d.scheller.oss@gmail.com> X-Mailer: git-send-email 2.13.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel Scheller Fixes prepatching wrt commit 2bd8682375f3 ("media: media-device: remove driver_version" and commit 71269bf607bc ("media: uvc: don't set driver_version") Signed-off-by: Daniel Scheller --- backports/api_version.patch | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/backports/api_version.patch b/backports/api_version.patch index 892bcbb..7bf3723 100644 --- a/backports/api_version.patch +++ b/backports/api_version.patch @@ -11,41 +11,6 @@ index 0860fb458757..60fd48214142 100644 if (copy_to_user(parg, &caps, sizeof(caps))) return -EFAULT; return 0; -diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c -index 760e3e424e23..b1887870172d 100644 ---- a/drivers/media/media-device.c -+++ b/drivers/media/media-device.c -@@ -834,7 +834,7 @@ void media_device_pci_init(struct media_device *mdev, - mdev->hw_revision = (pci_dev->subsystem_vendor << 16) - | pci_dev->subsystem_device; - -- mdev->driver_version = LINUX_VERSION_CODE; -+ mdev->driver_version = V4L2_VERSION; - - media_device_init(mdev); - } -@@ -863,7 +863,7 @@ void __media_device_usb_init(struct media_device *mdev, - strlcpy(mdev->serial, udev->serial, sizeof(mdev->serial)); - usb_make_path(udev, mdev->bus_info, sizeof(mdev->bus_info)); - mdev->hw_revision = le16_to_cpu(udev->descriptor.bcdDevice); -- mdev->driver_version = LINUX_VERSION_CODE; -+ mdev->driver_version = V4L2_VERSION; - - media_device_init(mdev); - } -diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c -index 70842c5af05b..2b719f80de15 100644 ---- a/drivers/media/usb/uvc/uvc_driver.c -+++ b/drivers/media/usb/uvc/uvc_driver.c -@@ -2096,7 +2096,7 @@ static int uvc_probe(struct usb_interface *intf, - sizeof(dev->mdev.serial)); - strcpy(dev->mdev.bus_info, udev->devpath); - dev->mdev.hw_revision = le16_to_cpu(udev->descriptor.bcdDevice); -- dev->mdev.driver_version = LINUX_VERSION_CODE; -+ dev->mdev.driver_version = V4L2_VERSION; - media_device_init(&dev->mdev); - - dev->vdev.mdev = &dev->mdev; diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 4f27cfa134a1..e0fb14c851d5 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c