Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:
 "The main set of series of patches for media subsystem, including:
   - document RC sysfs class
   - added an API to setup scancode to allow waking up systems using the
     Remote Controller
   - add API for SDR devices.  Drivers are still on staging
   - some API improvements for getting EDID data from media
     inputs/outputs
   - new DVB frontend driver for drx-j (ATSC)
   - one driver (it913x/it9137) got removed, in favor of an improvement
     on another driver (af9035)
   - added a skeleton V4L2 PCI driver at documentation
   - added a dual flash driver (lm3646)
   - added a new IR driver (img-ir)
   - added an IR scancode decoder for the Sharp protocol
   - some improvements at the usbtv driver, to allow its core to be
     reused.
   - added a new SDR driver (rtl2832u_sdr)
   - added a new tuner driver (msi001)
   - several improvements at em28xx driver to fix PM support, device
     removal and to split the V4L2 specific bits into a separate
     sub-driver
   - one driver got converted to videobuf2 (s2255drv)
   - the e4000 tuner driver now follows an improved binding model
   - some fixes at V4L2 compat32 code
   - several fixes and enhancements at videobuf2 code
   - some cleanups at V4L2 API documentation
   - usual driver enhancements, new board additions and misc fixups"

[ NOTE! This merge effective drops commit 4329b93b283c ("of: Reduce
  indentation in of_graph_get_next_endpoint").

  The of_graph_get_next_endpoint() function was moved and renamed by
  commit fd9fdb78a9bf ("[media] of: move graph helpers from
  drivers/media/v4l2-core to drivers/of").  It was originally called
  v4l2_of_get_next_endpoint() and lived in the file
  drivers/media/v4l2-core/v4l2-of.c.

  In that original location, it was then fixed to support empty port
  nodes by commit b9db140c1e46 ("[media] v4l: of: Support empty port
  nodes"), and that commit clashes badly with the dropped "Reduce
  intendation" commit.  I had to choose one or the other, and decided
  that the "Support empty port nodes" commit was more important ]

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (426 commits)
  [media] em28xx-dvb: fix PCTV 461e tuner I2C binding
  Revert "[media] em28xx-dvb: fix PCTV 461e tuner I2C binding"
  [media] em28xx: fix PCTV 290e LNA oops
  [media] em28xx-dvb: fix PCTV 461e tuner I2C binding
  [media] m88ds3103: fix bug on .set_tone()
  [media] saa7134: fix WARN_ON during resume
  [media] v4l2-dv-timings: add module name, description, license
  [media] videodev2.h: add parenthesis around macro arguments
  [media] saa6752hs: depends on CRC32
  [media] si4713: fix Kconfig dependencies
  [media] Sensoray 2255 uses videobuf2
  [media] adv7180: free an interrupt on failure paths in init_device()
  [media] e4000: make VIDEO_V4L2 dependency optional
  [media] af9033: Don't export functions for the hardware filter
  [media] af9035: use af9033 PID filters
  [media] af9033: implement PID filter
  [media] rtl2832_sdr: do not use dynamic stack allocation
  [media] e4000: fix 32-bit build error
  [media] em28xx-audio: make sure audio is unmuted on open()
  [media] DocBook media: v4l2_format_sdr was renamed to v4l2_sdr_format
  ...

1 files changed, 41 insertions, 40 deletions

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 4557a142c752..f72d19b7e5d2 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2196,64 +2196,65 @@ struct device_node *of_graph_get_next_endpoint(const struct device_node *parent,
                                         struct device_node *prev)
 {
         struct device_node *endpoint;
-        struct device_node *port = NULL;
+        struct device_node *port;
 
         if (!parent)
                 return NULL;
 
+        /*
+         * Start by locating the port node. If no previous endpoint is specified
+         * search for the first port node, otherwise get the previous endpoint
+         * parent port node.
+         */
         if (!prev) {
                 struct device_node *node;
-                /*
-                 * It's the first call, we have to find a port subnode
-                 * within this node or within an optional 'ports' node.
-                 */
+
                 node = of_get_child_by_name(parent, "ports");
                 if (node)
                         parent = node;
 
                 port = of_get_child_by_name(parent, "port");
-
-                if (port) {
-                        /* Found a port, get an endpoint. */
-                        endpoint = of_get_next_child(port, NULL);
-                        of_node_put(port);
-                } else {
-                        endpoint = NULL;
-                }
-
-                if (!endpoint)
-                        pr_err("%s(): no endpoint nodes specified for %s\n",
-                               __func__, parent->full_name);
                 of_node_put(node);
 
-                return endpoint;
-        }
-
-        port = of_get_parent(prev);
-        if (WARN_ONCE(!port, "%s(): endpoint %s has no parent node\n",
-                      __func__, prev->full_name))
-                return NULL;
+                if (!port) {
+                        pr_err("%s(): no port node found in %s\n",
+                               __func__, parent->full_name);
+                        return NULL;
+                }
+        } else {
+                port = of_get_parent(prev);
+                if (WARN_ONCE(!port, "%s(): endpoint %s has no parent node\n",
+                              __func__, prev->full_name))
+                        return NULL;
 
-        /* Avoid dropping prev node refcount to 0. */
-        of_node_get(prev);
-        endpoint = of_get_next_child(port, prev);
-        if (endpoint) {
-                of_node_put(port);
-                return endpoint;
+                /*
+                 * Avoid dropping prev node refcount to 0 when getting the next
+                 * child below.
+                 */
+                of_node_get(prev);
         }
 
-        /* No more endpoints under this port, try the next one. */
-        do {
-                port = of_get_next_child(parent, port);
-                if (!port)
-                        return NULL;
-        } while (of_node_cmp(port->name, "port"));
+        while (1) {
+                /*
+                 * Now that we have a port node, get the next endpoint by
+                 * getting the next child. If the previous endpoint is NULL this
+                 * will return the first child.
+                 */
+                endpoint = of_get_next_child(port, prev);
+                if (endpoint) {
+                        of_node_put(port);
+                        return endpoint;
+                }
 
-        /* Pick up the first endpoint in this port. */
-        endpoint = of_get_next_child(port, NULL);
-        of_node_put(port);
+                /* No more endpoints under this port, try the next one. */
+                prev = NULL;
 
-        return endpoint;
+                do {
+                        port = of_get_next_child(parent, port);
+                        if (!port)
+                                return NULL;
+                } while (of_node_cmp(port->name, "port"));
+        }
 }
 EXPORT_SYMBOL(of_graph_get_next_endpoint);