Wireless: remove driver_data direct access of struct device
PATCH 1/1 Wireless: remove driver_data direct access of struct device
From: Greg Kroah-Hartman <[email protected]>
In the near future, the driver core is going to not allow direct access to the driver_data pointer in struct device. Instead, the functions dev_get_drvdata() and dev_set_drvdata() should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions.
Cc John W. Linville <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- drivers/net/wireless/atmel_cs.c | 2 - drivers/net/wireless/ipw2x00/ipw2100.c | 8 ++-- drivers/net/wireless/ipw2x00/ipw2200.c | 47 ++++++++++++++-------------- drivers/net/wireless/iwlwifi/iwl-agn.c | 20 +++++------ drivers/net/wireless/iwlwifi/iwl3945-base.c | 26 ++++++++------- 5 files changed, 53 insertions(+), 50 deletions(-)
drivers/net/wireless/atmel_cs.c +1 -1
@@ -279,7 +279,7 @@ static int atmel_config(struct pcmcia_destruct pcmcia_device_id *did; dev = link->priv; - did =handle_to_dev (link).driver_data; + did =dev_get_drvdata (&handle_to_dev (link));DEBUG (0 ,"atmel_config(0x%p)\n" , link);
drivers/net/wireless/ipw2x00/ipw2100.c +4 -4
@@ -3488,7 +3488,7 @@ static DEVICE_ATTR(pci, S_IRUGO, show_pcstatic ssize_t show_cfg (struct device *d,struct device_attribute *attr,char *buf) { -struct ipw2100_priv *p = d->driver_data; +struct ipw2100_priv *p =dev_get_drvdata (&d);return sprintf (buf,"0x%08x\n" , (int )p->config); }
@@ -3497,7 +3497,7 @@ static DEVICE_ATTR(cfg, S_IRUGO, show_cfstatic ssize_t show_status (struct device *d,struct device_attribute *attr,char *buf) { -struct ipw2100_priv *p = d->driver_data; +struct ipw2100_priv *p =dev_get_drvdata (&d);return sprintf (buf,"0x%08x\n" , (int )p->status); }
@@ -3506,7 +3506,7 @@ static DEVICE_ATTR(status, S_IRUGO, showstatic ssize_t show_capability (struct device *d,struct device_attribute *attr,char *buf) { -struct ipw2100_priv *p = d->driver_data; +struct ipw2100_priv *p =dev_get_drvdata (&d);return sprintf (buf,"0x%08x\n" , (int )p->capability); }
@@ -4224,7 +4224,7 @@ static ssize_t show_rf_kill(struct devic1 - SW based RF kill active (sysfs) 2 - HW based RF kill active 3 - Both HW and SW baed RF kill active */ -struct ipw2100_priv *priv = (struct ipw2100_priv *)d->driver_data; +struct ipw2100_priv *priv =dev_get_drvdata (&d);int val = ((priv->status &STATUS_RF_KILL_SW ) ?0x1 :0x0 ) | (rf_kill_active (priv) ?0x2 :0x0 );return sprintf (buf,"%i\n" , val);
drivers/net/wireless/ipw2x00/ipw2200.c +24 -23
185 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl3945-base.c +14 -12
@@ -4366,7 +4366,7 @@ static int iwl3945_mac_beacon_update(strstatic ssize_t show_debug_level (struct device *d,struct device_attribute *attr,char *buf) { -struct iwl_priv *priv = d->driver_data; +struct iwl_priv *priv =dev_get_drvdata (d);return sprintf (buf,"0x%08X\n" , priv->debug_level); }
@@ -4374,7 +4374,7 @@ static ssize_t store_debug_level(structstruct device_attribute *attr, const char *buf, size_t count) { - struct iwl_priv *priv = d->driver_data; + struct iwl_priv *priv = dev_get_drvdata(d);unsigned long val;int ret;
@@ -4395,7 +4395,7 @@ static DEVICE_ATTR(debug_level, S_IWUSRstatic ssize_t show_temperature (struct device *d,struct device_attribute *attr,char *buf) { -struct iwl_priv *priv = (struct iwl_priv *)d->driver_data; +struct iwl_priv *priv =dev_get_drvdata (d);if (!iwl_is_alive (priv))return -EAGAIN ;
@@ -4408,7 +4408,7 @@ static DEVICE_ATTR(temperature, S_IRUGO,static ssize_t show_tx_power (struct device *d,struct device_attribute *attr,char *buf) { -struct iwl_priv *priv = (struct iwl_priv *)d->driver_data; +struct iwl_priv *priv =dev_get_drvdata (d);return sprintf (buf,"%d\n" , priv->tx_power_user_lmt); }
@@ -4416,7 +4416,7 @@ static ssize_t store_tx_power(struct devstruct device_attribute *attr, const char *buf, size_t count) { - struct iwl_priv *priv = (struct iwl_priv *)d->driver_data; + struct iwl_priv *priv = dev_get_drvdata(d);char *p = (char *)buf;u32 val;
@@ -4434,7 +4434,7 @@ static DEVICE_ATTR(tx_power, S_IWUSR | Sstatic ssize_t show_flags (struct device *d,struct device_attribute *attr,char *buf) { -struct iwl_priv *priv = (struct iwl_priv *)d->driver_data; +struct iwl_priv *priv =dev_get_drvdata (d);return sprintf (buf,"0x%04X\n" , priv->active_rxon.flags); }
@@ -4443,7 +4443,7 @@ static ssize_t store_flags(struct devicestruct device_attribute *attr, const char *buf, size_t count) { - struct iwl_priv *priv = (struct iwl_priv *)d->driver_data; + struct iwl_priv *priv = dev_get_drvdata(d);u32 flags =simple_strtoul (buf,NULL ,0 );mutex_lock (&priv->mutex);
@@ -4468,7 +4468,7 @@ static DEVICE_ATTR(flags, S_IWUSR | S_IRstatic ssize_t show_filter_flags (struct device *d,struct device_attribute *attr,char *buf) { -struct iwl_priv *priv = (struct iwl_priv *)d->driver_data; +struct iwl_priv *priv =dev_get_drvdata (d);return sprintf (buf,"0x%04X\n" ,le32_to_cpu (priv->active_rxon.filter_flags));
@@ -4478,7 +4478,7 @@ static ssize_t store_filter_flags(structstruct device_attribute *attr, const char *buf, size_t count) { - struct iwl_priv *priv = (struct iwl_priv *)d->driver_data; + struct iwl_priv *priv = dev_get_drvdata(d);u32 filter_flags =simple_strtoul (buf,NULL ,0 );mutex_lock (&priv->mutex);
@@ -4763,7 +4763,7 @@ static DEVICE_ATTR(antenna, S_IWUSR | S_static ssize_t show_status (struct device *d,struct device_attribute *attr,char *buf) { -struct iwl_priv *priv = (struct iwl_priv *)d->driver_data; +struct iwl_priv *priv =dev_get_drvdata (d);if (!iwl_is_alive (priv))return -EAGAIN ;return sprintf (buf,"0x%08x\n" , (int )priv->status);
@@ -4775,10 +4775,11 @@ static ssize_t dump_error_log(struct devstruct device_attribute *attr, const char *buf, size_t count) { + struct iwl_priv *priv = dev_get_drvdata(d);char *p = (char *)buf;if (p[0 ] =='1' ) -iwl3945_dump_nic_error_log ((struct iwl_priv *)d->driver_data); +iwl3945_dump_nic_error_log (priv);return strnlen (buf, count); }
@@ -4789,10 +4790,11 @@ static ssize_t dump_event_log(struct devstruct device_attribute *attr, const char *buf, size_t count) { + struct iwl_priv *priv = dev_get_drvdata(d);char *p = (char *)buf;if (p[0 ] =='1' ) -iwl3945_dump_nic_event_log ((struct iwl_priv *)d->driver_data); +iwl3945_dump_nic_event_log (priv);return strnlen (buf, count); }
drivers/net/wireless/iwlwifi/iwl-agn.c +10 -10
@@ -2895,7 +2895,7 @@ static int iwl_mac_beacon_update(structstatic ssize_t show_debug_level (struct device *d,struct device_attribute *attr,char *buf) { -struct iwl_priv *priv = d->driver_data; +struct iwl_priv *priv =dev_get_drvdata (d);return sprintf (buf,"0x%08X\n" , priv->debug_level); }
@@ -2903,7 +2903,7 @@ static ssize_t store_debug_level(structstruct device_attribute *attr, const char *buf, size_t count) { - struct iwl_priv *priv = d->driver_data; + struct iwl_priv *priv = dev_get_drvdata(d);unsigned long val;int ret;
@@ -2926,7 +2926,7 @@ static DEVICE_ATTR(debug_level, S_IWUSRstatic ssize_t show_version (struct device *d,struct device_attribute *attr,char *buf) { -struct iwl_priv *priv = d->driver_data; +struct iwl_priv *priv =dev_get_drvdata (d);struct iwl_alive_resp *palive = &priv->card_alive;ssize_t pos =0 ;u16 eeprom_ver;
@@ -2957,7 +2957,7 @@ static DEVICE_ATTR(version, S_IWUSR | S_static ssize_t show_temperature (struct device *d,struct device_attribute *attr,char *buf) { -struct iwl_priv *priv = (struct iwl_priv *)d->driver_data; +struct iwl_priv *priv =dev_get_drvdata (d);if (!iwl_is_alive (priv))return -EAGAIN ;
@@ -2970,7 +2970,7 @@ static DEVICE_ATTR(temperature, S_IRUGO,static ssize_t show_tx_power (struct device *d,struct device_attribute *attr,char *buf) { -struct iwl_priv *priv = (struct iwl_priv *)d->driver_data; +struct iwl_priv *priv =dev_get_drvdata (d);if (!iwl_is_ready_rf (priv))return sprintf (buf,"off\n" );
@@ -2982,7 +2982,7 @@ static ssize_t store_tx_power(struct devstruct device_attribute *attr, const char *buf, size_t count) { - struct iwl_priv *priv = (struct iwl_priv *)d->driver_data; + struct iwl_priv *priv = dev_get_drvdata(d);unsigned long val;int ret;
@@ -3000,7 +3000,7 @@ static DEVICE_ATTR(tx_power, S_IWUSR | Sstatic ssize_t show_flags (struct device *d,struct device_attribute *attr,char *buf) { -struct iwl_priv *priv = (struct iwl_priv *)d->driver_data; +struct iwl_priv *priv =dev_get_drvdata (d);return sprintf (buf,"0x%04X\n" , priv->active_rxon.flags); }
@@ -3009,7 +3009,7 @@ static ssize_t store_flags(struct devicestruct device_attribute *attr, const char *buf, size_t count) { - struct iwl_priv *priv = (struct iwl_priv *)d->driver_data; + struct iwl_priv *priv = dev_get_drvdata(d);unsigned long val;u32 flags;int ret =strict_strtoul (buf,0 , &val);
@@ -3038,7 +3038,7 @@ static DEVICE_ATTR(flags, S_IWUSR | S_IRstatic ssize_t show_filter_flags (struct device *d,struct device_attribute *attr,char *buf) { -struct iwl_priv *priv = (struct iwl_priv *)d->driver_data; +struct iwl_priv *priv =dev_get_drvdata (d);return sprintf (buf,"0x%04X\n" ,le32_to_cpu (priv->active_rxon.filter_flags));
@@ -3048,7 +3048,7 @@ static ssize_t store_filter_flags(structstruct device_attribute *attr, const char *buf, size_t count) { - struct iwl_priv *priv = (struct iwl_priv *)d->driver_data; + struct iwl_priv *priv = dev_get_drvdata(d);unsigned long val;u32 filter_flags;int ret =strict_strtoul (buf,0 , &val);