[PATCH v2 02/16] max2165: trival fix for some -Wuninitialized warning

[PATCH v2 02/16] max2165: trival fix for some -Wuninitialized warning

[Danny Kukawka]

Fix for some -Wuninitialized compiler warnings.

Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
---
 drivers/media/common/tuners/max2165.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/media/common/tuners/max2165.c b/drivers/media/common/tuners/max2165.c
index cb2c98f..ba84936 100644
--- a/drivers/media/common/tuners/max2165.c
+++ b/drivers/media/common/tuners/max2165.c
@@ -168,7 +168,7 @@ int fixpt_div32(u32 dividend, u32 divisor, u32 *quotient, u32 *fraction)
 	int i;
 
 	if (0 == divisor)
-		return -1;
+		return -EINVAL;
 
 	q = dividend / divisor;
 	remainder = dividend - q * divisor;
@@ -194,10 +194,13 @@ static int max2165_set_rf(struct max2165_priv *priv, u32 freq)
 	u8 tf_ntch;
 	u32 t;
 	u32 quotient, fraction;
+	int ret;
 
 	/* Set PLL divider according to RF frequency */
-	fixpt_div32(freq / 1000, priv->config->osc_clk * 1000,
-		&quotient, &fraction);
+	ret = fixpt_div32(freq / 1000, priv->config->osc_clk * 1000,
+			 &quotient, &fraction);
+	if (ret != 0)
+		return ret;
 
 	/* 20-bit fraction */
 	fraction >>= 12;
-- 
1.7.7.3

[PATCH 05/16] cx18: fix handling of 'radio' module parameter

[Danny Kukawka]

Fixed handling of 'radio' module parameter from module_param_array
to module_param_named to fix these compiler warnings in cx18-driver.c:

In function ‘__check_radio’:
113:1: warning: return from incompatible pointer type [enabled by default]
At top level:
113:1: warning: initialization from incompatible pointer type [enabled by default]
113:1: warning: (near initialization for ‘__param_arr_radio.num’) [enabled by default]

Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
---
 drivers/media/video/cx18/cx18-driver.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 349bd9c..27b5330 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -110,7 +110,7 @@ static int retry_mmio = 1;
 int cx18_debug;
 
 module_param_array(tuner, int, &tuner_c, 0644);
-module_param_array(radio, bool, &radio_c, 0644);
+module_param_named(radio, radio_c, bool, 0644);
 module_param_array(cardtype, int, &cardtype_c, 0644);
 module_param_string(pal, pal, sizeof(pal), 0644);
 module_param_string(secam, secam, sizeof(secam), 0644);
-- 
1.7.7.3

Re: [PATCH 05/16] cx18: fix handling of 'radio' module parameter

[Danny Kukawka]

On Dienstag, 31. Januar 2012, Andy Walls wrote:
> On Tue, 2012-01-31 at 05:01 -0500, Andy Walls wrote:
> > On Mon, 2012-01-30 at 20:40 +0100, Danny Kukawka wrote:
> > > Fixed handling of 'radio' module parameter from module_param_array
> > > to module_param_named to fix these compiler warnings in cx18-driver.c:
> >
> > NACK.
> >
> > "radio" is an array of tristate values (-1, 0, 1) per installed card:
> >
> > 	static int radio[CX18_MAX_CARDS] = { -1, -1,
> >
> > and must remain an array or you will break the driver.
> >
> > Calling "radio_c" a module parameter named "radio" is wrong.
> >
> > The correct fix is to reverse Rusty Russel's patch to the driver in
> > commit  90ab5ee94171b3e28de6bb42ee30b527014e0be7
> > to change the "bool" back to an "int" as it should be in
>
>                       ^^^^
> Sorry, a typo here.  Disregard the word "back".

Overseen this. But wouldn't be the correct fix in this case to:
a) reverse the part of 90ab5ee94171b3e28de6bb42ee30b527014e0be7 to:
   get: 
   static unsigned radio_c = 1;
   
b) change the following line:
   module_param_array(radio, bool, &radio_c, 0644);
   to:
   module_param_array(radio, int, &radio_c, 0644);

Without b) you would get a warning from the compiler again.

Danny 

Re: [PATCH 05/16] cx18: fix handling of 'radio' module parameter

[Andy Walls]

Danny Kukawka <danny.kukawka@bisect.de> wrote:

