2023-06-27 14:12:03

by Colin Ian King

Subject: [PATCH][next] media: bt8xx: make read-only arrays static

Don't populate the arrays on the stack, instead make them static const.
Also add spaces between values to clean up checkpatch style warnings.

Signed-off-by: Colin Ian King <[email protected]>
---
drivers/media/pci/bt8xx/dvb-bt8xx.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/media/pci/bt8xx/dvb-bt8xx.c b/drivers/media/pci/bt8xx/dvb-bt8xx.c
index 4cb890b949c3..df83b59a618d 100644
--- a/drivers/media/pci/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/pci/bt8xx/dvb-bt8xx.c
@@ -190,11 +190,15 @@ static int cx24108_tuner_set_params(struct dvb_frontend *fe)
u32 freq = c->frequency;
int i, a, n, pump;
u32 band, pll;
- u32 osci[]={950000,1019000,1075000,1178000,1296000,1432000,
- 1576000,1718000,1856000,2036000,2150000};
- u32 bandsel[]={0,0x00020000,0x00040000,0x00100800,0x00101000,
+ static const u32 osci[] = {
+ 950000, 1019000, 1075000, 1178000, 1296000, 1432000,
+ 1576000, 1718000, 1856000, 2036000, 2150000
+ };
+ static const u32 bandsel[] = {
+ 0, 0x00020000, 0x00040000, 0x00100800, 0x00101000,
0x00102000,0x00104000,0x00108000,0x00110000,
- 0x00120000,0x00140000};
+ 0x00120000, 0x00140000
+ };

#define XTAL 1011100 /* Hz, really 1.0111 MHz and a /10 prescaler */
dprintk("cx24108 debug: entering SetTunerFreq, freq=%d\n", freq);
--
2.39.2

2023-06-27 15:09:30

by Tommaso Merciai

Subject: Re: [PATCH][next] media: bt8xx: make read-only arrays static

Hi Colin,

On Tue, Jun 27, 2023 at 02:48:51PM +0100, Colin Ian King wrote:
> Don't populate the arrays on the stack, instead make them static const.
> Also add spaces between values to clean up checkpatch style warnings.
>
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> drivers/media/pci/bt8xx/dvb-bt8xx.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/pci/bt8xx/dvb-bt8xx.c b/drivers/media/pci/bt8xx/dvb-bt8xx.c
> index 4cb890b949c3..df83b59a618d 100644
> --- a/drivers/media/pci/bt8xx/dvb-bt8xx.c
> +++ b/drivers/media/pci/bt8xx/dvb-bt8xx.c
> @@ -190,11 +190,15 @@ static int cx24108_tuner_set_params(struct dvb_frontend *fe)
> u32 freq = c->frequency;
> int i, a, n, pump;
> u32 band, pll;
> - u32 osci[]={950000,1019000,1075000,1178000,1296000,1432000,
> - 1576000,1718000,1856000,2036000,2150000};
> - u32 bandsel[]={0,0x00020000,0x00040000,0x00100800,0x00101000,
> + static const u32 osci[] = {
> + 950000, 1019000, 1075000, 1178000, 1296000, 1432000,
> + 1576000, 1718000, 1856000, 2036000, 2150000
> + };
> + static const u32 bandsel[] = {
> + 0, 0x00020000, 0x00040000, 0x00100800, 0x00101000,
> 0x00102000,0x00104000,0x00108000,0x00110000,

Are you not missing space also here?

> - 0x00120000,0x00140000};
> + 0x00120000, 0x00140000
> + };
>
> #define XTAL 1011100 /* Hz, really 1.0111 MHz and a /10 prescaler */
> dprintk("cx24108 debug: entering SetTunerFreq, freq=%d\n", freq);
> --
> 2.39.2
>

Regards,
Tommaso

2023-06-27 15:47:55

by Colin Ian King

Subject: Re: [PATCH][next] media: bt8xx: make read-only arrays static

