atmel: couple of cleanup patches
Subsystems (4)
cover atmel: couple of cleanup patches
Hi,
Here are couple of cleanup patches for atmel driver. They are against tonight pull from Linus. Please consider applying.
Thanks!
--
Dmitry
PATCH 1/3 atmel: save on array initialization
NET: atmel - do not initialize array over and over again
Signed-off-by Dmitry Torokhov <[email protected]>
---
drivers/net/wireless/atmel.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/atmel.c +1 -1
@@ -784,11 +784,11 @@ static void tx_update_descriptor(structstatic int start_tx (struct sk_buff *skb,struct net_device *dev) { +static const u8 SNAP_RFC1024 [6 ] = {0xaa ,0xaa ,0x03 ,0x00 ,0x00 ,0x00 };struct atmel_private *priv =netdev_priv (dev);struct ieee80211_hdr_4addr header;unsigned long flags;u16 buff, frame_ctl, len = (ETH_ZLEN < skb->len) ? skb->len :ETH_ZLEN ; -u8 SNAP_RFC1024 [6 ] = {0xaa ,0xaa ,0x03 ,0x00 ,0x00 ,0x00 };if (priv->card && priv->present_callback && !(*priv->present_callback)(priv->card)) {
PATCH 2/3 atmel: use ARRAY_SIZE()
In reply to Dmitry TorokhovNET: atmel - switch to using ARRAY_SIZE()
Signed-off-by Dmitry Torokhov <[email protected]>
---
drivers/net/wireless/atmel.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
drivers/net/wireless/atmel.c +10 -10
@@ -1193,7 +1193,7 @@ static irqreturn_t service_interrupt(intatmel_set_gcr (dev,GCR_ACKINT );/* acknowledge interrupt */ -for (i =0 ; i <sizeof (irq_order)/sizeof (u8); i++) +for (i =0 ; i <ARRAY_SIZE (irq_order); i++)if (isr & irq_order[i])break ;
@@ -1345,10 +1345,10 @@ int atmel_open(struct net_device *dev)atmel_set_mib8 (priv, Phy_Mib_Type,PHY_MIB_REG_DOMAIN_POS , priv->reg_domain); }else { priv->reg_domain =atmel_get_mib8 (priv, Phy_Mib_Type,PHY_MIB_REG_DOMAIN_POS ); -for (i =0 ; i <sizeof (channel_table)/sizeof (channel_table[0 ]); i++) +for (i =0 ; i <ARRAY_SIZE (channel_table); i++)if (priv->reg_domain == channel_table[i].reg_domain)break ; -if (i ==sizeof (channel_table)/sizeof (channel_table[0 ])) { +if (i ==ARRAY_SIZE (channel_table)) { priv->reg_domain =REG_DOMAIN_MKK1 ;printk (KERN_ALERT "%s: failed to get regulatory domain: assuming MKK1.\n" , dev->name); }
@@ -1393,7 +1393,7 @@ static int atmel_validate_channel(structelse return suitable default channel */ int i; -for (i =0 ; i <sizeof (channel_table)/sizeof (channel_table[0 ]); i++) +for (i =0 ; i <ARRAY_SIZE (channel_table); i++)if (priv->reg_domain == channel_table[i].reg_domain) {if (channel >= channel_table[i].min && channel <= channel_table[i].max)
@@ -1437,7 +1437,7 @@ static int atmel_proc_output (char *buf, } r ="<unknown>" ; -for (i =0 ; i <sizeof (channel_table)/sizeof (channel_table[0 ]); i++) +for (i =0 ; i <ARRAY_SIZE (channel_table); i++)if (priv->reg_domain == channel_table[i].reg_domain) r = channel_table[i].name;
@@ -2375,7 +2375,7 @@ static int atmel_get_range(struct net_de range->min_nwid =0x0000 ; range->max_nwid =0x0000 ; range->num_channels =0 ; -for (j =0 ; j <sizeof (channel_table)/sizeof (channel_table[0 ]); j++) +for (j =0 ; j <ARRAY_SIZE (channel_table); j++)if (priv->reg_domain == channel_table[j].reg_domain) { range->num_channels = channel_table[j].max - channel_table[j].min +1 ;break ;
@@ -2581,9 +2581,9 @@ static const struct iw_priv_args atmel_pstatic const struct iw_handler_def atmel_handler_def = { - .num_standard =sizeof (atmel_handler)/sizeof (iw_handler), - .num_private =sizeof (atmel_private_handler)/sizeof (iw_handler), - .num_private_args =sizeof (atmel_private_args)/sizeof (struct iw_priv_args ), + .num_standard =ARRAY_SIZE (atmel_handler), + .num_private =ARRAY_SIZE (atmel_private_handler), + .num_private_args =ARRAY_SIZE (atmel_private_args), .standard = (iw_handler *) atmel_handler, .private = (iw_handler *) atmel_private_handler, .private_args = (struct iw_priv_args *) atmel_private_args,
@@ -2647,7 +2647,7 @@ static int atmel_ioctl(struct net_device domain[REGDOMAINSZ ] =0 ; rc = -EINVAL ; -for (i =0 ; i <sizeof (channel_table)/sizeof (channel_table[0 ]); i++) { +for (i =0 ; i <ARRAY_SIZE (channel_table); i++) {/* strcasecmp doesn't exist in the library */ char *a = channel_table[i].name;char *b = domain;
PATCH 3/3 atmel: whitespace cleanup
In reply to Dmitry TorokhovNET: atmel: whitespace cleanup
Signed-off-by Dmitry Torokhov <[email protected]>
---
drivers/net/wireless/atmel.c | 6 +-- drivers/net/wireless/atmel_cs.c | 74 +++++++++++++++++++-------------------- drivers/net/wireless/atmel_pci.c | 10 ++--- 3 files changed, 45 insertions(+), 45 deletions(-)
drivers/net/wireless/atmel.c +3 -3
@@ -595,7 +595,7 @@ static void atmel_join_bss(struct atmel_static void atmel_smooth_qual (struct atmel_private *priv);static void atmel_writeAR (struct net_device *dev,u16 data);static int probe_atmel_card (struct net_device *dev); -static int reset_atmel_card (struct net_device *dev ); +static int reset_atmel_card (struct net_device *dev);static void atmel_enter_state (struct atmel_private *priv,int new_state);int atmel_open (struct net_device *dev);
@@ -1738,7 +1738,7 @@ static int atmel_set_encode(struct net_d/* Disable the key */ priv->wep_key_len[index] =0 ;/* Check if the key is not marked as invalid */ -if (!(dwrq->flags &IW_ENCODE_NOKEY )) { +if (!(dwrq->flags &IW_ENCODE_NOKEY )) {/* Cleanup */ memset (priv->wep_keys[index],0 ,13 );/* Copy the key in the driver */
@@ -1909,7 +1909,7 @@ static int atmel_get_encodeext(struct ne encoding->flags = idx +1 ;memset (ext,0 ,sizeof (*ext)); - +if (!priv->wep_is_on) { ext->alg =IW_ENCODE_ALG_NONE ; ext->key_len =0 ;
drivers/net/wireless/atmel_cs.c +37 -37
215 lines not on this page · raw message
drivers/net/wireless/atmel_pci.c +5 -5
@@ -53,18 +53,18 @@ static int __devinit atmel_pci_probe(str const struct pci_device_id *pent) {struct net_device *dev; - +if (pci_enable_device (pdev))return -ENODEV ; - +pci_set_master (pdev); - - dev =init_atmel_card (pdev->irq, pdev->resource[1 ].start, + + dev =init_atmel_card (pdev->irq, pdev->resource[1 ].start,ATMEL_FW_TYPE_506 , &pdev->dev,NULL ,NULL );if (!dev)return -ENODEV ; - +pci_set_drvdata (pdev, dev);return 0 ; }