Commit ea3ce08c authored by Kefeng Wang's avatar Kefeng Wang Committed by Tvrtko Ursulin

drm/i915: use IOMEM_ERR_PTR() directly

Use IOMEM_ERR_PTR() instead of self defined IO_ERR_PTR().
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220503144937.679424-1-tvrtko.ursulin@linux.intel.com
parent 448a54ac
...@@ -548,7 +548,7 @@ void __iomem *i915_vma_pin_iomap(struct i915_vma *vma) ...@@ -548,7 +548,7 @@ void __iomem *i915_vma_pin_iomap(struct i915_vma *vma)
int err; int err;
if (WARN_ON_ONCE(vma->obj->flags & I915_BO_ALLOC_GPU_ONLY)) if (WARN_ON_ONCE(vma->obj->flags & I915_BO_ALLOC_GPU_ONLY))
return IO_ERR_PTR(-EINVAL); return IOMEM_ERR_PTR(-EINVAL);
if (!i915_gem_object_is_lmem(vma->obj)) { if (!i915_gem_object_is_lmem(vma->obj)) {
if (GEM_WARN_ON(!i915_vma_is_map_and_fenceable(vma))) { if (GEM_WARN_ON(!i915_vma_is_map_and_fenceable(vma))) {
...@@ -601,7 +601,7 @@ void __iomem *i915_vma_pin_iomap(struct i915_vma *vma) ...@@ -601,7 +601,7 @@ void __iomem *i915_vma_pin_iomap(struct i915_vma *vma)
err_unpin: err_unpin:
__i915_vma_unpin(vma); __i915_vma_unpin(vma);
err: err:
return IO_ERR_PTR(err); return IOMEM_ERR_PTR(err);
} }
void i915_vma_flush_writes(struct i915_vma *vma) void i915_vma_flush_writes(struct i915_vma *vma)
......
...@@ -317,7 +317,6 @@ static inline bool i915_node_color_differs(const struct drm_mm_node *node, ...@@ -317,7 +317,6 @@ static inline bool i915_node_color_differs(const struct drm_mm_node *node,
* Returns a valid iomapped pointer or ERR_PTR. * Returns a valid iomapped pointer or ERR_PTR.
*/ */
void __iomem *i915_vma_pin_iomap(struct i915_vma *vma); void __iomem *i915_vma_pin_iomap(struct i915_vma *vma);
#define IO_ERR_PTR(x) ((void __iomem *)ERR_PTR(x))
/** /**
* i915_vma_unpin_iomap - unpins the mapping returned from i915_vma_iomap * i915_vma_unpin_iomap - unpins the mapping returned from i915_vma_iomap
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment