gpu: xilinx: dpdma: dpsub removed warning

min() function requires same type of variables in argument,
due to different type of argument on different architecure
(32bit/64bit), warning was thrown. Addressed warning by this
patch.

Signed-off-by: Tejas Upadhyay <tejasu@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/dma/xilinx/xilinx_dpdma.c b/drivers/dma/xilinx/xilinx_dpdma.c
index f9d70880036a2cde4337544b4f7a4ac5641254cc..6056163a3125a14149ecac2ec05fd7f719b910e6 100644 (file)
--- a/drivers/dma/xilinx/xilinx_dpdma.c
+++ b/drivers/dma/xilinx/xilinx_dpdma.c
@@ -338,7 +338,7 @@ struct xilinx_dpdma_device {
 };
 
 #ifdef CONFIG_XILINX_DPDMA_DEBUG_FS
-#define XILINX_DPDMA_DEBUGFS_READ_MAX_SIZE     32UL
+#define XILINX_DPDMA_DEBUGFS_READ_MAX_SIZE     32
 #define XILINX_DPDMA_DEBUGFS_UINT16_MAX_STR    "65535"
 #define IN_RANGE(x, min, max) ((x) >= (min) && (x) <= (max))
 
@@ -412,7 +412,8 @@ static ssize_t xilinx_dpdma_debugfs_desc_done_intr_read(char **kern_buff)
        dpdma_debugfs.testcase = DPDMA_TC_NONE;
 
        out_str_len = strlen(XILINX_DPDMA_DEBUGFS_UINT16_MAX_STR);
-       out_str_len = min(XILINX_DPDMA_DEBUGFS_READ_MAX_SIZE, out_str_len);
+       out_str_len = min_t(size_t, XILINX_DPDMA_DEBUGFS_READ_MAX_SIZE,
+                           out_str_len);
        snprintf(*kern_buff, out_str_len, "%d",
                 dpdma_debugfs.xilinx_dpdma_intr_done_count);
 
