| Message ID | 20211116055031.31621-1-zhaoxiao@uniontech.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/radeon:WARNING opportunity for max() | expand |
Am 16.11.21 um 06:50 schrieb zhaoxiao: > Fix following coccicheck warning: > drivers/gpu/drm/radeon/r100.c:3450:26-27: WARNING opportunity for max() > drivers/gpu/drm/radeon/r100.c:2812:23-24: WARNING opportunity for max() > > Signed-off-by: zhaoxiao <zhaoxiao@uniontech.com> In general feel free to add my Acked-by, but I'm not sure if we want such cleanups in a driver which is only in maintenance mode. If you do this as part of a general and automated cleanup then it is probably ok. Regards, Christian. > --- > drivers/gpu/drm/radeon/r100.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c > index 2dd85ba1faa2..c65ee6f44af2 100644 > --- a/drivers/gpu/drm/radeon/r100.c > +++ b/drivers/gpu/drm/radeon/r100.c > @@ -2809,10 +2809,7 @@ void r100_vram_init_sizes(struct radeon_device *rdev) > if (rdev->mc.aper_size > config_aper_size) > config_aper_size = rdev->mc.aper_size; > > - if (config_aper_size > rdev->mc.real_vram_size) > - rdev->mc.mc_vram_size = config_aper_size; > - else > - rdev->mc.mc_vram_size = rdev->mc.real_vram_size; > + rdev->mc.mc_vram_size = max(config_aper_size, rdev->mc.real_vram_size); > } > } > > @@ -3447,10 +3444,7 @@ void r100_bandwidth_update(struct radeon_device *rdev) > mc_latency_mclk.full += disp_latency_overhead.full + cur_latency_mclk.full; > mc_latency_sclk.full += disp_latency_overhead.full + cur_latency_sclk.full; > > - if (mc_latency_mclk.full > mc_latency_sclk.full) > - disp_latency.full = mc_latency_mclk.full; > - else > - disp_latency.full = mc_latency_sclk.full; > + disp_latency.full = max(mc_latency_mclk.full, mc_latency_sclk.full); > > /* setup Max GRPH_STOP_REQ default value */ > if (ASIC_IS_RV100(rdev))
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 2dd85ba1faa2..c65ee6f44af2 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -2809,10 +2809,7 @@ void r100_vram_init_sizes(struct radeon_device *rdev) if (rdev->mc.aper_size > config_aper_size) config_aper_size = rdev->mc.aper_size; - if (config_aper_size > rdev->mc.real_vram_size) - rdev->mc.mc_vram_size = config_aper_size; - else - rdev->mc.mc_vram_size = rdev->mc.real_vram_size; + rdev->mc.mc_vram_size = max(config_aper_size, rdev->mc.real_vram_size); } } @@ -3447,10 +3444,7 @@ void r100_bandwidth_update(struct radeon_device *rdev) mc_latency_mclk.full += disp_latency_overhead.full + cur_latency_mclk.full; mc_latency_sclk.full += disp_latency_overhead.full + cur_latency_sclk.full; - if (mc_latency_mclk.full > mc_latency_sclk.full) - disp_latency.full = mc_latency_mclk.full; - else - disp_latency.full = mc_latency_sclk.full; + disp_latency.full = max(mc_latency_mclk.full, mc_latency_sclk.full); /* setup Max GRPH_STOP_REQ default value */ if (ASIC_IS_RV100(rdev))
Fix following coccicheck warning: drivers/gpu/drm/radeon/r100.c:3450:26-27: WARNING opportunity for max() drivers/gpu/drm/radeon/r100.c:2812:23-24: WARNING opportunity for max() Signed-off-by: zhaoxiao <zhaoxiao@uniontech.com> --- drivers/gpu/drm/radeon/r100.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)