>On Dienstag, 31. Januar 2012, Andy Walls wrote:
>> On Tue, 2012-01-31 at 05:01 -0500, Andy Walls wrote:
>> > On Mon, 2012-01-30 at 20:40 +0100, Danny Kukawka wrote:
>> > > Fixed handling of 'radio' module parameter from
>module_param_array
>> > > to module_param_named to fix these compiler warnings in
>cx18-driver.c:
>> >
>> > NACK.
>> >
>> > "radio" is an array of tristate values (-1, 0, 1) per installed
>card:
>> >
>> > 	static int radio[CX18_MAX_CARDS] = { -1, -1,
>> >
>> > and must remain an array or you will break the driver.
>> >
>> > Calling "radio_c" a module parameter named "radio" is wrong.
>> >
>> > The correct fix is to reverse Rusty Russel's patch to the driver in
>> > commit  90ab5ee94171b3e28de6bb42ee30b527014e0be7
>> > to change the "bool" back to an "int" as it should be in
>>
>>                       ^^^^
>> Sorry, a typo here.  Disregard the word "back".
>
>Overseen this. But wouldn't be the correct fix in this case to:
>a) reverse the part of 90ab5ee94171b3e28de6bb42ee30b527014e0be7 to:
>   get: 
>   static unsigned radio_c = 1;
>   
>b) change the following line:
>   module_param_array(radio, bool, &radio_c, 0644);
>   to:
>   module_param_array(radio, int, &radio_c, 0644);
>
>Without b) you would get a warning from the compiler again.
>
>Danny 

Yes, both need to happen.

I mentioned b) at the end of my original email.

Regards,
Andy

Re: [PATCH 05/16] cx18: fix handling of 'radio' module parameter

[Rusty Russell]

On Tue, 31 Jan 2012 14:45:18 +0100, Danny Kukawka <danny.kukawka@bisect.de> wrote:
> On Dienstag, 31. Januar 2012, Andy Walls wrote:
> Overseen this. But wouldn't be the correct fix in this case to:
> a) reverse the part of 90ab5ee94171b3e28de6bb42ee30b527014e0be7 to:
>    get: 
>    static unsigned radio_c = 1;
>    
> b) change the following line:
>    module_param_array(radio, bool, &radio_c, 0644);
>    to:
>    module_param_array(radio, int, &radio_c, 0644);

Yes, sorry, my patch was complete crap here :(

If you want people to set it only to 1 or 0, you probably want "bint".

Thanks,
Rusty.

Re: [PATCH v2 08/16] ivtv-driver: fix handling of 'radio' module parameter

[Danny Kukawka]

On Dienstag, 31. Januar 2012, Andy Walls wrote:
> On Mon, 2012-01-30 at 20:40 +0100, Danny Kukawka wrote:
> > Fixed handling of 'radio' module parameter from module_param_array
> > to module_param_named to fix these compiler warnings in ivtv-driver.c:
> >
> > In function ‘__check_radio’:
> > 113:1: warning: return from incompatible pointer type [enabled by
> > default] At top level:
> > 113:1: warning: initialization from incompatible pointer type [enabled by
> > default] 113:1: warning: (near initialization for
> > ‘__param_arr_radio.num’) [enabled by default]
> >
> > Set initial state of radio_c to true instead of 1.
>
> NACK.
>
> "radio" is an array of tristate values (-1, 0, 1) per installed card:
>
> 	static int radio[IVTV_MAX_CARDS] = { -1, -1,
>
> and must remain an array or you will break the driver.
>
> Calling "radio_c" a module parameter named "radio" is wrong.
>
> The correct fix is to reverse Rusty Russel's patch to the driver in
> commit  90ab5ee94171b3e28de6bb42ee30b527014e0be7
> to change the "bool" to an "int" as it should be in
> "module_param_array(radio, ...)"

Overseen this. But wouldn't be the correct fix in this case to:
a) reverse the part of 90ab5ee94171b3e28de6bb42ee30b527014e0be7 to get:
   static unsigned int radio_c = 1;

b) change the following line:
   module_param_array(radio, bool, &radio_c, 0644);
   to:
   module_param_array(radio, int, &radio_c, 0644);

Without b) you would get a warning from the compiler again.

Danny 

Re: [PATCH v2 08/16] ivtv-driver: fix handling of 'radio' module parameter

[Andy Walls]

Danny Kukawka <danny.kukawka@bisect.de> wrote:

>On Dienstag, 31. Januar 2012, Andy Walls wrote:
>> On Mon, 2012-01-30 at 20:40 +0100, Danny Kukawka wrote:
>> > Fixed handling of 'radio' module parameter from module_param_array
>> > to module_param_named to fix these compiler warnings in
>ivtv-driver.c:
>> >
>> > In function ‘__check_radio’:
>> > 113:1: warning: return from incompatible pointer type [enabled by
>> > default] At top level:
>> > 113:1: warning: initialization from incompatible pointer type
>[enabled by
>> > default] 113:1: warning: (near initialization for
>> > ‘__param_arr_radio.num’) [enabled by default]
>> >
>> > Set initial state of radio_c to true instead of 1.
>>
>> NACK.
>>
>> "radio" is an array of tristate values (-1, 0, 1) per installed card:
>>
>> 	static int radio[IVTV_MAX_CARDS] = { -1, -1,
>>
>> and must remain an array or you will break the driver.
>>
>> Calling "radio_c" a module parameter named "radio" is wrong.
>>
>> The correct fix is to reverse Rusty Russel's patch to the driver in
>> commit  90ab5ee94171b3e28de6bb42ee30b527014e0be7
>> to change the "bool" to an "int" as it should be in
>> "module_param_array(radio, ...)"
>
>Overseen this. But wouldn't be the correct fix in this case to:
>a) reverse the part of 90ab5ee94171b3e28de6bb42ee30b527014e0be7 to get:
>   static unsigned int radio_c = 1;
>
>b) change the following line:
>   module_param_array(radio, bool, &radio_c, 0644);
>   to:
>   module_param_array(radio, int, &radio_c, 0644);
>
>Without b) you would get a warning from the compiler again.
>
>Danny 

