[firefly] [PATCH] Staging: wlan-ng: fix sparse warnings for static functions

Silviu Popescu silviupopescu1990 at gmail.com
Mon Oct 7 22:17:46 EEST 2013


On Mon, Oct 7, 2013 at 9:28 PM, Teodora Baluta <teobaluta at gmail.com> wrote:
> Fix fixes sparse warnings for static functions
> * drivers/staging/wlan-ng/cfg80211.c:101:5: warning:
> symbol 'prism2_change_virtual_intf' was not declared.
>
> Signed-off-by: Teodora Baluta <teobaluta at gmail.com>
> ---
>  drivers/staging/wlan-ng/cfg80211.c |   29 +++++++++++++++--------------
>  1 file changed, 15 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
> index f1bce18..995e6ed 100644
> --- a/drivers/staging/wlan-ng/cfg80211.c
> +++ b/drivers/staging/wlan-ng/cfg80211.c
> @@ -98,7 +98,7 @@ static int prism2_domibset_pstr32(wlandevice_t *wlandev,
>
>
>  /* The interface functions, called by the cfg80211 layer */
> -int prism2_change_virtual_intf(struct wiphy *wiphy,
> +static int prism2_change_virtual_intf(struct wiphy *wiphy,
>                                struct net_device *dev,
>                                enum nl80211_iftype type, u32 *flags,
>                                struct vif_params *params)
> @@ -140,7 +140,7 @@ exit:
>         return err;
>  }
>
> -int prism2_add_key(struct wiphy *wiphy, struct net_device *dev,
> +static int prism2_add_key(struct wiphy *wiphy, struct net_device *dev,
>                    u8 key_index, bool pairwise, const u8 *mac_addr,
>                    struct key_params *params)
>  {
> @@ -199,7 +199,7 @@ exit:
>         return err;
>  }
>
> -int prism2_get_key(struct wiphy *wiphy, struct net_device *dev,
> +static int prism2_get_key(struct wiphy *wiphy, struct net_device *dev,
>                    u8 key_index, bool pairwise, const u8 *mac_addr, void *cookie,
>                    void (*callback)(void *cookie, struct key_params*))
>  {
> @@ -228,7 +228,7 @@ int prism2_get_key(struct wiphy *wiphy, struct net_device *dev,
>         return 0;
>  }
>
> -int prism2_del_key(struct wiphy *wiphy, struct net_device *dev,
> +static int prism2_del_key(struct wiphy *wiphy, struct net_device *dev,
>                    u8 key_index, bool pairwise, const u8 *mac_addr)
>  {
>         wlandevice_t *wlandev = dev->ml_priv;
> @@ -274,7 +274,7 @@ exit:
>         return err;
>  }
>
> -int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev,
> +static int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev,
>                            u8 key_index, bool unicast, bool multicast)
>  {
>         wlandevice_t *wlandev = dev->ml_priv;
> @@ -293,7 +293,7 @@ int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev,
>  }
>
>
> -int prism2_get_station(struct wiphy *wiphy, struct net_device *dev,
> +static int prism2_get_station(struct wiphy *wiphy, struct net_device *dev,
>                        u8 *mac, struct station_info *sinfo)
>  {
>         wlandevice_t *wlandev = dev->ml_priv;
> @@ -327,7 +327,8 @@ int prism2_get_station(struct wiphy *wiphy, struct net_device *dev,
>         return result;
>  }
>
> -int prism2_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
> +static int prism2_scan(struct wiphy *wiphy,
> +       struct cfg80211_scan_request *request)
>  {
>         struct net_device *dev;
>         struct prism2_wiphy_private *priv = wiphy_priv(wiphy);
> @@ -436,7 +437,7 @@ exit:
>         return err;
>  }
>
> -int prism2_set_wiphy_params(struct wiphy *wiphy, u32 changed)
> +static int prism2_set_wiphy_params(struct wiphy *wiphy, u32 changed)
>  {
>         struct prism2_wiphy_private *priv = wiphy_priv(wiphy);
>         wlandevice_t *wlandev = priv->wlandev;
> @@ -478,7 +479,7 @@ exit:
>         return err;
>  }
>
> -int prism2_connect(struct wiphy *wiphy, struct net_device *dev,
> +static int prism2_connect(struct wiphy *wiphy, struct net_device *dev,
>                    struct cfg80211_connect_params *sme)
>  {
>         wlandevice_t *wlandev = dev->ml_priv;
> @@ -602,7 +603,7 @@ exit:
>         return err;
>  }
>
> -int prism2_disconnect(struct wiphy *wiphy, struct net_device *dev,
> +static int prism2_disconnect(struct wiphy *wiphy, struct net_device *dev,
>                       u16 reason_code)
>  {
>         wlandevice_t *wlandev = dev->ml_priv;
> @@ -626,19 +627,19 @@ int prism2_disconnect(struct wiphy *wiphy, struct net_device *dev,
>  }
>
>
> -int prism2_join_ibss(struct wiphy *wiphy, struct net_device *dev,
> +static int prism2_join_ibss(struct wiphy *wiphy, struct net_device *dev,
>                      struct cfg80211_ibss_params *params)
>  {
>         return -EOPNOTSUPP;
>  }
>
> -int prism2_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
> +static int prism2_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
>  {
>         return -EOPNOTSUPP;
>  }
>
>
> -int prism2_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
> +static int prism2_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
>                         enum nl80211_tx_power_setting type, int mbm)
>  {
>         struct prism2_wiphy_private *priv = wiphy_priv(wiphy);
> @@ -665,7 +666,7 @@ exit:
>         return err;
>  }
>
> -int prism2_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
> +static int prism2_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
>                         int *dbm)
>  {
>         struct prism2_wiphy_private *priv = wiphy_priv(wiphy);
> --
> 1.7.10.4

As Vlad previously suggested [1], you should align the second and
following lines of the function header with the first with regards to
the opening parenthesis. If that seems to make the code lean too much
to the right, you could also try and split the first line after the
return type and align the third and subsequent lines to the second.
Play with these options and see which looks best in each case. Other
than that, no nit picks. :)

[1] http://lists.rosedu.org/pipermail/firefly/2013-October/000105.html

-- 
Silviu Popescu


More information about the firefly mailing list