mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 06:44:00 -04:00
drm/i915: use NULL for zero wakeref_t instead of plain integer 0
As of commit 2edc6a75f2 ("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: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241002181655.582597-1-jani.nikula@intel.com
This commit is contained in:
@@ -27,11 +27,11 @@ int __intel_wakeref_get_first(struct intel_wakeref *wf)
|
||||
if (!atomic_read(&wf->count)) {
|
||||
INTEL_WAKEREF_BUG_ON(wf->wakeref);
|
||||
wf->wakeref = wakeref;
|
||||
wakeref = 0;
|
||||
wakeref = NULL;
|
||||
|
||||
ret = wf->ops->get(wf);
|
||||
if (ret) {
|
||||
wakeref = xchg(&wf->wakeref, 0);
|
||||
wakeref = xchg(&wf->wakeref, NULL);
|
||||
wake_up_var(&wf->wakeref);
|
||||
goto unlock;
|
||||
}
|
||||
@@ -52,7 +52,7 @@ unlock:
|
||||
|
||||
static void ____intel_wakeref_put_last(struct intel_wakeref *wf)
|
||||
{
|
||||
intel_wakeref_t wakeref = 0;
|
||||
intel_wakeref_t wakeref = NULL;
|
||||
|
||||
INTEL_WAKEREF_BUG_ON(atomic_read(&wf->count) <= 0);
|
||||
if (unlikely(!atomic_dec_and_test(&wf->count)))
|
||||
@@ -61,7 +61,7 @@ static void ____intel_wakeref_put_last(struct intel_wakeref *wf)
|
||||
/* ops->put() must reschedule its own release on error/deferral */
|
||||
if (likely(!wf->ops->put(wf))) {
|
||||
INTEL_WAKEREF_BUG_ON(!wf->wakeref);
|
||||
wakeref = xchg(&wf->wakeref, 0);
|
||||
wakeref = xchg(&wf->wakeref, NULL);
|
||||
wake_up_var(&wf->wakeref);
|
||||
}
|
||||
|
||||
@@ -107,7 +107,7 @@ void __intel_wakeref_init(struct intel_wakeref *wf,
|
||||
|
||||
__mutex_init(&wf->mutex, "wakeref.mutex", &key->mutex);
|
||||
atomic_set(&wf->count, 0);
|
||||
wf->wakeref = 0;
|
||||
wf->wakeref = NULL;
|
||||
|
||||
INIT_DELAYED_WORK(&wf->work, __intel_wakeref_put_work);
|
||||
lockdep_init_map(&wf->work.work.lockdep_map,
|
||||
@@ -142,7 +142,7 @@ static void wakeref_auto_timeout(struct timer_list *t)
|
||||
if (!refcount_dec_and_lock_irqsave(&wf->count, &wf->lock, &flags))
|
||||
return;
|
||||
|
||||
wakeref = fetch_and_zero(&wf->wakeref);
|
||||
wakeref = xchg(&wf->wakeref, NULL);
|
||||
spin_unlock_irqrestore(&wf->lock, flags);
|
||||
|
||||
intel_runtime_pm_put(&wf->i915->runtime_pm, wakeref);
|
||||
@@ -154,7 +154,7 @@ void intel_wakeref_auto_init(struct intel_wakeref_auto *wf,
|
||||
spin_lock_init(&wf->lock);
|
||||
timer_setup(&wf->timer, wakeref_auto_timeout, 0);
|
||||
refcount_set(&wf->count, 0);
|
||||
wf->wakeref = 0;
|
||||
wf->wakeref = NULL;
|
||||
wf->i915 = i915;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user