drm/i915: Replace "_load" with "_probe" consequently

Use the "_probe" nomenclature not only in i915_driver_probe() helper
name but also in other related function / variable names for
consistency.  Only the userspace exposed name of a related module
parameter is left untouched.

Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190712112429.740-4-janusz.krzysztofik@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
index 41310f8e5a2abed3d48568a8ed088c6c004e07ff..d0163d86c42ab13f0579dc9d46294e90ead50a6d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_connector.c
+++ b/drivers/gpu/drm/i915/display/intel_connector.c
@@ -118,7 +118,7 @@ int intel_connector_register(struct drm_connector *connector)
        if (ret)
                goto err;
 
-       if (i915_inject_load_failure()) {
+       if (i915_inject_probe_failure()) {
                ret = -EFAULT;
                goto err_backlight;
        }

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index 76b5c068a26d4f372e74b368138bd39ab1d3d289..2dc1917b9d3081e5b489af591deb9f484352adc9 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -426,7 +426,7 @@ int intel_engines_init_mmio(struct drm_i915_private *i915)
        WARN_ON(engine_mask &
                GENMASK(BITS_PER_TYPE(mask) - 1, I915_NUM_ENGINES));
 
-       if (i915_inject_load_failure())
+       if (i915_inject_probe_failure())
                return -ENODEV;
 
        for (i = 0; i < ARRAY_SIZE(intel_engines); i++) {

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 9488aa3cb9ccba8fdb9f131aaa2dce9f59cfe94b..7371571d735db6c8b999d5399e882e2caf6864cc 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -81,14 +81,14 @@
 static struct drm_driver driver;
 
 #if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
-static unsigned int i915_load_fail_count;
+static unsigned int i915_probe_fail_count;
 
-bool __i915_inject_load_failure(const char *func, int line)
+bool __i915_inject_probe_failure(const char *func, int line)
 {
-       if (i915_load_fail_count >= i915_modparams.inject_load_failure)
+       if (i915_probe_fail_count >= i915_modparams.inject_load_failure)
                return false;
 
-       if (++i915_load_fail_count == i915_modparams.inject_load_failure) {
+       if (++i915_probe_fail_count == i915_modparams.inject_load_failure) {
                DRM_INFO("Injecting failure at checkpoint %u [%s:%d]\n",
                         i915_modparams.inject_load_failure, func, line);
                i915_modparams.inject_load_failure = 0;
@@ -100,7 +100,7 @@ bool __i915_inject_load_failure(const char *func, int line)
 
 bool i915_error_injected(void)
 {
-       return i915_load_fail_count && !i915_modparams.inject_load_failure;
+       return i915_probe_fail_count && !i915_modparams.inject_load_failure;
 }
 
 #endif
@@ -687,7 +687,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
        struct pci_dev *pdev = dev_priv->drm.pdev;
        int ret;
 
-       if (i915_inject_load_failure())
+       if (i915_inject_probe_failure())
                return -ENODEV;
 
        if (HAS_DISPLAY(dev_priv)) {
@@ -903,7 +903,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv)
 {
        int ret = 0;
 
-       if (i915_inject_load_failure())
+       if (i915_inject_probe_failure())
                return -ENODEV;
 
        intel_device_info_subplatform_init(dev_priv);
@@ -997,7 +997,7 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv)
 {
        int ret;
 
-       if (i915_inject_load_failure())
+       if (i915_inject_probe_failure())
                return -ENODEV;
 
        if (i915_get_bridge_dev(dev_priv))
@@ -1541,7 +1541,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
        struct pci_dev *pdev = dev_priv->drm.pdev;
        int ret;
 
-       if (i915_inject_load_failure())
+       if (i915_inject_probe_failure())
                return -ENODEV;
 
        intel_device_info_runtime_init(dev_priv);
@@ -1947,7 +1947,7 @@ out_runtime_pm_put:
 out_pci_disable:
        pci_disable_device(pdev);
 out_fini:
-       i915_load_error(dev_priv, "Device initialization failed (%d)\n", ret);
+       i915_probe_error(dev_priv, "Device initialization failed (%d)\n", ret);
        i915_driver_destroy(dev_priv);
        return ret;
 }

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index b644f54abec27ad6eae36561094fc33ef4469361..af07d8d4ac10ce8b1204679de43eb213ce179a28 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -122,20 +122,20 @@
 
 #if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
 
-bool __i915_inject_load_failure(const char *func, int line);
-#define i915_inject_load_failure() \
-       __i915_inject_load_failure(__func__, __LINE__)
+bool __i915_inject_probe_failure(const char *func, int line);
+#define i915_inject_probe_failure() \
+       __i915_inject_probe_failure(__func__, __LINE__)
 
 bool i915_error_injected(void);
 
 #else
 
-#define i915_inject_load_failure() false
+#define i915_inject_probe_failure() false
 #define i915_error_injected() false
 
 #endif
 
-#define i915_load_error(i915, fmt, ...)                                         \
+#define i915_probe_error(i915, fmt, ...)                                  \
        __i915_printk(i915, i915_error_injected() ? KERN_DEBUG : KERN_ERR, \
                      fmt, ##__VA_ARGS__)
 

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 7ade42b8ec991dd1e246e03c784d860b49cb9448..01520874140539a9287c083f7f61c836e2fa95ea 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1515,12 +1515,12 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
        if (ret)
                goto err_gt;
 
-       if (i915_inject_load_failure()) {
+       if (i915_inject_probe_failure()) {
                ret = -ENODEV;
                goto err_gt;
        }
 
-       if (i915_inject_load_failure()) {
+       if (i915_inject_probe_failure()) {
                ret = -EIO;
                goto err_gt;
        }
@@ -1582,8 +1582,8 @@ err_uc_misc:
                 * for all other failure, such as an allocation failure, bail.
                 */
                if (!i915_reset_failed(dev_priv)) {
-                       i915_load_error(dev_priv,
-                                       "Failed to initialize GPU, declaring it wedged!\n");
+                       i915_probe_error(dev_priv,
+                                        "Failed to initialize GPU, declaring it wedged!\n");
                        i915_gem_set_wedged(dev_priv);
                }
 

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 49558727b5f306454a343a7a37e3562fe08d844b..95763ad922876aa175d60021fba6ec2d7a3c4dd9 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -957,7 +957,7 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (err)
                return err;
 
-       if (i915_inject_load_failure()) {
+       if (i915_inject_probe_failure()) {
                i915_pci_remove(pdev);
                return -ENODEV;
        }

diff --git a/drivers/gpu/drm/i915/intel_gvt.c b/drivers/gpu/drm/i915/intel_gvt.c
index 1d7d26e4cf14f7f2e7d3c4988a354d9d5c82f62b..842ee26effd4db9831ae1ea80014bf9b6e4b3ee0 100644 (file)
--- a/drivers/gpu/drm/i915/intel_gvt.c
+++ b/drivers/gpu/drm/i915/intel_gvt.c
@@ -95,7 +95,7 @@ int intel_gvt_init(struct drm_i915_private *dev_priv)
 {
        int ret;
 
-       if (i915_inject_load_failure())
+       if (i915_inject_probe_failure())
                return -ENODEV;
 
        if (!i915_modparams.enable_gvt) {

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 4015e964c6fc186bf6fc27b445eb47e3f56f2b79..475ab3d4d91de585b14fd123e1f762bc8d749b17 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -1331,7 +1331,7 @@ static int __fw_domain_init(struct intel_uncore *uncore,
        GEM_BUG_ON(domain_id >= FW_DOMAIN_ID_COUNT);
        GEM_BUG_ON(uncore->fw_domain[domain_id]);
 
-       if (i915_inject_load_failure())
+       if (i915_inject_probe_failure())
                return -ENOMEM;
 
        d = kzalloc(sizeof(*d), GFP_KERNEL);

diff --git a/drivers/gpu/drm/i915/intel_wopcm.c b/drivers/gpu/drm/i915/intel_wopcm.c
index 8c850785e4b40ce2d4a939cf34ce26b5e6e8a589..a6bc15bc7be32f4e61bfdbcfc2724d173240fc9a 100644 (file)
--- a/drivers/gpu/drm/i915/intel_wopcm.c
+++ b/drivers/gpu/drm/i915/intel_wopcm.c
@@ -177,7 +177,7 @@ int intel_wopcm_init(struct intel_wopcm *wopcm)
 
        GEM_BUG_ON(!wopcm->size);
 
-       if (i915_inject_load_failure())
+       if (i915_inject_probe_failure())
                return -E2BIG;
 
        if (guc_fw_size >= wopcm->size) {