diff mbox

drm/i915: fix sparse warning for using false as NULL

Message ID 1458144418-20046-1-git-send-email-jani.nikula@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jani Nikula March 16, 2016, 4:06 p.m. UTC 
drivers/gpu/drm/i915/intel_dpll_mgr.c:1200:32: warning: Using plain integer as NULL pointer

Fixes: 304b65cbdc8d ("drm/i915: Move SKL/KLB pll selection logic to intel_dpll_mgr.c")
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jani Nikula March 16, 2016, 4:14 p.m. UTC | #1 
On Wed, 16 Mar 2016, Jani Nikula <jani.nikula@intel.com> wrote:
> drivers/gpu/drm/i915/intel_dpll_mgr.c:1200:32: warning: Using plain integer as NULL pointer
>
> Fixes: 304b65cbdc8d ("drm/i915: Move SKL/KLB pll selection logic to intel_dpll_mgr.c")

Forgot to Cc: Ander on this one.

BR,
Jani.

> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
> index 74d5aecc0be5..e53d57c39056 100644
> --- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
> +++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
> @@ -1197,7 +1197,7 @@ skl_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
>  		ctrl1 |= DPLL_CTRL1_HDMI_MODE(0);
>  
>  		if (!skl_ddi_calculate_wrpll(clock * 1000, &wrpll_params))
> -			return false;
> +			return NULL;
>  
>  		cfgcr1 = DPLL_CFGCR1_FREQ_ENABLE |
>  			 DPLL_CFGCR1_DCO_FRACTION(wrpll_params.dco_fraction) |
Ville Syrjala March 16, 2016, 4:16 p.m. UTC | #2 
On Wed, Mar 16, 2016 at 06:06:58PM +0200, Jani Nikula wrote:
> drivers/gpu/drm/i915/intel_dpll_mgr.c:1200:32: warning: Using plain integer as NULL pointer
> 
> Fixes: 304b65cbdc8d ("drm/i915: Move SKL/KLB pll selection logic to intel_dpll_mgr.c")
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
> index 74d5aecc0be5..e53d57c39056 100644
> --- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
> +++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
> @@ -1197,7 +1197,7 @@ skl_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
>  		ctrl1 |= DPLL_CTRL1_HDMI_MODE(0);
>  
>  		if (!skl_ddi_calculate_wrpll(clock * 1000, &wrpll_params))
> -			return false;
> +			return NULL;
>  
>  		cfgcr1 = DPLL_CFGCR1_FREQ_ENABLE |
>  			 DPLL_CFGCR1_DCO_FRACTION(wrpll_params.dco_fraction) |
> -- 
> 2.1.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula March 17, 2016, 9:35 a.m. UTC | #3 
On Wed, 16 Mar 2016, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Wed, Mar 16, 2016 at 06:06:58PM +0200, Jani Nikula wrote:
>> drivers/gpu/drm/i915/intel_dpll_mgr.c:1200:32: warning: Using plain integer as NULL pointer
>> 
>> Fixes: 304b65cbdc8d ("drm/i915: Move SKL/KLB pll selection logic to intel_dpll_mgr.c")
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Pushed to drm-intel-next-queued, thanks for the review. The CI fails are
unrelated.

BR,
Jani.


>
>> ---
>>  drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
>> index 74d5aecc0be5..e53d57c39056 100644
>> --- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
>> +++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
>> @@ -1197,7 +1197,7 @@ skl_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
>>  		ctrl1 |= DPLL_CTRL1_HDMI_MODE(0);
>>  
>>  		if (!skl_ddi_calculate_wrpll(clock * 1000, &wrpll_params))
>> -			return false;
>> +			return NULL;
>>  
>>  		cfgcr1 = DPLL_CFGCR1_FREQ_ENABLE |
>>  			 DPLL_CFGCR1_DCO_FRACTION(wrpll_params.dco_fraction) |
>> -- 
>> 2.1.4
>> 
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
index 74d5aecc0be5..e53d57c39056 100644
--- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
@@ -1197,7 +1197,7 @@  skl_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
 		ctrl1 |= DPLL_CTRL1_HDMI_MODE(0);
 
 		if (!skl_ddi_calculate_wrpll(clock * 1000, &wrpll_params))
-			return false;
+			return NULL;
 
 		cfgcr1 = DPLL_CFGCR1_FREQ_ENABLE |
 			 DPLL_CFGCR1_DCO_FRACTION(wrpll_params.dco_fraction) |