On Thu, Jul 6, 2023 at 3:37 AM Yang Rong <yangr...@vivo.com> wrote:
>
> The files drivers/net/virtio_net.c,
> drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c, and io_uring/io_uring.c were
> modified to fix warnings.
> Specifically, the opportunities for max() and min() were utilized to address
> the warnings.
Please split this into 3 patches, one for each component.
Alex
>
> Signed-off-by: Yang Rong <yangr...@vivo.com>
> ---
> drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 6 +++---
> drivers/net/virtio_net.c | 3 ++-
> io_uring/io_uring.c | 3 ++-
> 3 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
> b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
> index c753c6f30dd7..df79aea49a3c 100644
> --- a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
> +++ b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
> @@ -22,7 +22,7 @@
> * Authors: AMD
> *
> */
> -
> +#include <linux/minmax.h>
> #include "dc.h"
> #include "dc_dmub_srv.h"
> #include "../dmub/dmub_srv.h"
> @@ -481,7 +481,7 @@ static void populate_subvp_cmd_drr_info(struct dc *dc,
> max_drr_vblank_us = div64_u64((subvp_active_us - prefetch_us -
> dc->caps.subvp_fw_processing_delay_us -
> drr_active_us), 2) + drr_active_us;
> max_drr_mallregion_us = subvp_active_us - prefetch_us -
> mall_region_us - dc->caps.subvp_fw_processing_delay_us;
> - max_drr_supported_us = max_drr_vblank_us > max_drr_mallregion_us ?
> max_drr_vblank_us : max_drr_mallregion_us;
> + max_drr_supported_us = max(max_drr_vblank_us, max_drr_mallregion_us);
> max_vtotal_supported = div64_u64(((uint64_t)drr_timing->pix_clk_100hz
> * 100 * max_drr_supported_us),
> (((uint64_t)drr_timing->h_total * 1000000)));
>
> @@ -771,7 +771,7 @@ void dc_dmub_setup_subvp_dmub_command(struct dc *dc,
> wm_val_refclk =
> context->bw_ctx.bw.dcn.watermarks.a.cstate_pstate.pstate_change_ns *
>
> (dc->res_pool->ref_clocks.dchub_ref_clock_inKhz / 1000) / 1000;
>
> - cmd.fw_assisted_mclk_switch_v2.config_data.watermark_a_cache
> = wm_val_refclk < 0xFFFF ? wm_val_refclk : 0xFFFF;
> + cmd.fw_assisted_mclk_switch_v2.config_data.watermark_a_cache
> = min(wm_val_refclk, 0xFFFF);
> }
>
> dm_execute_dmub_cmd(dc->ctx, &cmd, DM_DMUB_WAIT_TYPE_WAIT);
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 9b3721424e71..5bb7da885f00 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -22,6 +22,7 @@
> #include <net/route.h>
> #include <net/xdp.h>
> #include <net/net_failover.h>
> +#include <linux/minmax.h>
>
> static int napi_weight = NAPI_POLL_WEIGHT;
> module_param(napi_weight, int, 0444);
> @@ -1291,7 +1292,7 @@ static struct sk_buff *build_skb_from_xdp_buff(struct
> net_device *dev,
> __skb_put(skb, data_len);
>
> metasize = xdp->data - xdp->data_meta;
> - metasize = metasize > 0 ? metasize : 0;
> + metasize = max(metasize, 0);
> if (metasize)
> skb_metadata_set(skb, metasize);
>
> diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
> index e8096d502a7c..875ca657227d 100644
> --- a/io_uring/io_uring.c
> +++ b/io_uring/io_uring.c
> @@ -47,6 +47,7 @@
> #include <linux/refcount.h>
> #include <linux/uio.h>
> #include <linux/bits.h>
> +#include <linux/minmax.h>
>
> #include <linux/sched/signal.h>
> #include <linux/fs.h>
> @@ -2660,7 +2661,7 @@ static void *__io_uaddr_map(struct page ***pages,
> unsigned short *npages,
> page_array);
> if (ret != nr_pages) {
> err:
> - io_pages_free(&page_array, ret > 0 ? ret : 0);
> + io_pages_free(&page_array, max(ret, 0));
> return ret < 0 ? ERR_PTR(ret) : ERR_PTR(-EFAULT);
> }
> /*
> --
> 2.35.3
>
>
> ________________________________
> 本邮件及其附件内容可能含有机密和/或隐私信息，仅供指定个人或机构使用。若您非发件人指定收件人或其代理人，请勿使用、传播、复制或存储此邮件之任何内容或其附件。如您误收本邮件，请即以回复或电话方式通知发件人，并将原始邮件、附件及其所有复本删除。谢谢。
> The contents of this message and any attachments may contain confidential
> and/or privileged information and are intended exclusively for the
> addressee(s). If you are not the intended recipient of this message or their
> agent, please note that any use, dissemination, copying, or storage of this
> message or its attachments is not allowed. If you receive this message in
> error, please notify the sender by reply the message or phone and delete this
> message, any attachments and any copies immediately.
> Thank you
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
