diff options
| author |   Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> | 2019-07-12 13:24:27 +0200 |
|---|---|---|
| committer |   Chris Wilson <chris@chris-wilson.co.uk> | 2019-07-12 13:05:02 +0100 |
| commit | f2db53f14d3d1cde1d4c3b5b5aaba556c953f2f5 (patch) | |
| tree | 7c981e0f5fcc7573eb7692ef78f42b84e1f1c76b /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: Rename "_load"/"_unload" to match PCI entry points (diff) | |
| download | linux-dev-f2db53f14d3d1cde1d4c3b5b5aaba556c953f2f5.tar.xz linux-dev-f2db53f14d3d1cde1d4c3b5b5aaba556c953f2f5.zip | |
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
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 7ade42b8ec99..015208741405 100644 --- 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); } |