]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
driver core: Let dev_of_node() accept a NULL dev
authorStephen Boyd <sboyd@kernel.org>
Fri, 12 Apr 2019 18:31:45 +0000 (11:31 -0700)
committerStephen Boyd <sboyd@kernel.org>
Fri, 19 Apr 2019 21:24:32 +0000 (14:24 -0700)
We'd like to chain this in places where the 'dev' argument might be
NULL. Let this function take a NULL 'dev' so this can work.

Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Jeffrey Hugo <jhugo@codeaurora.org>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Rob Herring <robh@kernel.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tested-by: Jeffrey Hugo <jhugo@codeaurora.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
include/linux/device.h

index b425a7ee04ce4d2a56f4ed951ae4c7f6779818fd..0370dd0b3ae7dbdd4b7e79ac154721d45cdd3468 100644 (file)
@@ -1231,7 +1231,7 @@ static inline void device_lock_assert(struct device *dev)
 
 static inline struct device_node *dev_of_node(struct device *dev)
 {
-       if (!IS_ENABLED(CONFIG_OF))
+       if (!IS_ENABLED(CONFIG_OF) || !dev)
                return NULL;
        return dev->of_node;
 }