11 files changed, 34 insertions, 36 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 80ae75999536..7d717c4d9845 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -7578,9 +7578,9 @@ static const iw_handler		airo_private_handler[] =
 
 static const struct iw_handler_def      airo_handler_def =
 {
-        .num_standard   = sizeof(airo_handler)/sizeof(iw_handler),
-        .num_private    = sizeof(airo_private_handler)/sizeof(iw_handler),
-        .num_private_args = sizeof(airo_private_args)/sizeof(struct iw_priv_args),
+        .num_standard   = ARRAY_SIZE(airo_handler),
+        .num_private    = ARRAY_SIZE(airo_private_handler),
+        .num_private_args = ARRAY_SIZE(airo_private_args),
         .standard       = airo_handler,
         .private        = airo_private_handler,
         .private_args   = airo_private_args,
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index d58ac84f4e9e..730b3541e325 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -3976,9 +3976,9 @@ static const iw_handler prism2_private_handler[] =
 
 const struct iw_handler_def hostap_iw_handler_def =
 {
-        .num_standard   = sizeof(prism2_handler) / sizeof(iw_handler),
-        .num_private    = sizeof(prism2_private_handler) / sizeof(iw_handler),
-        .num_private_args = sizeof(prism2_priv) / sizeof(struct iw_priv_args),
+        .num_standard   = ARRAY_SIZE(prism2_handler),
+        .num_private    = ARRAY_SIZE(prism2_private_handler),
+        .num_private_args = ARRAY_SIZE(prism2_priv),
         .standard       = (iw_handler *) prism2_handler,
         .private        = (iw_handler *) prism2_private_handler,
         .private_args   = (struct iw_priv_args *) prism2_priv,
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 12a6887cb9f1..b3c07b93afce 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -8277,10 +8277,9 @@ static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device *dev)
 
 static struct iw_handler_def ipw2100_wx_handler_def = {
         .standard = ipw2100_wx_handlers,
-        .num_standard = sizeof(ipw2100_wx_handlers) / sizeof(iw_handler),
-        .num_private = sizeof(ipw2100_private_handler) / sizeof(iw_handler),
-        .num_private_args = sizeof(ipw2100_private_args) /
-            sizeof(struct iw_priv_args),
+        .num_standard = ARRAY_SIZE(ipw2100_wx_handlers),
+        .num_private = ARRAY_SIZE(ipw2100_private_handler),
+        .num_private_args = ARRAY_SIZE(ipw2100_private_args),
         .private = (iw_handler *) ipw2100_private_handler,
         .private_args = (struct iw_priv_args *)ipw2100_private_args,
         .get_wireless_stats = ipw2100_wx_wireless_stats,
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index cb0359df355e..a54171af7b97 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -123,28 +123,28 @@ struct region_cfp_table {
 static struct region_cfp_table region_cfp_table[] = {
         {0x10,                  /*US FCC */
          channel_freq_power_US_BG,
-         sizeof(channel_freq_power_US_BG) / sizeof(struct chan_freq_power),
+         ARRAY_SIZE(channel_freq_power_US_BG),
          }
         ,
         {0x20,                  /*CANADA IC */
          channel_freq_power_US_BG,
-         sizeof(channel_freq_power_US_BG) / sizeof(struct chan_freq_power),
+         ARRAY_SIZE(channel_freq_power_US_BG),
          }
         ,
         {0x30, /*EU*/ channel_freq_power_EU_BG,
-         sizeof(channel_freq_power_EU_BG) / sizeof(struct chan_freq_power),
+         ARRAY_SIZE(channel_freq_power_EU_BG),
          }
         ,
         {0x31, /*SPAIN*/ channel_freq_power_SPN_BG,
-         sizeof(channel_freq_power_SPN_BG) / sizeof(struct chan_freq_power),
+         ARRAY_SIZE(channel_freq_power_SPN_BG),
          }
         ,
         {0x32, /*FRANCE*/ channel_freq_power_FR_BG,
-         sizeof(channel_freq_power_FR_BG) / sizeof(struct chan_freq_power),
+         ARRAY_SIZE(channel_freq_power_FR_BG),
          }
         ,
         {0x40, /*JAPAN*/ channel_freq_power_JPN_BG,
-         sizeof(channel_freq_power_JPN_BG) / sizeof(struct chan_freq_power),
+         ARRAY_SIZE(channel_freq_power_JPN_BG),
          }
         ,
 /*Add new region here */
@@ -1422,7 +1422,7 @@ struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band, int *c
 
         lbs_deb_enter(LBS_DEB_MAIN);
 
-        end = sizeof(region_cfp_table)/sizeof(struct region_cfp_table);
+        end = ARRAY_SIZE(region_cfp_table);
 
         for (i = 0; i < end ; i++) {
                 lbs_deb_main("region_cfp_table[i].region=%d\n",
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index 3f628223bc6c..f8036efd7294 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -2149,13 +2149,13 @@ static const iw_handler mesh_wlan_handler[] = {
         (iw_handler) NULL,              /* SIOCSIWPMKSA */
 };
 struct iw_handler_def libertas_handler_def = {
-        .num_standard   = sizeof(wlan_handler) / sizeof(iw_handler),
+        .num_standard   = ARRAY_SIZE(wlan_handler),
         .standard       = (iw_handler *) wlan_handler,
         .get_wireless_stats = wlan_get_wireless_stats,
 };
 
 struct iw_handler_def mesh_handler_def = {
-        .num_standard   = sizeof(mesh_wlan_handler) / sizeof(iw_handler),
+        .num_standard   = ARRAY_SIZE(mesh_wlan_handler),
         .standard       = (iw_handler *) mesh_wlan_handler,
         .get_wireless_stats = wlan_get_wireless_stats,
 };
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index 389fdd313c7e..d8a59afa7178 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -709,9 +709,9 @@ static const iw_handler		netwave_private_handler[] =
 
 static const struct iw_handler_def      netwave_handler_def =
 {
-        .num_standard   = sizeof(netwave_handler)/sizeof(iw_handler),
-        .num_private    = sizeof(netwave_private_handler)/sizeof(iw_handler),
-        .num_private_args = sizeof(netwave_private_args)/sizeof(struct iw_priv_args),
+        .num_standard   = ARRAY_SIZE(netwave_handler),
+        .num_private    = ARRAY_SIZE(netwave_private_handler),
+        .num_private_args = ARRAY_SIZE(netwave_private_args),
         .standard       = (iw_handler *) netwave_handler,
         .private        = (iw_handler *) netwave_private_handler,
         .private_args   = (struct iw_priv_args *) netwave_private_args,
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index f1066614dc31..77ea13bf0c02 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -3239,10 +3239,9 @@ static const iw_handler prism54_private_handler[] = {
 };
 
 const struct iw_handler_def prism54_handler_def = {
-        .num_standard = sizeof (prism54_handler) / sizeof (iw_handler),
-        .num_private = sizeof (prism54_private_handler) / sizeof (iw_handler),
-        .num_private_args =
-            sizeof (prism54_private_args) / sizeof (struct iw_priv_args),
+        .num_standard = ARRAY_SIZE(prism54_handler),
+        .num_private = ARRAY_SIZE(prism54_private_handler),
+        .num_private_args = ARRAY_SIZE(prism54_private_args),
         .standard = (iw_handler *) prism54_handler,
         .private = (iw_handler *) prism54_private_handler,
         .private_args = (struct iw_priv_args *) prism54_private_args,
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 1b0e9707049a..429bca8d0b5f 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -1567,9 +1567,9 @@ static const struct iw_priv_args	ray_private_args[] = {
 
 static const struct iw_handler_def      ray_handler_def =
 {
-        .num_standard   = sizeof(ray_handler)/sizeof(iw_handler),
-        .num_private    = sizeof(ray_private_handler)/sizeof(iw_handler),
-        .num_private_args = sizeof(ray_private_args)/sizeof(struct iw_priv_args),
+        .num_standard   = ARRAY_SIZE(ray_handler),
+        .num_private    = ARRAY_SIZE(ray_private_handler),
+        .num_private_args = ARRAY_SIZE(ray_private_args),
         .standard       = ray_handler,
         .private        = ray_private_handler,
         .private_args   = ray_private_args,
diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
index b876bf65935b..33ed9fe95f3d 100644
--- a/drivers/net/wireless/wavelan.c
+++ b/drivers/net/wireless/wavelan.c
@@ -2400,9 +2400,9 @@ static const struct iw_priv_args wavelan_private_args[] = {
 
 static const struct iw_handler_def      wavelan_handler_def =
 {
-        .num_standard   = sizeof(wavelan_handler)/sizeof(iw_handler),
-        .num_private    = sizeof(wavelan_private_handler)/sizeof(iw_handler),
-        .num_private_args = sizeof(wavelan_private_args)/sizeof(struct iw_priv_args),
+        .num_standard   = ARRAY_SIZE(wavelan_handler),
+        .num_private    = ARRAY_SIZE(wavelan_private_handler),
+        .num_private_args = ARRAY_SIZE(wavelan_private_args),
         .standard       = wavelan_handler,
         .private        = wavelan_private_handler,
         .private_args   = wavelan_private_args,
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index 1cc5180ab1e7..9b7f44957869 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -2719,9 +2719,9 @@ static const iw_handler		wavelan_private_handler[] =
 
 static const struct iw_handler_def      wavelan_handler_def =
 {
-        .num_standard   = sizeof(wavelan_handler)/sizeof(iw_handler),
-        .num_private    = sizeof(wavelan_private_handler)/sizeof(iw_handler),
-        .num_private_args = sizeof(wavelan_private_args)/sizeof(struct iw_priv_args),
+        .num_standard   = ARRAY_SIZE(wavelan_handler),
+        .num_private    = ARRAY_SIZE(wavelan_private_handler),
+        .num_private_args = ARRAY_SIZE(wavelan_private_args),
         .standard       = wavelan_handler,
         .private        = wavelan_private_handler,
         .private_args   = wavelan_private_args,
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index cfde68cff94c..2690f291e3f7 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1893,7 +1893,7 @@ static const iw_handler	wl3501_handler[] = {
 };
 
 static const struct iw_handler_def wl3501_handler_def = {
-        .num_standard   = sizeof(wl3501_handler) / sizeof(iw_handler),
+        .num_standard   = ARRAY_SIZE(wl3501_handler),
         .standard       = (iw_handler *)wl3501_handler,
         .get_wireless_stats = wl3501_get_wireless_stats,
 };