Commit 8231ac7e authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: use NULL for zero wakeref_t instead of plain integer 0 



As of commit 2edc6a75 ("drm/i915: switch intel_wakeref_t underlying
type to struct ref_tracker *") we gained quite a few sparse warnings
about "Using plain integer as NULL pointer" for using 0 to initialize
wakeref_t. Switch to NULL everywhere.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarChaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241002181655.582597-1-jani.nikula@intel.com
parent 45c54864

drivers/gpu/drm/i915/display/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -7694,7 +7694,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) 
	struct intel_crtc_state *new_crtc_state, *old_crtc_state;

	struct intel_crtc *crtc;

	struct intel_power_domain_mask put_domains[I915_MAX_PIPES] = {};

	intel_wakeref_t wakeref = 0;

	intel_wakeref_t wakeref = NULL;

	int i;



	for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i)

drivers/gpu/drm/i915/display/intel_display_power.c

+3 −3
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ intel_display_power_get_if_enabled(struct drm_i915_private *dev_priv, 


	wakeref = intel_runtime_pm_get_if_in_use(&dev_priv->runtime_pm);

	if (!wakeref)

		return 0;

		return NULL;



	mutex_lock(&power_domains->lock);
@@ -560,7 +560,7 @@ intel_display_power_get_if_enabled(struct drm_i915_private *dev_priv, 


	if (!is_enabled) {

		intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref);

		wakeref = 0;

		wakeref = NULL;

	}



	return wakeref;
@@ -648,7 +648,7 @@ intel_display_power_put_async_work(struct work_struct *work) 
	struct i915_power_domains *power_domains = &dev_priv->display.power.domains;

	struct intel_runtime_pm *rpm = &dev_priv->runtime_pm;

	intel_wakeref_t new_work_wakeref = intel_runtime_pm_get_raw(rpm);

	intel_wakeref_t old_work_wakeref = 0;

	intel_wakeref_t old_work_wakeref = NULL;



	mutex_lock(&power_domains->lock);

drivers/gpu/drm/i915/display/intel_display_power.h

+2 −2
Original line number Diff line number Diff line
@@ -297,10 +297,10 @@ void gen9_dbuf_slices_update(struct drm_i915_private *dev_priv, 


#define with_intel_display_power(i915, domain, wf) \

	for ((wf) = intel_display_power_get((i915), (domain)); (wf); \

	     intel_display_power_put_async((i915), (domain), (wf)), (wf) = 0)

	     intel_display_power_put_async((i915), (domain), (wf)), (wf) = NULL)



#define with_intel_display_power_if_enabled(i915, domain, wf) \

	for ((wf) = intel_display_power_get_if_enabled((i915), (domain)); (wf); \

	     intel_display_power_put_async((i915), (domain), (wf)), (wf) = 0)

	     intel_display_power_put_async((i915), (domain), (wf)), (wf) = NULL)



#endif /* __INTEL_DISPLAY_POWER_H__ */

drivers/gpu/drm/i915/display/intel_pps.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ intel_wakeref_t intel_pps_unlock(struct intel_dp *intel_dp, 
	mutex_unlock(&display->pps.mutex);

	intel_display_power_put(dev_priv, POWER_DOMAIN_DISPLAY_CORE, wakeref);



	return 0;

	return NULL;

}



static void

drivers/gpu/drm/i915/gem/i915_gem_shrinker.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ i915_gem_shrink(struct i915_gem_ww_ctx *ww, 
		},

		{ NULL, 0 },

	}, *phase;

	intel_wakeref_t wakeref = 0;

	intel_wakeref_t wakeref = NULL;

	unsigned long count = 0;

	unsigned long scanned = 0;

	int err = 0, i = 0;