Merge tag 'driver-core-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core updates from Greg KH:
 "Here are all of the driver core and related patches for 4.19-rc1.

  Nothing huge here, just a number of small cleanups and the ability to
  now stop the deferred probing after init happens.

  All of these have been in linux-next for a while with only a merge
  issue reported"

* tag 'driver-core-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (21 commits)
  base: core: Remove WARN_ON from link dependencies check
  drivers/base: stop new probing during shutdown
  drivers: core: Remove glue dirs from sysfs earlier
  driver core: remove unnecessary function extern declare
  sysfs.h: fix non-kernel-doc comment
  PM / Domains: Stop deferring probe at the end of initcall
  iommu: Remove IOMMU_OF_DECLARE
  iommu: Stop deferring probe at end of initcalls
  pinctrl: Support stopping deferred probe after initcalls
  dt-bindings: pinctrl: add a 'pinctrl-use-default' property
  driver core: allow stopping deferred probe after init
  driver core: add a debugfs entry to show deferred devices
  sysfs: Fix internal_create_group() for named group updates
  base: fix order of OF initialization
  linux/device.h: fix kernel-doc notation warning
  Documentation: update firmware loader fallback reference
  kobject: Replace strncpy with memcpy
  drivers: base: cacheinfo: use OF property_read_u32 instead of get_property,read_number
  kernfs: Replace strncpy with memcpy
  device: Add #define dev_fmt similar to #define pr_fmt
  ...

1 files changed, 11 insertions, 4 deletions

diff --git a/drivers/pinctrl/devicetree.c b/drivers/pinctrl/devicetree.c
index c4aa411f5935..2969ff3162c3 100644
--- a/drivers/pinctrl/devicetree.c
+++ b/drivers/pinctrl/devicetree.c
@@ -111,17 +111,24 @@ static int dt_to_map_one_config(struct pinctrl *p,
         int ret;
         struct pinctrl_map *map;
         unsigned num_maps;
+        bool allow_default = false;
 
         /* Find the pin controller containing np_config */
         np_pctldev = of_node_get(np_config);
         for (;;) {
+                if (!allow_default)
+                        allow_default = of_property_read_bool(np_pctldev,
+                                                              "pinctrl-use-default");
+
                 np_pctldev = of_get_next_parent(np_pctldev);
                 if (!np_pctldev || of_node_is_root(np_pctldev)) {
-                        dev_info(p->dev, "could not find pctldev for node %pOF, deferring probe\n",
-                                np_config);
                         of_node_put(np_pctldev);
-                        /* OK let's just assume this will appear later then */
-                        return -EPROBE_DEFER;
+                        ret = driver_deferred_probe_check_state(p->dev);
+                        /* keep deferring if modules are enabled unless we've timed out */
+                        if (IS_ENABLED(CONFIG_MODULES) && !allow_default && ret == -ENODEV)
+                                ret = -EPROBE_DEFER;
+
+                        return ret;
                 }
                 /* If we're creating a hog we can use the passed pctldev */
                 if (hog_pctldev && (np_pctldev == p->dev->of_node)) {