[PATCH 0/3] sparse fixes

[PATCH 0/3] sparse fixes

[Marc Kleine-Budde]

Hello,

while testing Oliver's series I fixed the following sparse errors.

regards, Marc.

[PATCH 1/3] can: cc770: fix sparse warning for cc770_interrupt

[Marc Kleine-Budde]

Make cc770_interrupt static to fix the following sparse warning:
drivers/net/can/cc770/cc770.c:699:13: warning: symbol
'cc770_interrupt' was not declared. Should it be static?

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/cc770/cc770.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/can/cc770/cc770.c b/drivers/net/can/cc770/cc770.c
index d42a6a7..a138db1 100644
--- a/drivers/net/can/cc770/cc770.c
+++ b/drivers/net/can/cc770/cc770.c
@@ -695,7 +695,7 @@ static void cc770_tx_interrupt(struct net_device *dev, unsigned int o)
 	netif_wake_queue(dev);
 }
 
-irqreturn_t cc770_interrupt(int irq, void *dev_id)
+static irqreturn_t cc770_interrupt(int irq, void *dev_id)
 {
 	struct net_device *dev = (struct net_device *)dev_id;
 	struct cc770_priv *priv = netdev_priv(dev);
-- 
1.7.10

[PATCH 2/3] can: dev: fix sparse warning for can_restart

[Marc Kleine-Budde]

Make can_restart static to fix the following sparse warning:
drivers/net/can/dev.c:371:6: warning: symbol 'can_restart' was not
declared. Should it be static?

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/dev.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 239e4dd..963e2cc 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -401,7 +401,7 @@ EXPORT_SYMBOL_GPL(can_free_echo_skb);
 /*
  * CAN device restart for bus-off recovery
  */
-void can_restart(unsigned long data)
+static void can_restart(unsigned long data)
 {
 	struct net_device *dev = (struct net_device *)data;
 	struct can_priv *priv = netdev_priv(dev);
-- 
1.7.10

[PATCH 3/3] can: af_can: fix sparse warning for can_rx_alldev_list

[Marc Kleine-Budde]

Make can_rx_alldev_list static to fix the following sparse warning:
net/can/af_can.c:80:22: warning: symbol 'can_rx_alldev_list' was not
declared. Should it be static?

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 net/can/af_can.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/can/af_can.c b/net/can/af_can.c
index 821022a..ccef846 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -78,7 +78,7 @@ module_param(stats_timer, int, S_IRUGO);
 MODULE_PARM_DESC(stats_timer, "enable timer for statistics (default:on)");
 
 /* receive filters subscribed for 'all' CAN devices */
-struct dev_rcv_lists can_rx_alldev_list;
+static struct dev_rcv_lists can_rx_alldev_list;
 static DEFINE_SPINLOCK(can_rcvlists_lock);
 
 static struct kmem_cache *rcv_cache __read_mostly;
-- 
1.7.10

Re: [PATCH 3/3] can: af_can: fix sparse warning for can_rx_alldev_list

[Oliver Hartkopp]

On 19.06.2012 22:05, Marc Kleine-Budde wrote:

> Make can_rx_alldev_list static to fix the following sparse warning:
> net/can/af_can.c:80:22: warning: symbol 'can_rx_alldev_list' was not
> declared. Should it be static?
> 
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ---
>  net/can/af_can.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/can/af_can.c b/net/can/af_can.c
> index 821022a..ccef846 100644
> --- a/net/can/af_can.c
> +++ b/net/can/af_can.c
> @@ -78,7 +78,7 @@ module_param(stats_timer, int, S_IRUGO);
>  MODULE_PARM_DESC(stats_timer, "enable timer for statistics (default:on)");
>  
>  /* receive filters subscribed for 'all' CAN devices */
> -struct dev_rcv_lists can_rx_alldev_list;
> +static struct dev_rcv_lists can_rx_alldev_list;
>  static DEFINE_SPINLOCK(can_rcvlists_lock);
>  
>  static struct kmem_cache *rcv_cache __read_mostly;


Hello Marc,

did you already compile this?

can_rx_alldev_list is used in af_can.c and proc.c :

$ grep can_rx_alldev_list *.c
af_can.c:struct dev_rcv_lists can_rx_alldev_list;
af_can.c:		return &can_rx_alldev_list;
af_can.c:	matches = can_rcv_filter(&can_rx_alldev_list, skb);
af_can.c:	memset(&can_rx_alldev_list, 0, sizeof(can_rx_alldev_list));
proc.c:extern struct dev_rcv_lists can_rx_alldev_list;
proc.c:	d = &can_rx_alldev_list;
proc.c:	d = &can_rx_alldev_list;

So i wonder if making it static inside af_can.c is a good idea.

Is there no way to satisfy the sparse warning in another way?

Regards,
Oliver

Re: [PATCH 3/3] can: af_can: fix sparse warning for can_rx_alldev_list

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 2033 bytes --]

On 06/20/2012 05:39 AM, Oliver Hartkopp wrote:
> On 19.06.2012 22:05, Marc Kleine-Budde wrote:
> 
>> Make can_rx_alldev_list static to fix the following sparse warning:
>> net/can/af_can.c:80:22: warning: symbol 'can_rx_alldev_list' was not
>> declared. Should it be static?
>>
>> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
>> ---
>>  net/can/af_can.c |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/net/can/af_can.c b/net/can/af_can.c
>> index 821022a..ccef846 100644
>> --- a/net/can/af_can.c
>> +++ b/net/can/af_can.c
>> @@ -78,7 +78,7 @@ module_param(stats_timer, int, S_IRUGO);
>>  MODULE_PARM_DESC(stats_timer, "enable timer for statistics (default:on)");
>>  
>>  /* receive filters subscribed for 'all' CAN devices */
>> -struct dev_rcv_lists can_rx_alldev_list;
>> +static struct dev_rcv_lists can_rx_alldev_list;
>>  static DEFINE_SPINLOCK(can_rcvlists_lock);
>>  
>>  static struct kmem_cache *rcv_cache __read_mostly;
> 
> 
> Hello Marc,
> 
> did you already compile this?

Compile yes, link no :D

> can_rx_alldev_list is used in af_can.c and proc.c :
> 
> $ grep can_rx_alldev_list *.c
> af_can.c:struct dev_rcv_lists can_rx_alldev_list;
> af_can.c:		return &can_rx_alldev_list;
> af_can.c:	matches = can_rcv_filter(&can_rx_alldev_list, skb);
> af_can.c:	memset(&can_rx_alldev_list, 0, sizeof(can_rx_alldev_list));
> proc.c:extern struct dev_rcv_lists can_rx_alldev_list;
         ^^^^^^

> proc.c:	d = &can_rx_alldev_list;
> proc.c:	d = &can_rx_alldev_list;
> 
> So i wonder if making it static inside af_can.c is a good idea.
> 
> Is there no way to satisfy the sparse warning in another way?

Yes, don't use extern, put it into af_can.h.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

Re: [PATCH 3/3] can: af_can: fix sparse warning for can_rx_alldev_list

[Oliver Hartkopp]

On 20.06.2012 10:00, Marc Kleine-Budde wrote:

> On 06/20/2012 05:39 AM, Oliver Hartkopp wrote:
>> On 19.06.2012 22:05, Marc Kleine-Budde wrote:

>> Is there no way to satisfy the sparse warning in another way?
> 
> Yes, don't use extern, put it into af_can.h.
>


So this would fix the sparse warning then?

diff --git a/net/can/af_can.h b/net/can/af_can.h
index fd882db..1dccb4c 100644
--- a/net/can/af_can.h
+++ b/net/can/af_can.h
@@ -104,6 +104,9 @@ struct s_pstats {
 	unsigned long rcv_entries_max;
 };

+/* receive filters subscribed for 'all' CAN devices */
+extern struct dev_rcv_lists can_rx_alldev_list;
+
 /* function prototypes for the CAN networklayer procfs (proc.c) */
 extern void can_init_proc(void);
 extern void can_remove_proc(void);
diff --git a/net/can/proc.c b/net/can/proc.c
index ba873c3..3b6dd31 100644
--- a/net/can/proc.c
+++ b/net/can/proc.c
@@ -83,9 +83,6 @@ static const char rx_list_name[][8] = {
 	[RX_EFF] = "rx_eff",
 };

-/* receive filters subscribed for 'all' CAN devices */
-extern struct dev_rcv_lists can_rx_alldev_list;
-
 /*
  * af_can statistics stuff
  */

Re: [PATCH 3/3] can: af_can: fix sparse warning for can_rx_alldev_list

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 415 bytes --]

On 06/20/2012 05:46 PM, Oliver Hartkopp wrote:
> So this would fix the sparse warning then?

Yes it does. Can I add your S-o-b?

Marc
-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

Re: [PATCH 3/3] can: af_can: fix sparse warning for can_rx_alldev_list

[Oliver Hartkopp]

On 20.06.2012 18:05, Marc Kleine-Budde wrote:

> On 06/20/2012 05:46 PM, Oliver Hartkopp wrote:
>> So this would fix the sparse warning then?
> 
> Yes it does. Can I add your S-o-b?
> 


Yep.

Thanks!