@@ -488,8 +489,8 @@ static ssize_t xilinx_dpdma_debugfs_read(struct file *f, char __user *buf,
 
        if (dpdma_debugfs.testcase == DPDMA_TC_NONE) {
                out_str_len = strlen("No testcase executed");
-               out_str_len = min(XILINX_DPDMA_DEBUGFS_READ_MAX_SIZE,
-                                 out_str_len);
+               out_str_len = min_t(size_t, XILINX_DPDMA_DEBUGFS_READ_MAX_SIZE,
+                                   out_str_len);
                snprintf(kern_buff, out_str_len, "%s", "No testcase executed");
        } else {
                ret = dpdma_debugfs_reqs[dpdma_debugfs.testcase].read_handler(

diff --git a/drivers/gpu/drm/xilinx/xilinx_drm_dp.c b/drivers/gpu/drm/xilinx/xilinx_drm_dp.c
index 299c4a4d985d0753cf7ac5ce4a2ec53ef03b63f9..d2e4a90bf328d0a3a0b8ef8d9d80ddca58250293 100644 (file)
--- a/drivers/gpu/drm/xilinx/xilinx_drm_dp.c
+++ b/drivers/gpu/drm/xilinx/xilinx_drm_dp.c
@@ -344,7 +344,7 @@ static inline struct xilinx_drm_dp *to_dp(struct drm_encoder *encoder)
 #define AUX_READ_BIT   0x1
 
 #ifdef CONFIG_DRM_XILINX_DP_DEBUG_FS
-#define XILINX_DP_DEBUGFS_READ_MAX_SIZE        32UL
+#define XILINX_DP_DEBUGFS_READ_MAX_SIZE        32
 #define XILINX_DP_DEBUGFS_UINT8_MAX_STR        "255"
 #define IN_RANGE(x, min, max) ((x) >= (min) && (x) <= (max))
 
@@ -526,7 +526,8 @@ static ssize_t xilinx_dp_debugfs_max_linkrate_read(char **kern_buff)
        }
 
        output_str_len = strlen(XILINX_DP_DEBUGFS_UINT8_MAX_STR);
-       output_str_len = min(XILINX_DP_DEBUGFS_READ_MAX_SIZE, output_str_len);
+       output_str_len = min_t(size_t, XILINX_DP_DEBUGFS_READ_MAX_SIZE,
+                              output_str_len);
        snprintf(*kern_buff, output_str_len, "%u", dpcd_link_bw);
 
        return 0;
@@ -552,7 +553,8 @@ static ssize_t xilinx_dp_debugfs_max_lanecnt_read(char **kern_buff)
 
        dpcd_lane_cnt &= DP_LANE_COUNT_MASK;
        output_str_len = strlen(XILINX_DP_DEBUGFS_UINT8_MAX_STR);
-       output_str_len = min(XILINX_DP_DEBUGFS_READ_MAX_SIZE, output_str_len);
+       output_str_len = min_t(size_t, XILINX_DP_DEBUGFS_READ_MAX_SIZE,
+                              output_str_len);
        snprintf(*kern_buff, output_str_len, "%u", dpcd_lane_cnt);
 
        return 0;
@@ -587,7 +589,8 @@ xilinx_dp_debugfs_output_display_format_read(char **kern_buff)
                return ret;
 
        output_str_len = strlen("Success");
-       output_str_len = min(XILINX_DP_DEBUGFS_READ_MAX_SIZE, output_str_len);
+       output_str_len = min_t(size_t, XILINX_DP_DEBUGFS_READ_MAX_SIZE,
+                              output_str_len);
        snprintf(*kern_buff, output_str_len, "%s", "Success");
 
        return 0;
@@ -627,7 +630,8 @@ static ssize_t xilinx_dp_debugfs_read(struct file *f, char __user *buf,
 
        if (dp_debugfs.testcase == DP_TC_NONE) {
                out_str_len = strlen("No testcase executed");
-               out_str_len = min(XILINX_DP_DEBUGFS_READ_MAX_SIZE, out_str_len);
+               out_str_len = min_t(size_t, XILINX_DP_DEBUGFS_READ_MAX_SIZE,
+                                   out_str_len);
                snprintf(kern_buff, out_str_len, "%s", "No testcase executed");
        } else {
                ret = dp_debugfs_reqs[dp_debugfs.testcase].read_handler(

diff --git a/drivers/gpu/drm/xilinx/xilinx_drm_dp_sub.c b/drivers/gpu/drm/xilinx/xilinx_drm_dp_sub.c
index ac2a3637cd02bdba0775e095d5fc2b46ed0519f4..3af561e12b979717965500a56559893ffdeed629 100644 (file)
--- a/drivers/gpu/drm/xilinx/xilinx_drm_dp_sub.c
+++ b/drivers/gpu/drm/xilinx/xilinx_drm_dp_sub.c
@@ -356,7 +356,7 @@ static LIST_HEAD(xilinx_drm_dp_sub_list);
 static DEFINE_MUTEX(xilinx_drm_dp_sub_lock);
 
 #ifdef CONFIG_DRM_XILINX_DP_SUB_DEBUG_FS
-#define XILINX_DP_SUB_DEBUGFS_READ_MAX_SIZE    32UL
+#define XILINX_DP_SUB_DEBUGFS_READ_MAX_SIZE    32
 #define XILINX_DP_SUB_DEBUGFS_MAX_BG_COLOR_VAL 0xFFF
 #define IN_RANGE(x, min, max) ((x) >= (min) && (x) <= (max))
 
@@ -513,7 +513,8 @@ xilinx_dp_sub_debugfs_output_display_format_read(char **kern_buff)
        xilinx_dp_sub_debugfs_output_format(dp_sub_debugfs.output_fmt);
 
        out_str_len = strlen("Success");
-       out_str_len = min(XILINX_DP_SUB_DEBUGFS_READ_MAX_SIZE, out_str_len);
+       out_str_len = min_t(size_t, XILINX_DP_SUB_DEBUGFS_READ_MAX_SIZE,
+                           out_str_len);
        snprintf(*kern_buff, out_str_len, "%s", "Success");
 
        return 0;
@@ -530,7 +531,8 @@ xilinx_dp_sub_debugfs_background_color_read(char **kern_buff)
        dp_sub_debugfs.b_value = 0;
 
        out_str_len = strlen("Success");
-       out_str_len = min(XILINX_DP_SUB_DEBUGFS_READ_MAX_SIZE, out_str_len);
+       out_str_len = min_t(size_t, XILINX_DP_SUB_DEBUGFS_READ_MAX_SIZE,
+                           out_str_len);
        snprintf(*kern_buff, out_str_len, "%s", "Success");
 
        return 0;
@@ -605,8 +607,8 @@ static ssize_t xilinx_dp_sub_debugfs_read(struct file *f, char __user *buf,
 
        if (dp_sub_debugfs.testcase == DP_SUB_TC_NONE) {
                out_str_len = strlen("No testcase executed");
-               out_str_len = min(XILINX_DP_SUB_DEBUGFS_READ_MAX_SIZE,
-                                 out_str_len);
+               out_str_len = min_t(size_t, XILINX_DP_SUB_DEBUGFS_READ_MAX_SIZE,
+                                   out_str_len);
                snprintf(kern_buff, out_str_len, "%s", "No testcase executed");
        } else {
                ret = dp_sub_debugfs_reqs[dp_sub_debugfs.testcase].read_handler(