| Message ID | 539B06E1.4050005@acm.org |
|---|---|
| State | Rejected, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Bart Van Assche <bvanassche@acm.org> Date: Fri, 13 Jun 2014 16:12:49 +0200 > Avoid that the following compiler warning is reported when building > with W=1: > > include/linux/netdevice.h: In function 'netif_addr_lock_nested': > include/linux/netdevice.h:2865:6: warning: variable 'subclass' set but not used [-Wunused-but-set-variable] > int subclass = SINGLE_DEPTH_NESTING; > ^ > > This patch does not change any functionality. > > Signed-off-by: Bart Van Assche <bvanassche@acm.org> This has already been discussed. The spin_lock_nested() with your configuration should be adjusted to mark the argument as used. There is nothing wrong with this code, it should not warn, it's simply the spin locking macros that need to be fixed. I'm not applying this patch, sorry. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index abe3de1..3c0a2e7 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2951,12 +2951,10 @@ static inline void netif_addr_lock(struct net_device *dev) static inline void netif_addr_lock_nested(struct net_device *dev) { - int subclass = SINGLE_DEPTH_NESTING; - - if (dev->netdev_ops->ndo_get_lock_subclass) - subclass = dev->netdev_ops->ndo_get_lock_subclass(dev); - - spin_lock_nested(&dev->addr_list_lock, subclass); + spin_lock_nested(&dev->addr_list_lock, + dev->netdev_ops->ndo_get_lock_subclass ? + dev->netdev_ops->ndo_get_lock_subclass(dev) : + SINGLE_DEPTH_NESTING); } static inline void netif_addr_lock_bh(struct net_device *dev)
Avoid that the following compiler warning is reported when building with W=1: include/linux/netdevice.h: In function 'netif_addr_lock_nested': include/linux/netdevice.h:2865:6: warning: variable 'subclass' set but not used [-Wunused-but-set-variable] int subclass = SINGLE_DEPTH_NESTING; ^ This patch does not change any functionality. Signed-off-by: Bart Van Assche <bvanassche@acm.org> Cc: Vlad Yasevich <vyasevic@redhat.com> Cc: David S. Miller <davem@davemloft.net> --- include/linux/netdevice.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)