diff options
| -rw-r--r-- | drivers/clk/msm/clock-gcc-8996.c | 4 | ||||
| -rw-r--r-- | drivers/clk/msm/clock-gcc-8998.c | 4 | ||||
| -rw-r--r-- | drivers/clk/msm/clock-mmss-8996.c | 4 | ||||
| -rw-r--r-- | drivers/clk/msm/clock-mmss-8998.c | 4 | ||||
| -rw-r--r-- | drivers/clk/msm/clock-osm.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/sde/sde_plane.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/wmi.c | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/drivers/clk/msm/clock-gcc-8996.c b/drivers/clk/msm/clock-gcc-8996.c index 6dd2cf879c49..4dee851ae85f 100644 --- a/drivers/clk/msm/clock-gcc-8996.c +++ b/drivers/clk/msm/clock-gcc-8996.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2014-2016, 2020, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -42,7 +42,7 @@ static void __iomem *virt_dbgbase; #define gpll0_out_main_source_val 1 #define gpll4_out_main_source_val 5 -#define FIXDIV(div) (div ? (2 * (div) - 1) : (0)) +#define FIXDIV(div) ((int)div ? (2 * (div) - 1) : (0)) #define F(f, s, div, m, n) \ { \ diff --git a/drivers/clk/msm/clock-gcc-8998.c b/drivers/clk/msm/clock-gcc-8998.c index b1c8cc43769f..c13c7c660ede 100644 --- a/drivers/clk/msm/clock-gcc-8998.c +++ b/drivers/clk/msm/clock-gcc-8998.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2017, 2020, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -44,7 +44,7 @@ static void __iomem *virt_dbgbase; #define gpll4_out_main_source_val 5 #define gpll0_early_div_source_val 6 -#define FIXDIV(div) (div ? (2 * (div) - 1) : (0)) +#define FIXDIV(div) ((int)div ? (2 * (div) - 1) : (0)) #define F(f, s, div, m, n) \ { \ diff --git a/drivers/clk/msm/clock-mmss-8996.c b/drivers/clk/msm/clock-mmss-8996.c index 339ae1622005..845cb001d091 100644 --- a/drivers/clk/msm/clock-mmss-8996.c +++ b/drivers/clk/msm/clock-mmss-8996.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2016, 2018 The Linux Foundation. All rights reserved. +/* Copyright (c) 2014-2016, 2018, 2020, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -53,7 +53,7 @@ static void __iomem *virt_base_gpu; #define dsi1phypll_mm_source_val 2 #define ext_extpclk_clk_src_mm_source_val 1 -#define FIXDIV(div) (div ? (2 * (div) - 1) : (0)) +#define FIXDIV(div) ((int)div ? (2 * (div) - 1) : (0)) #define F_MM(f, s, div, m, n) \ { \ diff --git a/drivers/clk/msm/clock-mmss-8998.c b/drivers/clk/msm/clock-mmss-8998.c index fdaaa723accd..ebf1c78402ed 100644 --- a/drivers/clk/msm/clock-mmss-8998.c +++ b/drivers/clk/msm/clock-mmss-8998.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2017, 2020, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -51,7 +51,7 @@ static void __iomem *virt_base; #define ext_dp_phy_pll_link_mm_source_val 1 #define ext_dp_phy_pll_vco_mm_source_val 2 -#define FIXDIV(div) (div ? (2 * (div) - 1) : (0)) +#define FIXDIV(div) ((int)div ? (2 * (div) - 1) : (0)) #define F_MM(f, s, div, m, n) \ { \ diff --git a/drivers/clk/msm/clock-osm.c b/drivers/clk/msm/clock-osm.c index a1635bad3bb0..4aa298c80679 100644 --- a/drivers/clk/msm/clock-osm.c +++ b/drivers/clk/msm/clock-osm.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2018, 2020, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -272,7 +272,7 @@ static void __iomem *debug_base; #define ACD_REG_RELATIVE_ADDR_BITMASK(addr) \ (1 << (ACD_REG_RELATIVE_ADDR(addr))) -#define FIXDIV(div) (div ? (2 * (div) - 1) : (0)) +#define FIXDIV(div) ((int)div ? (2 * (div) - 1) : (0)) #define F(f, s, div, m, n) \ { \ diff --git a/drivers/gpu/drm/msm/sde/sde_plane.c b/drivers/gpu/drm/msm/sde/sde_plane.c index 91c837ff13dc..ae66861c69d4 100644 --- a/drivers/gpu/drm/msm/sde/sde_plane.c +++ b/drivers/gpu/drm/msm/sde/sde_plane.c @@ -1871,7 +1871,7 @@ static void _sde_plane_install_properties(struct drm_plane *plane, } if (sde_is_custom_client()) { - if (catalog->mixer_count && catalog->mixer && + if (catalog->mixer_count && catalog->mixer[0].sblk->maxblendstages) { zpos_max = catalog->mixer[0].sblk->maxblendstages - 1; if (zpos_max > SDE_STAGE_MAX - SDE_STAGE_0 - 1) diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 7b8f9dd664ad..045a27eef176 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -6048,7 +6048,7 @@ static struct sk_buff *ath10k_wmi_10_4_op_gen_init(struct ath10k *ar) int ath10k_wmi_start_scan_verify(const struct wmi_start_scan_arg *arg) { - if (arg->ie_len && !arg->ie) + if (arg->ie_len) return -EINVAL; if (arg->n_channels && !arg->channels) return -EINVAL; |