| Message ID | 20240507090200.7936-2-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/arm/comeda: don't use confusing 'timeout' variable name | expand |
On Tue, May 07, 2024 at 11:02:01AM +0200, Wolfram Sang wrote: > There is a confusing pattern in the kernel to use a variable named 'timeout' to > store the result of wait_for_completion_timeout() causing patterns like: > > timeout = wait_for_completion_timeout(...) > if (!timeout) return -ETIMEDOUT; > > with all kinds of permutations. Check the return value directly to drop > 'timeout' which also fixes its wrong type. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Acked-by: Liviu Dudau <liviu.dudau@arm.com> I will change the subject line to s/comeda/komeda/ when merging it. Best regards, Liviu > --- > drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c > index 2c661f28410e..9bec59cf9c06 100644 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c > @@ -294,7 +294,6 @@ komeda_crtc_flush_and_wait_for_flip_done(struct komeda_crtc *kcrtc, > struct komeda_dev *mdev = kcrtc->master->mdev; > struct completion *flip_done; > struct completion temp; > - int timeout; > > /* if caller doesn't send a flip_done, use a private flip_done */ > if (input_flip_done) { > @@ -308,8 +307,7 @@ komeda_crtc_flush_and_wait_for_flip_done(struct komeda_crtc *kcrtc, > mdev->funcs->flush(mdev, kcrtc->master->id, 0); > > /* wait the flip take affect.*/ > - timeout = wait_for_completion_timeout(flip_done, HZ); > - if (timeout == 0) { > + if (wait_for_completion_timeout(flip_done, HZ) == 0) { > DRM_ERROR("wait pipe%d flip done timeout\n", kcrtc->master->id); > if (!input_flip_done) { > unsigned long flags; > -- > 2.43.0 >
> I will change the subject line to s/comeda/komeda/ when merging it.
Oh, thank you!
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c index 2c661f28410e..9bec59cf9c06 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -294,7 +294,6 @@ komeda_crtc_flush_and_wait_for_flip_done(struct komeda_crtc *kcrtc, struct komeda_dev *mdev = kcrtc->master->mdev; struct completion *flip_done; struct completion temp; - int timeout; /* if caller doesn't send a flip_done, use a private flip_done */ if (input_flip_done) { @@ -308,8 +307,7 @@ komeda_crtc_flush_and_wait_for_flip_done(struct komeda_crtc *kcrtc, mdev->funcs->flush(mdev, kcrtc->master->id, 0); /* wait the flip take affect.*/ - timeout = wait_for_completion_timeout(flip_done, HZ); - if (timeout == 0) { + if (wait_for_completion_timeout(flip_done, HZ) == 0) { DRM_ERROR("wait pipe%d flip done timeout\n", kcrtc->master->id); if (!input_flip_done) { unsigned long flags;
There is a confusing pattern in the kernel to use a variable named 'timeout' to store the result of wait_for_completion_timeout() causing patterns like: timeout = wait_for_completion_timeout(...) if (!timeout) return -ETIMEDOUT; with all kinds of permutations. Check the return value directly to drop 'timeout' which also fixes its wrong type. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)