On 27/06/2023 15:38, Tommaso Merciai wrote:
> Hi Colin,
>
> On Tue, Jun 27, 2023 at 02:48:51PM +0100, Colin Ian King wrote:
>> Don't populate the arrays on the stack, instead make them static const.
>> Also add spaces between values to clean up checkpatch style warnings.
>>
>> Signed-off-by: Colin Ian King <[email protected]>
>> ---
>> drivers/media/pci/bt8xx/dvb-bt8xx.c | 12 ++++++++----
>> 1 file changed, 8 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/media/pci/bt8xx/dvb-bt8xx.c b/drivers/media/pci/bt8xx/dvb-bt8xx.c
>> index 4cb890b949c3..df83b59a618d 100644
>> --- a/drivers/media/pci/bt8xx/dvb-bt8xx.c
>> +++ b/drivers/media/pci/bt8xx/dvb-bt8xx.c
>> @@ -190,11 +190,15 @@ static int cx24108_tuner_set_params(struct dvb_frontend *fe)
>> u32 freq = c->frequency;
>> int i, a, n, pump;
>> u32 band, pll;
>> - u32 osci[]={950000,1019000,1075000,1178000,1296000,1432000,
>> - 1576000,1718000,1856000,2036000,2150000};
>> - u32 bandsel[]={0,0x00020000,0x00040000,0x00100800,0x00101000,
>> + static const u32 osci[] = {
>> + 950000, 1019000, 1075000, 1178000, 1296000, 1432000,
>> + 1576000, 1718000, 1856000, 2036000, 2150000
>> + };
>> + static const u32 bandsel[] = {
>> + 0, 0x00020000, 0x00040000, 0x00100800, 0x00101000,
>> 0x00102000,0x00104000,0x00108000,0x00110000,
>
> Are you not missing space also here?

I can't see the space you are referring to.

>
>> - 0x00120000,0x00140000};
>> + 0x00120000, 0x00140000
>> + };
>>
>> #define XTAL 1011100 /* Hz, really 1.0111 MHz and a /10 prescaler */
>> dprintk("cx24108 debug: entering SetTunerFreq, freq=%d\n", freq);
>> --
>> 2.39.2
>>
>
> Regards,
> Tommaso

2023-06-27 16:11:24

by Colin Ian King

Subject: Re: [PATCH][next] media: bt8xx: make read-only arrays static

On 27/06/2023 16:14, Tommaso Merciai wrote:
> Hi Coli,
>
> On Tue, Jun 27, 2023 at 04:04:38PM +0100, Colin King (gmail) wrote:
>> On 27/06/2023 15:38, Tommaso Merciai wrote:
>>> Hi Colin,
>>>
>>> On Tue, Jun 27, 2023 at 02:48:51PM +0100, Colin Ian King wrote:
>>>> Don't populate the arrays on the stack, instead make them static const.
>>>> Also add spaces between values to clean up checkpatch style warnings.
>>>>
>>>> Signed-off-by: Colin Ian King <[email protected]>
>>>> ---
>>>> drivers/media/pci/bt8xx/dvb-bt8xx.c | 12 ++++++++----
>>>> 1 file changed, 8 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/drivers/media/pci/bt8xx/dvb-bt8xx.c b/drivers/media/pci/bt8xx/dvb-bt8xx.c
>>>> index 4cb890b949c3..df83b59a618d 100644
>>>> --- a/drivers/media/pci/bt8xx/dvb-bt8xx.c
>>>> +++ b/drivers/media/pci/bt8xx/dvb-bt8xx.c
>>>> @@ -190,11 +190,15 @@ static int cx24108_tuner_set_params(struct dvb_frontend *fe)
>>>> u32 freq = c->frequency;
>>>> int i, a, n, pump;
>>>> u32 band, pll;
>>>> - u32 osci[]={950000,1019000,1075000,1178000,1296000,1432000,
>>>> - 1576000,1718000,1856000,2036000,2150000};
>>>> - u32 bandsel[]={0,0x00020000,0x00040000,0x00100800,0x00101000,
>>>> + static const u32 osci[] = {
>>>> + 950000, 1019000, 1075000, 1178000, 1296000, 1432000,
>>>> + 1576000, 1718000, 1856000, 2036000, 2150000
>>>> + };
>>>> + static const u32 bandsel[] = {
>>>> + 0, 0x00020000, 0x00040000, 0x00100800, 0x00101000,
>>>> 0x00102000,0x00104000,0x00108000,0x00110000,
> + 0x00102000, 0x00104000, 0x00108000, 0x00110000,
>
> ERROR: space required after that ',' (ctx:VxV)
> #199: FILE: drivers/media/pci/bt8xx/dvb-bt8xx.c:199:
> + 0x00102000,0x00104000,0x00108000,0x00110000,

Yep, I can see it now, I'll send a V2. :-/

>
> I'm wrong?
>
> Regards,
> Tommaso
>
>>>
>>> Are you not missing space also here?
>>
>> I can't see the space you are referring to.
>>
>>>
>>>> - 0x00120000,0x00140000};
>>>> + 0x00120000, 0x00140000
>>>> + };
>>>> #define XTAL 1011100 /* Hz, really 1.0111 MHz and a /10 prescaler */
>>>> dprintk("cx24108 debug: entering SetTunerFreq, freq=%d\n", freq);
>>>> --
>>>> 2.39.2
>>>>
>>>
>>> Regards,
>>> Tommaso
>>

