git.openwrt.org Git - openwrt/staging/981213.git/blob

   1 From b0f01086e440516c03ce61e5597b9a0d2df0a1c0 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
   3 Date: Wed, 1 Nov 2017 16:17:43 +0000
   4 Subject: [PATCH 333/454] bcm2835-unicam: Revert changes for notifier fn ptrs
   5
   6 4.15 is using const function pointers for the notifier
   7 functions. Those changes don't cherry-pick easily, so
   8 revert those mods in this driver.
   9
  10 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  11 ---
  12  drivers/media/platform/bcm2835/bcm2835-unicam.c | 8 ++------
  13  1 file changed, 2 insertions(+), 6 deletions(-)
  14
  15 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
  16 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
  17 @@ -1833,11 +1833,6 @@ static int unicam_async_complete(struct
  18         return unicam_probe_complete(unicam);
  19  }
  20
  21 -static const struct v4l2_async_notifier_operations unicam_async_ops = {
  22 -       .bound = unicam_async_bound,
  23 -       .complete = unicam_async_complete,
  24 -};
  25 -
  26  static int of_unicam_connect_subdevs(struct unicam_device *dev)
  27  {
  28         struct platform_device *pdev = dev->pdev;
  29 @@ -1956,7 +1951,8 @@ static int of_unicam_connect_subdevs(str
  30         subdevs[0] = asd;
  31         dev->notifier.subdevs = subdevs;
  32         dev->notifier.num_subdevs = 1;
  33 -       dev->notifier.ops = &unicam_async_ops;
  34 +       dev->notifier.bound = unicam_async_bound;
  35 +       dev->notifier.complete = unicam_async_complete;
  36         ret = v4l2_async_notifier_register(&dev->v4l2_dev,
  37                                            &dev->notifier);
  38         if (ret) {