Return-path: Received: from mail.perches.com ([173.55.12.10]:1797 "EHLO mail.perches.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752711Ab0CRGVu (ORCPT ); Thu, 18 Mar 2010 02:21:50 -0400 From: Joe Perches To: linux-kernel@vger.kernel.org Cc: Richard Kennedy , Johannes Berg , Geoff Levand , Zhu Yi , Reinette Chatre , Intel Linux Wireless , "John W. Linville" , linuxppc-dev@ozlabs.org, cbe-oss-dev@ozlabs.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH v2 5/7] drivers/net: Remove local #define IW_IOCTL, use STD_IW_HANDLER Date: Wed, 17 Mar 2010 23:21:38 -0700 Message-Id: <696c60e097ff35aeb2d746d1a0edf167514f2b61.1268892664.git.joe@perches.com> In-Reply-To: References: Sender: linux-wireless-owner@vger.kernel.org List-ID: Use #define STD_IW_HANDLER from wireless.h instead Signed-off-by: Joe Perches --- drivers/net/ps3_gelic_wireless.c | 35 +++++++------- drivers/net/wireless/ipw2x00/ipw2200.c | 83 ++++++++++++++++---------------- 2 files changed, 58 insertions(+), 60 deletions(-) diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c index 2663b2f..2bc8935 100644 --- a/drivers/net/ps3_gelic_wireless.c +++ b/drivers/net/ps3_gelic_wireless.c @@ -2279,26 +2279,25 @@ void gelic_wl_interrupt(struct net_device *netdev, u64 status) /* * driver helpers */ -#define IW_IOCTL(n) [(n) - SIOCSIWCOMMIT] static const iw_handler gelic_wl_wext_handler[] = { - IW_IOCTL(SIOCGIWNAME) = gelic_wl_get_name, - IW_IOCTL(SIOCGIWRANGE) = gelic_wl_get_range, - IW_IOCTL(SIOCSIWSCAN) = gelic_wl_set_scan, - IW_IOCTL(SIOCGIWSCAN) = gelic_wl_get_scan, - IW_IOCTL(SIOCSIWAUTH) = gelic_wl_set_auth, - IW_IOCTL(SIOCGIWAUTH) = gelic_wl_get_auth, - IW_IOCTL(SIOCSIWESSID) = gelic_wl_set_essid, - IW_IOCTL(SIOCGIWESSID) = gelic_wl_get_essid, - IW_IOCTL(SIOCSIWENCODE) = gelic_wl_set_encode, - IW_IOCTL(SIOCGIWENCODE) = gelic_wl_get_encode, - IW_IOCTL(SIOCSIWAP) = gelic_wl_set_ap, - IW_IOCTL(SIOCGIWAP) = gelic_wl_get_ap, - IW_IOCTL(SIOCSIWENCODEEXT) = gelic_wl_set_encodeext, - IW_IOCTL(SIOCGIWENCODEEXT) = gelic_wl_get_encodeext, - IW_IOCTL(SIOCSIWMODE) = gelic_wl_set_mode, - IW_IOCTL(SIOCGIWMODE) = gelic_wl_get_mode, - IW_IOCTL(SIOCGIWNICKN) = gelic_wl_get_nick, + STD_IW_HANDLER(SIOCGIWNAME, gelic_wl_get_name), + STD_IW_HANDLER(SIOCGIWRANGE, gelic_wl_get_range), + STD_IW_HANDLER(SIOCSIWSCAN, gelic_wl_set_scan), + STD_IW_HANDLER(SIOCGIWSCAN, gelic_wl_get_scan), + STD_IW_HANDLER(SIOCSIWAUTH, gelic_wl_set_auth), + STD_IW_HANDLER(SIOCGIWAUTH, gelic_wl_get_auth), + STD_IW_HANDLER(SIOCSIWESSID, gelic_wl_set_essid), + STD_IW_HANDLER(SIOCGIWESSID, gelic_wl_get_essid), + STD_IW_HANDLER(SIOCSIWENCODE, gelic_wl_set_encode), + STD_IW_HANDLER(SIOCGIWENCODE, gelic_wl_get_encode), + STD_IW_HANDLER(SIOCSIWAP, gelic_wl_set_ap), + STD_IW_HANDLER(SIOCGIWAP, gelic_wl_get_ap), + STD_IW_HANDLER(SIOCSIWENCODEEXT, gelic_wl_set_encodeext), + STD_IW_HANDLER(SIOCGIWENCODEEXT, gelic_wl_get_encodeext), + STD_IW_HANDLER(SIOCSIWMODE, gelic_wl_set_mode), + STD_IW_HANDLER(SIOCGIWMODE, gelic_wl_get_mode), + STD_IW_HANDLER(SIOCGIWNICKN, gelic_wl_get_nick), }; static const struct iw_handler_def gelic_wl_wext_handler_def = { diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index 5c7aa1b..1e84888 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c @@ -9995,49 +9995,48 @@ static int ipw_wx_sw_reset(struct net_device *dev, } /* Rebase the WE IOCTLs to zero for the handler array */ -#define IW_IOCTL(x) [(x)-SIOCSIWCOMMIT] static iw_handler ipw_wx_handlers[] = { - IW_IOCTL(SIOCGIWNAME) = (iw_handler) cfg80211_wext_giwname, - IW_IOCTL(SIOCSIWFREQ) = ipw_wx_set_freq, - IW_IOCTL(SIOCGIWFREQ) = ipw_wx_get_freq, - IW_IOCTL(SIOCSIWMODE) = ipw_wx_set_mode, - IW_IOCTL(SIOCGIWMODE) = ipw_wx_get_mode, - IW_IOCTL(SIOCSIWSENS) = ipw_wx_set_sens, - IW_IOCTL(SIOCGIWSENS) = ipw_wx_get_sens, - IW_IOCTL(SIOCGIWRANGE) = ipw_wx_get_range, - IW_IOCTL(SIOCSIWAP) = ipw_wx_set_wap, - IW_IOCTL(SIOCGIWAP) = ipw_wx_get_wap, - IW_IOCTL(SIOCSIWSCAN) = ipw_wx_set_scan, - IW_IOCTL(SIOCGIWSCAN) = ipw_wx_get_scan, - IW_IOCTL(SIOCSIWESSID) = ipw_wx_set_essid, - IW_IOCTL(SIOCGIWESSID) = ipw_wx_get_essid, - IW_IOCTL(SIOCSIWNICKN) = ipw_wx_set_nick, - IW_IOCTL(SIOCGIWNICKN) = ipw_wx_get_nick, - IW_IOCTL(SIOCSIWRATE) = ipw_wx_set_rate, - IW_IOCTL(SIOCGIWRATE) = ipw_wx_get_rate, - IW_IOCTL(SIOCSIWRTS) = ipw_wx_set_rts, - IW_IOCTL(SIOCGIWRTS) = ipw_wx_get_rts, - IW_IOCTL(SIOCSIWFRAG) = ipw_wx_set_frag, - IW_IOCTL(SIOCGIWFRAG) = ipw_wx_get_frag, - IW_IOCTL(SIOCSIWTXPOW) = ipw_wx_set_txpow, - IW_IOCTL(SIOCGIWTXPOW) = ipw_wx_get_txpow, - IW_IOCTL(SIOCSIWRETRY) = ipw_wx_set_retry, - IW_IOCTL(SIOCGIWRETRY) = ipw_wx_get_retry, - IW_IOCTL(SIOCSIWENCODE) = ipw_wx_set_encode, - IW_IOCTL(SIOCGIWENCODE) = ipw_wx_get_encode, - IW_IOCTL(SIOCSIWPOWER) = ipw_wx_set_power, - IW_IOCTL(SIOCGIWPOWER) = ipw_wx_get_power, - IW_IOCTL(SIOCSIWSPY) = iw_handler_set_spy, - IW_IOCTL(SIOCGIWSPY) = iw_handler_get_spy, - IW_IOCTL(SIOCSIWTHRSPY) = iw_handler_set_thrspy, - IW_IOCTL(SIOCGIWTHRSPY) = iw_handler_get_thrspy, - IW_IOCTL(SIOCSIWGENIE) = ipw_wx_set_genie, - IW_IOCTL(SIOCGIWGENIE) = ipw_wx_get_genie, - IW_IOCTL(SIOCSIWMLME) = ipw_wx_set_mlme, - IW_IOCTL(SIOCSIWAUTH) = ipw_wx_set_auth, - IW_IOCTL(SIOCGIWAUTH) = ipw_wx_get_auth, - IW_IOCTL(SIOCSIWENCODEEXT) = ipw_wx_set_encodeext, - IW_IOCTL(SIOCGIWENCODEEXT) = ipw_wx_get_encodeext, + STD_IW_HANDLER(SIOCGIWNAME, cfg80211_wext_giwname), + STD_IW_HANDLER(SIOCSIWFREQ, ipw_wx_set_freq), + STD_IW_HANDLER(SIOCGIWFREQ, ipw_wx_get_freq), + STD_IW_HANDLER(SIOCSIWMODE, ipw_wx_set_mode), + STD_IW_HANDLER(SIOCGIWMODE, ipw_wx_get_mode), + STD_IW_HANDLER(SIOCSIWSENS, ipw_wx_set_sens), + STD_IW_HANDLER(SIOCGIWSENS, ipw_wx_get_sens), + STD_IW_HANDLER(SIOCGIWRANGE, ipw_wx_get_range), + STD_IW_HANDLER(SIOCSIWAP, ipw_wx_set_wap), + STD_IW_HANDLER(SIOCGIWAP, ipw_wx_get_wap), + STD_IW_HANDLER(SIOCSIWSCAN, ipw_wx_set_scan), + STD_IW_HANDLER(SIOCGIWSCAN, ipw_wx_get_scan), + STD_IW_HANDLER(SIOCSIWESSID, ipw_wx_set_essid), + STD_IW_HANDLER(SIOCGIWESSID, ipw_wx_get_essid), + STD_IW_HANDLER(SIOCSIWNICKN, ipw_wx_set_nick), + STD_IW_HANDLER(SIOCGIWNICKN, ipw_wx_get_nick), + STD_IW_HANDLER(SIOCSIWRATE, ipw_wx_set_rate), + STD_IW_HANDLER(SIOCGIWRATE, ipw_wx_get_rate), + STD_IW_HANDLER(SIOCSIWRTS, ipw_wx_set_rts), + STD_IW_HANDLER(SIOCGIWRTS, ipw_wx_get_rts), + STD_IW_HANDLER(SIOCSIWFRAG, ipw_wx_set_frag), + STD_IW_HANDLER(SIOCGIWFRAG, ipw_wx_get_frag), + STD_IW_HANDLER(SIOCSIWTXPOW, ipw_wx_set_txpow), + STD_IW_HANDLER(SIOCGIWTXPOW, ipw_wx_get_txpow), + STD_IW_HANDLER(SIOCSIWRETRY, ipw_wx_set_retry), + STD_IW_HANDLER(SIOCGIWRETRY, ipw_wx_get_retry), + STD_IW_HANDLER(SIOCSIWENCODE, ipw_wx_set_encode), + STD_IW_HANDLER(SIOCGIWENCODE, ipw_wx_get_encode), + STD_IW_HANDLER(SIOCSIWPOWER, ipw_wx_set_power), + STD_IW_HANDLER(SIOCGIWPOWER, ipw_wx_get_power), + STD_IW_HANDLER(SIOCSIWSPY, iw_handler_set_spy), + STD_IW_HANDLER(SIOCGIWSPY, iw_handler_get_spy), + STD_IW_HANDLER(SIOCSIWTHRSPY, iw_handler_set_thrspy), + STD_IW_HANDLER(SIOCGIWTHRSPY, iw_handler_get_thrspy), + STD_IW_HANDLER(SIOCSIWGENIE, ipw_wx_set_genie), + STD_IW_HANDLER(SIOCGIWGENIE, ipw_wx_get_genie), + STD_IW_HANDLER(SIOCSIWMLME, ipw_wx_set_mlme), + STD_IW_HANDLER(SIOCSIWAUTH, ipw_wx_set_auth), + STD_IW_HANDLER(SIOCGIWAUTH, ipw_wx_get_auth), + STD_IW_HANDLER(SIOCSIWENCODEEXT, ipw_wx_set_encodeext), + STD_IW_HANDLER(SIOCGIWENCODEEXT, ipw_wx_get_encodeext), }; enum { -- 1.7.0.14.g7e948