2023-06-27 16:17:30

by Tommaso Merciai

Subject: Re: [PATCH][next] media: bt8xx: make read-only arrays static

Hi Coli,

On Tue, Jun 27, 2023 at 04:04:38PM +0100, Colin King (gmail) wrote:
> On 27/06/2023 15:38, Tommaso Merciai wrote:
> > Hi Colin,
> >
> > On Tue, Jun 27, 2023 at 02:48:51PM +0100, Colin Ian King wrote:
> > > Don't populate the arrays on the stack, instead make them static const.
> > > Also add spaces between values to clean up checkpatch style warnings.
> > >
> > > Signed-off-by: Colin Ian King <[email protected]>
> > > ---
> > > drivers/media/pci/bt8xx/dvb-bt8xx.c | 12 ++++++++----
> > > 1 file changed, 8 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/drivers/media/pci/bt8xx/dvb-bt8xx.c b/drivers/media/pci/bt8xx/dvb-bt8xx.c
> > > index 4cb890b949c3..df83b59a618d 100644
> > > --- a/drivers/media/pci/bt8xx/dvb-bt8xx.c
> > > +++ b/drivers/media/pci/bt8xx/dvb-bt8xx.c
> > > @@ -190,11 +190,15 @@ static int cx24108_tuner_set_params(struct dvb_frontend *fe)
> > > u32 freq = c->frequency;
> > > int i, a, n, pump;
> > > u32 band, pll;
> > > - u32 osci[]={950000,1019000,1075000,1178000,1296000,1432000,
> > > - 1576000,1718000,1856000,2036000,2150000};
> > > - u32 bandsel[]={0,0x00020000,0x00040000,0x00100800,0x00101000,
> > > + static const u32 osci[] = {
> > > + 950000, 1019000, 1075000, 1178000, 1296000, 1432000,
> > > + 1576000, 1718000, 1856000, 2036000, 2150000
> > > + };
> > > + static const u32 bandsel[] = {
> > > + 0, 0x00020000, 0x00040000, 0x00100800, 0x00101000,
> > > 0x00102000,0x00104000,0x00108000,0x00110000,
+ 0x00102000, 0x00104000, 0x00108000, 0x00110000,

ERROR: space required after that ',' (ctx:VxV)
#199: FILE: drivers/media/pci/bt8xx/dvb-bt8xx.c:199:
+ 0x00102000,0x00104000,0x00108000,0x00110000,

I'm wrong?

Regards,
Tommaso

> >
> > Are you not missing space also here?
>
> I can't see the space you are referring to.
>
> >
> > > - 0x00120000,0x00140000};
> > > + 0x00120000, 0x00140000
> > > + };
> > > #define XTAL 1011100 /* Hz, really 1.0111 MHz and a /10 prescaler */
> > > dprintk("cx24108 debug: entering SetTunerFreq, freq=%d\n", freq);
> > > --
> > > 2.39.2
> > >
> >
> > Regards,
> > Tommaso
>