Yes both need to happen.

I mentioned b) in my original email.

Regards,
Andy

Re: [PATCH 05/16] cx18: fix handling of 'radio' module parameter

[Andy Walls]

On Mon, 2012-01-30 at 20:40 +0100, Danny Kukawka wrote:
> Fixed handling of 'radio' module parameter from module_param_array
> to module_param_named to fix these compiler warnings in cx18-driver.c:

NACK.

"radio" is an array of tristate values (-1, 0, 1) per installed card:

	static int radio[CX18_MAX_CARDS] = { -1, -1,

and must remain an array or you will break the driver.

Calling "radio_c" a module parameter named "radio" is wrong.

The correct fix is to reverse Rusty Russel's patch to the driver in
commit  90ab5ee94171b3e28de6bb42ee30b527014e0be7
to change the "bool" back to an "int" as it should be in
"module_param_array(radio, ...)"

Regards,
Andy

> In function ‘__check_radio’:
> 113:1: warning: return from incompatible pointer type [enabled by default]
> At top level:
> 113:1: warning: initialization from incompatible pointer type [enabled by default]
> 113:1: warning: (near initialization for ‘__param_arr_radio.num’) [enabled by default]
> 
> Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
> ---
>  drivers/media/video/cx18/cx18-driver.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
> index 349bd9c..27b5330 100644
> --- a/drivers/media/video/cx18/cx18-driver.c
> +++ b/drivers/media/video/cx18/cx18-driver.c
> @@ -110,7 +110,7 @@ static int retry_mmio = 1;
>  int cx18_debug;
>  
>  module_param_array(tuner, int, &tuner_c, 0644);
> -module_param_array(radio, bool, &radio_c, 0644);
> +module_param_named(radio, radio_c, bool, 0644);
>  module_param_array(cardtype, int, &cardtype_c, 0644);
>  module_param_string(pal, pal, sizeof(pal), 0644);
>  module_param_string(secam, secam, sizeof(secam), 0644);

Re: [PATCH 05/16] cx18: fix handling of 'radio' module parameter

[Andy Walls]

On Tue, 2012-01-31 at 05:01 -0500, Andy Walls wrote:
> On Mon, 2012-01-30 at 20:40 +0100, Danny Kukawka wrote:
> > Fixed handling of 'radio' module parameter from module_param_array
> > to module_param_named to fix these compiler warnings in cx18-driver.c:
> 
> NACK.
> 
> "radio" is an array of tristate values (-1, 0, 1) per installed card:
> 
> 	static int radio[CX18_MAX_CARDS] = { -1, -1,
> 
> and must remain an array or you will break the driver.
> 
> Calling "radio_c" a module parameter named "radio" is wrong.
> 
> The correct fix is to reverse Rusty Russel's patch to the driver in
> commit  90ab5ee94171b3e28de6bb42ee30b527014e0be7
> to change the "bool" back to an "int" as it should be in
                      ^^^^
Sorry, a typo here.  Disregard the word "back".

Regards,
Andy

> "module_param_array(radio, ...)"
> 
> Regards,
> Andy
> 
> > In function ‘__check_radio’:
> > 113:1: warning: return from incompatible pointer type [enabled by default]
> > At top level:
> > 113:1: warning: initialization from incompatible pointer type [enabled by default]
> > 113:1: warning: (near initialization for ‘__param_arr_radio.num’) [enabled by default]
> > 
> > Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
> > ---
> >  drivers/media/video/cx18/cx18-driver.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
> > index 349bd9c..27b5330 100644
> > --- a/drivers/media/video/cx18/cx18-driver.c
> > +++ b/drivers/media/video/cx18/cx18-driver.c
> > @@ -110,7 +110,7 @@ static int retry_mmio = 1;
> >  int cx18_debug;
> >  
> >  module_param_array(tuner, int, &tuner_c, 0644);
> > -module_param_array(radio, bool, &radio_c, 0644);
> > +module_param_named(radio, radio_c, bool, 0644);
> >  module_param_array(cardtype, int, &cardtype_c, 0644);
> >  module_param_string(pal, pal, sizeof(pal), 0644);
> >  module_param_string(secam, secam, sizeof(secam), 0644);
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html