| Message ID | 20170427110421.2431598-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Thu, Apr 27, 2017 at 01:04:02PM +0200, Arnd Bergmann wrote: > The previous patch addressed a sparse warning but replaced it with a > compiler warning when CONFIG_MODULES is disabled: > > drivers/net/ethernet/mellanox/mlx5/core/ipoib.c:485:13: error: 'mlx5_rdma_netdev_free' defined but not used [-Werror=unused-function] > drivers/net/ethernet/mellanox/mlx5/core/ipoib.c:423:27: error: 'mlx5_rdma_netdev_alloc' defined but not used [-Werror=unused-function] > > We should never export 'static' functions, so this makes them global > again but hides them in another #ifdef like the change before. > > Fixes: a7082ef066f0 ("mlx5: hide unused functions") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/net/ethernet/mellanox/mlx5/core/ipoib.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > Hi Arnd, Thanks for the patch, but Stephen and Saeed already sent patch similar to it. http://marc.info/?l=linux-netdev&m=149288674816288&w=2 Thanks > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/ipoib.c b/drivers/net/ethernet/mellanox/mlx5/core/ipoib.c > index 3c84e36af018..eb48f112dff4 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/ipoib.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/ipoib.c > @@ -405,7 +405,6 @@ static int mlx5i_xmit(struct net_device *dev, struct sk_buff *skb, > > return mlx5i_sq_xmit(sq, skb, &mah->av, dqpn, dqkey); > } > -#endif > > static int mlx5i_check_required_hca_cap(struct mlx5_core_dev *mdev) > { > @@ -420,10 +419,10 @@ static int mlx5i_check_required_hca_cap(struct mlx5_core_dev *mdev) > return 0; > } > > -static struct net_device *mlx5_rdma_netdev_alloc(struct mlx5_core_dev *mdev, > - struct ib_device *ibdev, > - const char *name, > - void (*setup)(struct net_device *)) > +struct net_device *mlx5_rdma_netdev_alloc(struct mlx5_core_dev *mdev, > + struct ib_device *ibdev, > + const char *name, > + void (*setup)(struct net_device *)) > { > const struct mlx5e_profile *profile = &mlx5i_nic_profile; > int nch = profile->max_nch(mdev); > @@ -482,7 +481,7 @@ static struct net_device *mlx5_rdma_netdev_alloc(struct mlx5_core_dev *mdev, > } > EXPORT_SYMBOL(mlx5_rdma_netdev_alloc); > > -static void mlx5_rdma_netdev_free(struct net_device *netdev) > +void mlx5_rdma_netdev_free(struct net_device *netdev) > { > struct mlx5e_priv *priv = mlx5i_epriv(netdev); > const struct mlx5e_profile *profile = priv->profile; > @@ -495,4 +494,4 @@ static void mlx5_rdma_netdev_free(struct net_device *netdev) > mlx5e_destroy_mdev_resources(priv->mdev); > } > EXPORT_SYMBOL(mlx5_rdma_netdev_free); > - > +#endif > -- > 2.9.0 >
On Thu, Apr 27, 2017 at 1:55 PM, Leon Romanovsky <leonro@mellanox.com> wrote: > On Thu, Apr 27, 2017 at 01:04:02PM +0200, Arnd Bergmann wrote: >> The previous patch addressed a sparse warning but replaced it with a >> compiler warning when CONFIG_MODULES is disabled: >> >> drivers/net/ethernet/mellanox/mlx5/core/ipoib.c:485:13: error: 'mlx5_rdma_netdev_free' defined but not used [-Werror=unused-function] >> drivers/net/ethernet/mellanox/mlx5/core/ipoib.c:423:27: error: 'mlx5_rdma_netdev_alloc' defined but not used [-Werror=unused-function] >> >> We should never export 'static' functions, so this makes them global >> again but hides them in another #ifdef like the change before. >> >> Fixes: a7082ef066f0 ("mlx5: hide unused functions") >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Hi Arnd, > > Thanks for the patch, but Stephen and Saeed already sent patch similar to it. > http://marc.info/?l=linux-netdev&m=149288674816288&w=2 That link is for the patch that introduced the warning that I'm fixing here, it showed up yesterday in linux-next. Did you misread my patch, or just give the wrong link? Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Apr 27, 2017 at 02:04:15PM +0200, Arnd Bergmann wrote: > On Thu, Apr 27, 2017 at 1:55 PM, Leon Romanovsky <leonro@mellanox.com> wrote: > > On Thu, Apr 27, 2017 at 01:04:02PM +0200, Arnd Bergmann wrote: > >> The previous patch addressed a sparse warning but replaced it with a > >> compiler warning when CONFIG_MODULES is disabled: > >> > >> drivers/net/ethernet/mellanox/mlx5/core/ipoib.c:485:13: error: 'mlx5_rdma_netdev_free' defined but not used [-Werror=unused-function] > >> drivers/net/ethernet/mellanox/mlx5/core/ipoib.c:423:27: error: 'mlx5_rdma_netdev_alloc' defined but not used [-Werror=unused-function] > >> > >> We should never export 'static' functions, so this makes them global > >> again but hides them in another #ifdef like the change before. > >> > >> Fixes: a7082ef066f0 ("mlx5: hide unused functions") > >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > > > Hi Arnd, > > > > Thanks for the patch, but Stephen and Saeed already sent patch similar to it. > > http://marc.info/?l=linux-netdev&m=149288674816288&w=2 > > That link is for the patch that introduced the warning that I'm fixing here, > it showed up yesterday in linux-next. > > Did you misread my patch, or just give the wrong link? Sorry, I misread you patch, because I prepared patch which add users for these functions and didn't notice both "static" and EXPORT_SYMBOLS at the same time. I will send it in a couple of minutes. Thanks > > Arnd > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" 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/drivers/net/ethernet/mellanox/mlx5/core/ipoib.c b/drivers/net/ethernet/mellanox/mlx5/core/ipoib.c index 3c84e36af018..eb48f112dff4 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/ipoib.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/ipoib.c @@ -405,7 +405,6 @@ static int mlx5i_xmit(struct net_device *dev, struct sk_buff *skb, return mlx5i_sq_xmit(sq, skb, &mah->av, dqpn, dqkey); } -#endif static int mlx5i_check_required_hca_cap(struct mlx5_core_dev *mdev) { @@ -420,10 +419,10 @@ static int mlx5i_check_required_hca_cap(struct mlx5_core_dev *mdev) return 0; } -static struct net_device *mlx5_rdma_netdev_alloc(struct mlx5_core_dev *mdev, - struct ib_device *ibdev, - const char *name, - void (*setup)(struct net_device *)) +struct net_device *mlx5_rdma_netdev_alloc(struct mlx5_core_dev *mdev, + struct ib_device *ibdev, + const char *name, + void (*setup)(struct net_device *)) { const struct mlx5e_profile *profile = &mlx5i_nic_profile; int nch = profile->max_nch(mdev); @@ -482,7 +481,7 @@ static struct net_device *mlx5_rdma_netdev_alloc(struct mlx5_core_dev *mdev, } EXPORT_SYMBOL(mlx5_rdma_netdev_alloc); -static void mlx5_rdma_netdev_free(struct net_device *netdev) +void mlx5_rdma_netdev_free(struct net_device *netdev) { struct mlx5e_priv *priv = mlx5i_epriv(netdev); const struct mlx5e_profile *profile = priv->profile; @@ -495,4 +494,4 @@ static void mlx5_rdma_netdev_free(struct net_device *netdev) mlx5e_destroy_mdev_resources(priv->mdev); } EXPORT_SYMBOL(mlx5_rdma_netdev_free); - +#endif
The previous patch addressed a sparse warning but replaced it with a compiler warning when CONFIG_MODULES is disabled: drivers/net/ethernet/mellanox/mlx5/core/ipoib.c:485:13: error: 'mlx5_rdma_netdev_free' defined but not used [-Werror=unused-function] drivers/net/ethernet/mellanox/mlx5/core/ipoib.c:423:27: error: 'mlx5_rdma_netdev_alloc' defined but not used [-Werror=unused-function] We should never export 'static' functions, so this makes them global again but hides them in another #ifdef like the change before. Fixes: a7082ef066f0 ("mlx5: hide unused functions") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/ethernet/mellanox/mlx5/core/ipoib.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)