2017-07-21 11:06:39

by Colin King

Subject: [PATCH][media-next] media: dvb-frontends/stv0910: make various local variables static

From: Colin Ian King <[email protected]>

The list stvlist and arrays padc_lookup, s1_sn_lookup and s2_sn_lookup
do not need to be in global scope, so make them all static.

Cleans up a bunch of smatch warnings:
symbol 'padc_lookup' was not declared. Should it be static?
symbol 's1_sn_lookup' was not declared. Should it be static?
symbol 's2_sn_lookup' was not declared. Should it be static?
symbol 'stvlist' was not declared. Should it be static?

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

diff --git a/drivers/media/dvb-frontends/stv0910.c b/drivers/media/dvb-frontends/stv0910.c
index 7e8a460449c5..bae1da3fdb2d 100644
--- a/drivers/media/dvb-frontends/stv0910.c
+++ b/drivers/media/dvb-frontends/stv0910.c
@@ -34,7 +34,7 @@
#define BER_SRC_S 0x20
#define BER_SRC_S2 0x20

-LIST_HEAD(stvlist);
+static LIST_HEAD(stvlist);

enum receive_mode { RCVMODE_NONE, RCVMODE_DVBS, RCVMODE_DVBS2, RCVMODE_AUTO };

@@ -207,7 +207,7 @@ static int write_shared_reg(struct stv *state, u16 reg, u8 mask, u8 val)
return status;
}

-struct slookup s1_sn_lookup[] = {
+static struct slookup s1_sn_lookup[] = {
{ 0, 9242 }, /*C/N= 0dB*/
{ 5, 9105 }, /*C/N=0.5dB*/
{ 10, 8950 }, /*C/N=1.0dB*/
@@ -264,7 +264,7 @@ struct slookup s1_sn_lookup[] = {
{ 510, 425 } /*C/N=51.0dB*/
};

-struct slookup s2_sn_lookup[] = {
+static struct slookup s2_sn_lookup[] = {
{ -30, 13950 }, /*C/N=-2.5dB*/
{ -25, 13580 }, /*C/N=-2.5dB*/
{ -20, 13150 }, /*C/N=-2.0dB*/
@@ -327,7 +327,7 @@ struct slookup s2_sn_lookup[] = {
{ 510, 463 }, /*C/N=51.0dB*/
};

-struct slookup padc_lookup[] = {
+static struct slookup padc_lookup[] = {
{ 0, 118000 }, /* PADC=+0dBm */
{ -100, 93600 }, /* PADC=-1dBm */
{ -200, 74500 }, /* PADC=-2dBm */
--
2.11.0

2017-07-22 11:00:00

by Daniel Scheller

Subject: Re: [PATCH][media-next] media: dvb-frontends/stv0910: make various local variables static

Am Fri, 21 Jul 2017 12:06:35 +0100
schrieb Colin King <[email protected]>:

> From: Colin Ian King <[email protected]>
>
> The list stvlist and arrays padc_lookup, s1_sn_lookup and s2_sn_lookup
> do not need to be in global scope, so make them all static.
>
> Cleans up a bunch of smatch warnings:
> symbol 'padc_lookup' was not declared. Should it be static?
> symbol 's1_sn_lookup' was not declared. Should it be static?
> symbol 's2_sn_lookup' was not declared. Should it be static?
> symbol 'stvlist' was not declared. Should it be static?
>
> Signed-off-by: Colin Ian King <[email protected]>

Thanks,

Acked-by: Daniel Scheller <[email protected]>

> ---
> drivers/media/dvb-frontends/stv0910.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/dvb-frontends/stv0910.c
> b/drivers/media/dvb-frontends/stv0910.c index
> 7e8a460449c5..bae1da3fdb2d 100644 ---
> a/drivers/media/dvb-frontends/stv0910.c +++
> b/drivers/media/dvb-frontends/stv0910.c @@ -34,7 +34,7 @@
> #define BER_SRC_S 0x20
> #define BER_SRC_S2 0x20
>
> -LIST_HEAD(stvlist);
> +static LIST_HEAD(stvlist);
>
> enum receive_mode { RCVMODE_NONE, RCVMODE_DVBS, RCVMODE_DVBS2,
> RCVMODE_AUTO };
> @@ -207,7 +207,7 @@ static int write_shared_reg(struct stv *state,
> u16 reg, u8 mask, u8 val) return status;
> }
>
> -struct slookup s1_sn_lookup[] = {
> +static struct slookup s1_sn_lookup[] = {
> { 0, 9242 }, /*C/N= 0dB*/
> { 5, 9105 }, /*C/N=0.5dB*/
> { 10, 8950 }, /*C/N=1.0dB*/
> @@ -264,7 +264,7 @@ struct slookup s1_sn_lookup[] = {
> { 510, 425 } /*C/N=51.0dB*/
> };
>
> -struct slookup s2_sn_lookup[] = {
> +static struct slookup s2_sn_lookup[] = {
> { -30, 13950 }, /*C/N=-2.5dB*/
> { -25, 13580 }, /*C/N=-2.5dB*/
> { -20, 13150 }, /*C/N=-2.0dB*/
> @@ -327,7 +327,7 @@ struct slookup s2_sn_lookup[] = {
> { 510, 463 }, /*C/N=51.0dB*/
> };
>
> -struct slookup padc_lookup[] = {
> +static struct slookup padc_lookup[] = {
> { 0, 118000 }, /* PADC=+0dBm */
> { -100, 93600 }, /* PADC=-1dBm */
> { -200, 74500 }, /* PADC=-2dBm */

Best regards,
Daniel Scheller
--
https://github.com/herrnst