From: Andrew Morton Repair Jeff's stuff after gregkh depredations. Cc: Jeff Garzik Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/net/wireless/ipw2100.c | 63 +++++++++++++++++++++++++---------------- 1 files changed, 39 insertions(+), 24 deletions(-) diff -puN drivers/net/wireless/ipw2100.c~wireless-device-attr-fixes drivers/net/wireless/ipw2100.c --- devel/drivers/net/wireless/ipw2100.c~wireless-device-attr-fixes 2005-07-09 01:23:59.000000000 -0700 +++ devel-akpm/drivers/net/wireless/ipw2100.c 2005-07-09 01:24:59.000000000 -0700 @@ -3360,7 +3360,8 @@ static void ipw2100_msg_free(struct ipw2 priv->msg_buffers = NULL; } -static ssize_t show_pci(struct device *d, char *buf) +static ssize_t show_pci(struct device *d, struct device_attribute *attr, + char *buf) { struct pci_dev *pci_dev = container_of(d, struct pci_dev, dev); char *out = buf; @@ -3380,23 +3381,26 @@ static ssize_t show_pci(struct device *d } static DEVICE_ATTR(pci, S_IRUGO, show_pci, NULL); -static ssize_t show_cfg(struct device *d, char *buf) +static ssize_t show_cfg(struct device *d, struct device_attribute *attr, + char *buf) { - struct ipw2100_priv *p = (struct ipw2100_priv *)d->driver_data; + struct ipw2100_priv *p = d->driver_data; return sprintf(buf, "0x%08x\n", (int)p->config); } static DEVICE_ATTR(cfg, S_IRUGO, show_cfg, NULL); -static ssize_t show_status(struct device *d, char *buf) +static ssize_t show_status(struct device *d, struct device_attribute *attr, + char *buf) { - struct ipw2100_priv *p = (struct ipw2100_priv *)d->driver_data; + struct ipw2100_priv *p = d->driver_data; return sprintf(buf, "0x%08x\n", (int)p->status); } static DEVICE_ATTR(status, S_IRUGO, show_status, NULL); -static ssize_t show_capability(struct device *d, char *buf) +static ssize_t show_capability(struct device *d, struct device_attribute *attr, + char *buf) { - struct ipw2100_priv *p = (struct ipw2100_priv *)d->driver_data; + struct ipw2100_priv *p = d->driver_data; return sprintf(buf, "0x%08x\n", (int)p->capability); } static DEVICE_ATTR(capability, S_IRUGO, show_capability, NULL); @@ -3579,7 +3583,8 @@ const struct { }; -static ssize_t show_registers(struct device *d, char *buf) +static ssize_t show_registers(struct device *d, struct device_attribute *attr, + char *buf) { int i; struct ipw2100_priv *priv = dev_get_drvdata(d); @@ -3600,7 +3605,8 @@ static ssize_t show_registers(struct dev static DEVICE_ATTR(registers, S_IRUGO, show_registers, NULL); -static ssize_t show_hardware(struct device *d, char *buf) +static ssize_t show_hardware(struct device *d, struct device_attribute *attr, + char *buf) { struct ipw2100_priv *priv = dev_get_drvdata(d); struct net_device *dev = priv->net_dev; @@ -3640,7 +3646,8 @@ static ssize_t show_hardware(struct devi static DEVICE_ATTR(hardware, S_IRUGO, show_hardware, NULL); -static ssize_t show_memory(struct device *d, char *buf) +static ssize_t show_memory(struct device *d, struct device_attribute *attr, + char *buf) { struct ipw2100_priv *priv = dev_get_drvdata(d); struct net_device *dev = priv->net_dev; @@ -3693,7 +3700,8 @@ static ssize_t show_memory(struct device return len; } -static ssize_t store_memory(struct device *d, const char *buf, size_t count) +static ssize_t store_memory(struct device *d, struct device_attribute *attr, + const char *buf, size_t count) { struct ipw2100_priv *priv = dev_get_drvdata(d); struct net_device *dev = priv->net_dev; @@ -3729,7 +3737,8 @@ static ssize_t store_memory(struct devic static DEVICE_ATTR(memory, S_IWUSR|S_IRUGO, show_memory, store_memory); -static ssize_t show_ordinals(struct device *d, char *buf) +static ssize_t show_ordinals(struct device *d, struct device_attribute *attr, + char *buf) { struct ipw2100_priv *priv = dev_get_drvdata(d); u32 val = 0; @@ -3763,7 +3772,8 @@ static ssize_t show_ordinals(struct devi static DEVICE_ATTR(ordinals, S_IRUGO, show_ordinals, NULL); -static ssize_t show_stats(struct device *d, char *buf) +static ssize_t show_stats(struct device *d, struct device_attribute *attr, + char *buf) { struct ipw2100_priv *priv = dev_get_drvdata(d); char * out = buf; @@ -3828,7 +3838,8 @@ int ipw2100_switch_mode(struct ipw2100_p return 0; } -static ssize_t show_internals(struct device *d, char *buf) +static ssize_t show_internals(struct device *d, struct device_attribute *attr, + char *buf) { struct ipw2100_priv *priv = dev_get_drvdata(d); int len = 0; @@ -3879,7 +3890,8 @@ static ssize_t show_internals(struct dev static DEVICE_ATTR(internals, S_IRUGO, show_internals, NULL); -static ssize_t show_bssinfo(struct device *d, char *buf) +static ssize_t show_bssinfo(struct device *d, struct device_attribute *attr, + char *buf) { struct ipw2100_priv *priv = dev_get_drvdata(d); char essid[IW_ESSID_MAX_SIZE + 1]; @@ -3922,8 +3934,6 @@ static ssize_t show_bssinfo(struct devic static DEVICE_ATTR(bssinfo, S_IRUGO, show_bssinfo, NULL); - - #ifdef CONFIG_IPW_DEBUG static ssize_t show_debug_level(struct device_driver *d, char *buf) { @@ -3956,7 +3966,8 @@ static DRIVER_ATTR(debug_level, S_IWUSR #endif /* CONFIG_IPW_DEBUG */ -static ssize_t show_fatal_error(struct device *d, char *buf) +static ssize_t show_fatal_error(struct device *d, + struct device_attribute *attr, char *buf) { struct ipw2100_priv *priv = dev_get_drvdata(d); char *out = buf; @@ -3981,8 +3992,8 @@ static ssize_t show_fatal_error(struct d return out - buf; } -static ssize_t store_fatal_error(struct device *d, const char *buf, - size_t count) +static ssize_t store_fatal_error(struct device *d, + struct device_attribute *attr, const char *buf, size_t count) { struct ipw2100_priv *priv = dev_get_drvdata(d); schedule_reset(priv); @@ -3991,13 +4002,15 @@ static ssize_t store_fatal_error(struct static DEVICE_ATTR(fatal_error, S_IWUSR|S_IRUGO, show_fatal_error, store_fatal_error); -static ssize_t show_scan_age(struct device *d, char *buf) +static ssize_t show_scan_age(struct device *d, struct device_attribute *attr, + char *buf) { struct ipw2100_priv *priv = dev_get_drvdata(d); return sprintf(buf, "%d\n", priv->ieee->scan_age); } -static ssize_t store_scan_age(struct device *d, const char *buf, size_t count) +static ssize_t store_scan_age(struct device *d, struct device_attribute *attr, + const char *buf, size_t count) { struct ipw2100_priv *priv = dev_get_drvdata(d); struct net_device *dev = priv->net_dev; @@ -4033,7 +4046,8 @@ static ssize_t store_scan_age(struct dev static DEVICE_ATTR(scan_age, S_IWUSR | S_IRUGO, show_scan_age, store_scan_age); -static ssize_t show_rf_kill(struct device *d, char *buf) +static ssize_t show_rf_kill(struct device *d, struct device_attribute *attr, + char *buf) { /* 0 - RF kill not enabled 1 - SW based RF kill active (sysfs) @@ -4077,7 +4091,8 @@ static int ipw_radio_kill_sw(struct ipw2 return 1; } -static ssize_t store_rf_kill(struct device *d, const char *buf, size_t count) +static ssize_t store_rf_kill(struct device *d, struct device_attribute *attr, + const char *buf, size_t count) { struct ipw2100_priv *priv = dev_get_drvdata(d); ipw_radio_kill_sw(priv, buf[0] == '1'); _