diff for duplicates of <253818670505190435648367db@mail.gmail.com> diff --git a/a/1.txt b/N1/1.txt index 009768d..8ab056d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -41,10 +41,3 @@ char/tpm/tpm.c | 8 ++++---- usb/core/sysfs.c | 2 +- 12 files changed, 54 insertions(+), 54 deletions(-) --- --------------- next part -------------- -A non-text attachment was scrubbed... -Name: patch-linux-2.6.12-rc4-mm2-sysfsdyncallback-deviceattr-update.diff -Type: text/x-patch -Size: 22087 bytes -Desc: not available -Url : http://lists.atrpms.net/pipermail/lm-sensors/attachments/20050519/51d1b247/patch-linux-2.6.12-rc4-mm2-sysfsdyncallback-deviceattr-update.bin diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..4b22fc5 --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,4 @@ +Content-Type: text/x-patch; + name=patch-linux-2.6.12-rc4-mm2-sysfsdyncallback-deviceattr-update.diff; charset=us-ascii +Content-Transfer-Encoding: 7bit +Content-Disposition: attachment; filename="patch-linux-2.6.12-rc4-mm2-sysfsdyncallback-deviceattr-update.diff" diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..d70867e --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,454 @@ +diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/char/tpm/tpm.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/char/tpm/tpm.c +--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/char/tpm/tpm.c 2005-05-18 20:35:25.000000000 -0400 ++++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/char/tpm/tpm.c 2005-05-18 20:41:11.000000000 -0400 +@@ -216,7 +216,7 @@ static const u8 pcrread[] = { + 0, 0, 0, 0 /* PCR index */ + }; + +-ssize_t tpm_show_pcrs(struct device *dev, char *buf) ++ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr, char *buf) + { + u8 data[READ_PCR_RESULT_SIZE]; + ssize_t len; +@@ -268,7 +268,7 @@ static const u8 readpubek[] = { + 0, 0, 0, 124, /* TPM_ORD_ReadPubek */ + }; + +-ssize_t tpm_show_pubek(struct device *dev, char *buf) ++ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr, char *buf) + { + u8 *data; + ssize_t len; +@@ -349,7 +349,7 @@ static const u8 cap_manufacturer[] = { + 0, 0, 1, 3 + }; + +-ssize_t tpm_show_caps(struct device *dev, char *buf) ++ssize_t tpm_show_caps(struct device *dev, struct device_attribute *attr, char *buf) + { + u8 data[sizeof(cap_manufacturer)]; + ssize_t len; +@@ -385,7 +385,7 @@ ssize_t tpm_show_caps(struct device *dev + + EXPORT_SYMBOL_GPL(tpm_show_caps); + +-ssize_t tpm_store_cancel(struct device * dev, const char *buf, ++ssize_t tpm_store_cancel(struct device * dev, struct device_attribute *attr, const char *buf, + size_t count) + { + struct tpm_chip *chip = dev_get_drvdata(dev); +diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/char/tpm/tpm.h linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/char/tpm/tpm.h +--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/char/tpm/tpm.h 2005-05-18 20:31:03.000000000 -0400 ++++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/char/tpm/tpm.h 2005-05-18 20:41:11.000000000 -0400 +@@ -35,10 +35,10 @@ enum tpm_addr { + TPM_DATA = 0x4F + }; + +-extern ssize_t tpm_show_pubek(struct device *, char *); +-extern ssize_t tpm_show_pcrs(struct device *, char *); +-extern ssize_t tpm_show_caps(struct device *, char *); +-extern ssize_t tpm_store_cancel(struct device *, const char *, size_t); ++extern ssize_t tpm_show_pubek(struct device *, struct device_attribute *attr, char *); ++extern ssize_t tpm_show_pcrs(struct device *, struct device_attribute *attr, char *); ++extern ssize_t tpm_show_caps(struct device *, struct device_attribute *attr, char *); ++extern ssize_t tpm_store_cancel(struct device *, struct device_attribute *attr, const char *, size_t); + + + struct tpm_chip; +diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/i2c/chips/adm1025.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/i2c/chips/adm1025.c +--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/i2c/chips/adm1025.c 2005-05-18 20:35:25.000000000 -0400 ++++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/i2c/chips/adm1025.c 2005-05-18 20:40:53.000000000 -0400 +@@ -274,14 +274,14 @@ static DEVICE_ATTR(temp##offset##_max, S + set_temp(1); + set_temp(2); + +-static ssize_t show_alarms(struct device *dev, char *buf) ++static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf) + { + struct adm1025_data *data = adm1025_update_device(dev); + return sprintf(buf, "%u\n", data->alarms); + } + static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); + +-static ssize_t show_vid(struct device *dev, char *buf) ++static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf) + { + struct adm1025_data *data = adm1025_update_device(dev); + return sprintf(buf, "%u\n", vid_from_reg(data->vid, data->vrm)); +@@ -290,12 +290,12 @@ static ssize_t show_vid(struct device *d + static DEVICE_ATTR(in1_ref, S_IRUGO, show_vid, NULL); + static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL); + +-static ssize_t show_vrm(struct device *dev, char *buf) ++static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf) + { + struct adm1025_data *data = adm1025_update_device(dev); + return sprintf(buf, "%u\n", data->vrm); + } +-static ssize_t set_vrm(struct device *dev, const char *buf, size_t count) ++static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) + { + struct i2c_client *client = to_i2c_client(dev); + struct adm1025_data *data = i2c_get_clientdata(client); +diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/i2c/chips/adm9240.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/i2c/chips/adm9240.c +--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/i2c/chips/adm9240.c 2005-05-18 20:30:41.000000000 -0400 ++++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/i2c/chips/adm9240.c 2005-05-18 20:40:53.000000000 -0400 +@@ -185,7 +185,7 @@ static int adm9240_write_value(struct i2 + + /* temperature */ + #define show_temp(value, scale) \ +-static ssize_t show_##value(struct device *dev, char *buf) \ ++static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \ + { \ + struct adm9240_data *data = adm9240_update_device(dev); \ + return sprintf(buf, "%d\n", data->value * scale); \ +@@ -195,7 +195,7 @@ show_temp(temp_hyst, 1000); + show_temp(temp, 500); + + #define set_temp(value, reg) \ +-static ssize_t set_##value(struct device *dev, const char *buf, \ ++static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \ + size_t count) \ + { \ + struct i2c_client *client = to_i2c_client(dev); \ +@@ -266,26 +266,26 @@ static ssize_t set_in_max(struct device + } + + #define show_in_offset(offset) \ +-static ssize_t show_in##offset(struct device *dev, char *buf) \ ++static ssize_t show_in##offset(struct device *dev, struct device_attribute *attr, char *buf) \ + { \ + return show_in(dev, buf, offset); \ + } \ + static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL); \ +-static ssize_t show_in##offset##_min(struct device *dev, char *buf) \ ++static ssize_t show_in##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \ + { \ + return show_in_min(dev, buf, offset); \ + } \ +-static ssize_t show_in##offset##_max(struct device *dev, char *buf) \ ++static ssize_t show_in##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \ + { \ + return show_in_max(dev, buf, offset); \ + } \ + static ssize_t \ +-set_in##offset##_min(struct device *dev, const char *buf, size_t count) \ ++set_in##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \ + { \ + return set_in_min(dev, buf, count, offset); \ + } \ + static ssize_t \ +-set_in##offset##_max(struct device *dev, const char *buf, size_t count) \ ++set_in##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \ + { \ + return set_in_max(dev, buf, count, offset); \ + } \ +@@ -401,19 +401,19 @@ static ssize_t set_fan_min(struct device + } + + #define show_fan_offset(offset) \ +-static ssize_t show_fan_##offset (struct device *dev, char *buf) \ ++static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \ + { \ + return show_fan(dev, buf, offset - 1); \ + } \ +-static ssize_t show_fan_##offset##_div (struct device *dev, char *buf) \ ++static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf) \ + { \ + return show_fan_div(dev, buf, offset - 1); \ + } \ +-static ssize_t show_fan_##offset##_min (struct device *dev, char *buf) \ ++static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \ + { \ + return show_fan_min(dev, buf, offset - 1); \ + } \ +-static ssize_t set_fan_##offset##_min (struct device *dev, \ ++static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr, \ + const char *buf, size_t count) \ + { \ + return set_fan_min(dev, buf, count, offset - 1); \ +@@ -429,7 +429,7 @@ show_fan_offset(1); + show_fan_offset(2); + + /* alarms */ +-static ssize_t show_alarms(struct device *dev, char *buf) ++static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf) + { + struct adm9240_data *data = adm9240_update_device(dev); + return sprintf(buf, "%u\n", data->alarms); +@@ -437,7 +437,7 @@ static ssize_t show_alarms(struct device + static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); + + /* vid */ +-static ssize_t show_vid(struct device *dev, char *buf) ++static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf) + { + struct adm9240_data *data = adm9240_update_device(dev); + return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm)); +@@ -445,13 +445,13 @@ static ssize_t show_vid(struct device *d + static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL); + + /* analog output */ +-static ssize_t show_aout(struct device *dev, char *buf) ++static ssize_t show_aout(struct device *dev, struct device_attribute *attr, char *buf) + { + struct adm9240_data *data = adm9240_update_device(dev); + return sprintf(buf, "%d\n", AOUT_FROM_REG(data->aout)); + } + +-static ssize_t set_aout(struct device *dev, const char *buf, size_t count) ++static ssize_t set_aout(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) + { + struct i2c_client *client = to_i2c_client(dev); + struct adm9240_data *data = i2c_get_clientdata(client); +@@ -466,7 +466,7 @@ static ssize_t set_aout(struct device *d + static DEVICE_ATTR(aout_output, S_IRUGO | S_IWUSR, show_aout, set_aout); + + /* chassis_clear */ +-static ssize_t chassis_clear(struct device *dev, const char *buf, size_t count) ++static ssize_t chassis_clear(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) + { + struct i2c_client *client = to_i2c_client(dev); + unsigned long val = simple_strtol(buf, NULL, 10); +diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/i2c/chips/atxp1.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/i2c/chips/atxp1.c +--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/i2c/chips/atxp1.c 2005-05-18 20:30:41.000000000 -0400 ++++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/i2c/chips/atxp1.c 2005-05-18 20:40:53.000000000 -0400 +@@ -99,7 +99,7 @@ static struct atxp1_data * atxp1_update_ + } + + /* sys file functions for cpu0_vid */ +-static ssize_t atxp1_showvcore(struct device *dev, char *buf) ++static ssize_t atxp1_showvcore(struct device *dev, struct device_attribute *attr, char *buf) + { + int size; + struct atxp1_data *data; +@@ -111,7 +111,7 @@ static ssize_t atxp1_showvcore(struct de + return size; + } + +-static ssize_t atxp1_storevcore(struct device *dev, const char* buf, size_t count) ++static ssize_t atxp1_storevcore(struct device *dev, struct device_attribute *attr, const char* buf, size_t count) + { + struct atxp1_data *data; + struct i2c_client *client; +@@ -169,7 +169,7 @@ static ssize_t atxp1_storevcore(struct d + static DEVICE_ATTR(cpu0_vid, S_IRUGO | S_IWUSR, atxp1_showvcore, atxp1_storevcore); + + /* sys file functions for GPIO1 */ +-static ssize_t atxp1_showgpio1(struct device *dev, char *buf) ++static ssize_t atxp1_showgpio1(struct device *dev, struct device_attribute *attr, char *buf) + { + int size; + struct atxp1_data *data; +@@ -181,7 +181,7 @@ static ssize_t atxp1_showgpio1(struct de + return size; + } + +-static ssize_t atxp1_storegpio1(struct device *dev, const char* buf, size_t count) ++static ssize_t atxp1_storegpio1(struct device *dev, struct device_attribute *attr, const char* buf, size_t count) + { + struct atxp1_data *data; + struct i2c_client *client; +@@ -211,7 +211,7 @@ static ssize_t atxp1_storegpio1(struct d + static DEVICE_ATTR(gpio1, S_IRUGO | S_IWUSR, atxp1_showgpio1, atxp1_storegpio1); + + /* sys file functions for GPIO2 */ +-static ssize_t atxp1_showgpio2(struct device *dev, char *buf) ++static ssize_t atxp1_showgpio2(struct device *dev, struct device_attribute *attr, char *buf) + { + int size; + struct atxp1_data *data; +@@ -223,7 +223,7 @@ static ssize_t atxp1_showgpio2(struct de + return size; + } + +-static ssize_t atxp1_storegpio2(struct device *dev, const char* buf, size_t count) ++static ssize_t atxp1_storegpio2(struct device *dev, struct device_attribute *attr, const char* buf, size_t count) + { + struct atxp1_data *data; + struct i2c_client *client; +diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/i2c/chips/w83627ehf.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/i2c/chips/w83627ehf.c +--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/i2c/chips/w83627ehf.c 2005-05-18 20:30:41.000000000 -0400 ++++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/i2c/chips/w83627ehf.c 2005-05-18 20:40:53.000000000 -0400 +@@ -486,7 +486,7 @@ store_fan_min(struct device *dev, const + + #define sysfs_fan_offset(offset) \ + static ssize_t \ +-show_reg_fan_##offset(struct device *dev, char *buf) \ ++show_reg_fan_##offset(struct device *dev, struct device_attribute *attr, char *buf) \ + { \ + return show_fan(dev, buf, offset-1); \ + } \ +@@ -495,12 +495,12 @@ static DEVICE_ATTR(fan##offset##_input, + + #define sysfs_fan_min_offset(offset) \ + static ssize_t \ +-show_reg_fan##offset##_min(struct device *dev, char *buf) \ ++show_reg_fan##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \ + { \ + return show_fan_min(dev, buf, offset-1); \ + } \ + static ssize_t \ +-store_reg_fan##offset##_min(struct device *dev, const char *buf, \ ++store_reg_fan##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \ + size_t count) \ + { \ + return store_fan_min(dev, buf, count, offset-1); \ +@@ -511,7 +511,7 @@ static DEVICE_ATTR(fan##offset##_min, S_ + + #define sysfs_fan_div_offset(offset) \ + static ssize_t \ +-show_reg_fan##offset##_div(struct device *dev, char *buf) \ ++show_reg_fan##offset##_div(struct device *dev, struct device_attribute *attr, char *buf) \ + { \ + return show_fan_div(dev, buf, offset - 1); \ + } \ +@@ -536,7 +536,7 @@ sysfs_fan_div_offset(5); + + #define show_temp1_reg(reg) \ + static ssize_t \ +-show_##reg(struct device *dev, char *buf) \ ++show_##reg(struct device *dev, struct device_attribute *attr, char *buf) \ + { \ + struct w83627ehf_data *data = w83627ehf_update_device(dev); \ + return sprintf(buf, "%d\n", temp1_from_reg(data->reg)); \ +@@ -547,7 +547,7 @@ show_temp1_reg(temp1_max_hyst); + + #define store_temp1_reg(REG, reg) \ + static ssize_t \ +-store_temp1_##reg(struct device *dev, const char *buf, size_t count) \ ++store_temp1_##reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \ + { \ + struct i2c_client *client = to_i2c_client(dev); \ + struct w83627ehf_data *data = i2c_get_clientdata(client); \ +@@ -601,7 +601,7 @@ store_temp_reg(HYST, temp_max_hyst); + + #define sysfs_temp_offset(offset) \ + static ssize_t \ +-show_reg_temp##offset (struct device *dev, char *buf) \ ++show_reg_temp##offset (struct device *dev, struct device_attribute *attr, char *buf) \ + { \ + return show_temp(dev, buf, offset - 2); \ + } \ +@@ -610,12 +610,12 @@ static DEVICE_ATTR(temp##offset##_input, + + #define sysfs_temp_reg_offset(reg, offset) \ + static ssize_t \ +-show_reg_temp##offset##_##reg(struct device *dev, char *buf) \ ++show_reg_temp##offset##_##reg(struct device *dev, struct device_attribute *attr, char *buf) \ + { \ + return show_temp_##reg(dev, buf, offset - 2); \ + } \ + static ssize_t \ +-store_reg_temp##offset##_##reg(struct device *dev, const char *buf, \ ++store_reg_temp##offset##_##reg(struct device *dev, struct device_attribute *attr, const char *buf, \ + size_t count) \ + { \ + return store_temp_##reg(dev, buf, count, offset - 2); \ +diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/input/serio/serio.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/input/serio/serio.c +--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/input/serio/serio.c 2005-05-18 20:35:26.000000000 -0400 ++++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/input/serio/serio.c 2005-05-18 20:41:24.000000000 -0400 +@@ -358,31 +358,31 @@ static int serio_thread(void *nothing) + * Serio port operations + */ + +-static ssize_t serio_show_description(struct device *dev, char *buf) ++static ssize_t serio_show_description(struct device *dev, struct device_attribute *attr, char *buf) + { + struct serio *serio = to_serio_port(dev); + return sprintf(buf, "%s\n", serio->name); + } + +-static ssize_t serio_show_id_type(struct device *dev, char *buf) ++static ssize_t serio_show_id_type(struct device *dev, struct device_attribute *attr, char *buf) + { + struct serio *serio = to_serio_port(dev); + return sprintf(buf, "%02x\n", serio->id.type); + } + +-static ssize_t serio_show_id_proto(struct device *dev, char *buf) ++static ssize_t serio_show_id_proto(struct device *dev, struct device_attribute *attr, char *buf) + { + struct serio *serio = to_serio_port(dev); + return sprintf(buf, "%02x\n", serio->id.proto); + } + +-static ssize_t serio_show_id_id(struct device *dev, char *buf) ++static ssize_t serio_show_id_id(struct device *dev, struct device_attribute *attr, char *buf) + { + struct serio *serio = to_serio_port(dev); + return sprintf(buf, "%02x\n", serio->id.id); + } + +-static ssize_t serio_show_id_extra(struct device *dev, char *buf) ++static ssize_t serio_show_id_extra(struct device *dev, struct device_attribute *attr, char *buf) + { + struct serio *serio = to_serio_port(dev); + return sprintf(buf, "%02x\n", serio->id.extra); +@@ -406,7 +406,7 @@ static struct attribute_group serio_id_a + .attrs = serio_device_id_attrs, + }; + +-static ssize_t serio_rebind_driver(struct device *dev, const char *buf, size_t count) ++static ssize_t serio_rebind_driver(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) + { + struct serio *serio = to_serio_port(dev); + struct device_driver *drv; +diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/message/fusion/mptscsih.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/message/fusion/mptscsih.c +--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/message/fusion/mptscsih.c 2005-05-18 20:35:26.000000000 -0400 ++++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/message/fusion/mptscsih.c 2005-05-18 20:41:31.000000000 -0400 +@@ -2352,7 +2352,7 @@ slave_configure_exit: + } + + ssize_t +-mptscsih_store_queue_depth(struct device *dev, const char *buf, size_t count) ++mptscsih_store_queue_depth(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) + { + int depth; + struct scsi_device *sdev = to_scsi_device(dev); +diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/message/fusion/mptscsih.h linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/message/fusion/mptscsih.h +--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/message/fusion/mptscsih.h 2005-05-18 20:31:19.000000000 -0400 ++++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/message/fusion/mptscsih.h 2005-05-18 20:41:31.000000000 -0400 +@@ -103,5 +103,5 @@ extern int mptscsih_taskmgmt_complete(MP + extern int mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r); + extern int mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply); + extern int mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset); +-extern ssize_t mptscsih_store_queue_depth(struct device *dev, const char *buf, size_t count); ++extern ssize_t mptscsih_store_queue_depth(struct device *dev, struct device_attribute *attr, const char *buf, size_t count); + extern void mptscsih_timer_expired(unsigned long data); +diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/pci/pci-sysfs.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/pci/pci-sysfs.c +--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/pci/pci-sysfs.c 2005-05-18 20:35:26.000000000 -0400 ++++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/pci/pci-sysfs.c 2005-05-18 20:41:03.000000000 -0400 +@@ -76,7 +76,7 @@ resource_show(struct device * dev, struc + return (str - buf); + } + +-static ssize_t modalias_show(struct device *dev, char *buf) ++static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf) + { + struct pci_dev *pci_dev = to_pci_dev(dev); + +diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/pcmcia/ds.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/pcmcia/ds.c +--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/pcmcia/ds.c 2005-05-18 20:35:26.000000000 -0400 ++++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/pcmcia/ds.c 2005-05-18 20:41:32.000000000 -0400 +@@ -848,7 +848,7 @@ pcmcia_device_stringattr(prod_id3, prod_ + pcmcia_device_stringattr(prod_id4, prod_id[3]); + + +-static ssize_t pcmcia_store_allow_func_id_match (struct device * dev, const char * buf, size_t count) ++static ssize_t pcmcia_store_allow_func_id_match (struct device * dev, struct device_attribute *attr, const char * buf, size_t count) + { + struct pcmcia_device *p_dev = to_pcmcia_dev(dev); + if (!count) +diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/usb/core/sysfs.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/usb/core/sysfs.c +--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/usb/core/sysfs.c 2005-05-18 20:35:27.000000000 -0400 ++++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/usb/core/sysfs.c 2005-05-18 20:41:04.000000000 -0400 +@@ -286,7 +286,7 @@ static ssize_t show_interface_string(str + } + static DEVICE_ATTR(interface, S_IRUGO, show_interface_string, NULL); + +-static ssize_t show_modalias(struct device *dev, char *buf) ++static ssize_t show_modalias(struct device *dev, struct device_attribute *attr, char *buf) + { + struct usb_interface *intf; + struct usb_device *udev; diff --git a/a/content_digest b/N1/content_digest index e65a505..c26a315 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,10 @@ - "From\0yani.ioannou@gmail.com (Yani Ioannou)\0" - "Subject\0[lm-sensors] [PATCH 2.6.12-rc4-mm2] drivers: (dynamic sysfs\0" - "Date\0Thu, 19 May 2005 13:36:20 +0000\0" + "From\0Yani Ioannou <yani.ioannou@gmail.com>\0" + "Subject\0[PATCH 2.6.12-rc4-mm2] drivers: (dynamic sysfs callbacks) update device attribute callbacks\0" + "Date\0Thu, 19 May 2005 07:35:35 -0400\0" "To\0Greg KH <greg@kroah.com>\0" "Cc\0linux-kernel@vger.kernel.org" " lm-sensors@lm-sensors.org\0" - "\00:1\0" + "\01:1\0" "b\0" "Hi Greg,\n" "\n" @@ -48,13 +48,463 @@ " pcmcia/ds.c | 2 +-\n" " usb/core/sysfs.c | 2 +-\n" " 12 files changed, 54 insertions(+), 54 deletions(-)\n" - "---\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: patch-linux-2.6.12-rc4-mm2-sysfsdyncallback-deviceattr-update.diff\n" - "Type: text/x-patch\n" - "Size: 22087 bytes\n" - "Desc: not available\n" - Url : http://lists.atrpms.net/pipermail/lm-sensors/attachments/20050519/51d1b247/patch-linux-2.6.12-rc4-mm2-sysfsdyncallback-deviceattr-update.bin + --- + "\01:2\0" + "fn\0patch-linux-2.6.12-rc4-mm2-sysfsdyncallback-deviceattr-update.diff\0" + "b\0" + "diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/char/tpm/tpm.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/char/tpm/tpm.c\n" + "--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/char/tpm/tpm.c\t2005-05-18 20:35:25.000000000 -0400\n" + "+++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/char/tpm/tpm.c\t2005-05-18 20:41:11.000000000 -0400\n" + "@@ -216,7 +216,7 @@ static const u8 pcrread[] = {\n" + " \t0, 0, 0, 0\t\t/* PCR index */\n" + " };\n" + " \n" + "-ssize_t tpm_show_pcrs(struct device *dev, char *buf)\n" + "+ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tu8 data[READ_PCR_RESULT_SIZE];\n" + " \tssize_t len;\n" + "@@ -268,7 +268,7 @@ static const u8 readpubek[] = {\n" + " \t0, 0, 0, 124,\t\t/* TPM_ORD_ReadPubek */\n" + " };\n" + " \n" + "-ssize_t tpm_show_pubek(struct device *dev, char *buf)\n" + "+ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tu8 *data;\n" + " \tssize_t len;\n" + "@@ -349,7 +349,7 @@ static const u8 cap_manufacturer[] = {\n" + " \t0, 0, 1, 3\n" + " };\n" + " \n" + "-ssize_t tpm_show_caps(struct device *dev, char *buf)\n" + "+ssize_t tpm_show_caps(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tu8 data[sizeof(cap_manufacturer)];\n" + " \tssize_t len;\n" + "@@ -385,7 +385,7 @@ ssize_t tpm_show_caps(struct device *dev\n" + " \n" + " EXPORT_SYMBOL_GPL(tpm_show_caps);\n" + " \n" + "-ssize_t tpm_store_cancel(struct device * dev, const char *buf,\n" + "+ssize_t tpm_store_cancel(struct device * dev, struct device_attribute *attr, const char *buf,\n" + " \t\t\t size_t count)\n" + " {\n" + " \tstruct tpm_chip *chip = dev_get_drvdata(dev);\n" + "diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/char/tpm/tpm.h linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/char/tpm/tpm.h\n" + "--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/char/tpm/tpm.h\t2005-05-18 20:31:03.000000000 -0400\n" + "+++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/char/tpm/tpm.h\t2005-05-18 20:41:11.000000000 -0400\n" + "@@ -35,10 +35,10 @@ enum tpm_addr {\n" + " \tTPM_DATA = 0x4F\n" + " };\n" + " \n" + "-extern ssize_t tpm_show_pubek(struct device *, char *);\n" + "-extern ssize_t tpm_show_pcrs(struct device *, char *);\n" + "-extern ssize_t tpm_show_caps(struct device *, char *);\n" + "-extern ssize_t tpm_store_cancel(struct device *, const char *, size_t);\n" + "+extern ssize_t tpm_show_pubek(struct device *, struct device_attribute *attr, char *);\n" + "+extern ssize_t tpm_show_pcrs(struct device *, struct device_attribute *attr, char *);\n" + "+extern ssize_t tpm_show_caps(struct device *, struct device_attribute *attr, char *);\n" + "+extern ssize_t tpm_store_cancel(struct device *, struct device_attribute *attr, const char *, size_t);\n" + " \n" + " \n" + " struct tpm_chip;\n" + "diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/i2c/chips/adm1025.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/i2c/chips/adm1025.c\n" + "--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/i2c/chips/adm1025.c\t2005-05-18 20:35:25.000000000 -0400\n" + "+++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/i2c/chips/adm1025.c\t2005-05-18 20:40:53.000000000 -0400\n" + "@@ -274,14 +274,14 @@ static DEVICE_ATTR(temp##offset##_max, S\n" + " set_temp(1);\n" + " set_temp(2);\n" + " \n" + "-static ssize_t show_alarms(struct device *dev, char *buf)\n" + "+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tstruct adm1025_data *data = adm1025_update_device(dev);\n" + " \treturn sprintf(buf, \"%u\\n\", data->alarms);\n" + " }\n" + " static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);\n" + " \n" + "-static ssize_t show_vid(struct device *dev, char *buf)\n" + "+static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tstruct adm1025_data *data = adm1025_update_device(dev);\n" + " \treturn sprintf(buf, \"%u\\n\", vid_from_reg(data->vid, data->vrm));\n" + "@@ -290,12 +290,12 @@ static ssize_t show_vid(struct device *d\n" + " static DEVICE_ATTR(in1_ref, S_IRUGO, show_vid, NULL);\n" + " static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);\n" + " \n" + "-static ssize_t show_vrm(struct device *dev, char *buf)\n" + "+static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tstruct adm1025_data *data = adm1025_update_device(dev);\n" + " \treturn sprintf(buf, \"%u\\n\", data->vrm);\n" + " }\n" + "-static ssize_t set_vrm(struct device *dev, const char *buf, size_t count)\n" + "+static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)\n" + " {\n" + " \tstruct i2c_client *client = to_i2c_client(dev);\n" + " \tstruct adm1025_data *data = i2c_get_clientdata(client);\n" + "diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/i2c/chips/adm9240.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/i2c/chips/adm9240.c\n" + "--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/i2c/chips/adm9240.c\t2005-05-18 20:30:41.000000000 -0400\n" + "+++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/i2c/chips/adm9240.c\t2005-05-18 20:40:53.000000000 -0400\n" + "@@ -185,7 +185,7 @@ static int adm9240_write_value(struct i2\n" + " \n" + " /* temperature */\n" + " #define show_temp(value, scale)\t\t\t\t\t\\\n" + "-static ssize_t show_##value(struct device *dev, char *buf)\t\\\n" + "+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)\t\\\n" + " {\t\t\t\t\t\t\t\t\\\n" + " \tstruct adm9240_data *data = adm9240_update_device(dev);\t\\\n" + " \treturn sprintf(buf, \"%d\\n\", data->value * scale);\t\\\n" + "@@ -195,7 +195,7 @@ show_temp(temp_hyst, 1000);\n" + " show_temp(temp, 500);\n" + " \n" + " #define set_temp(value, reg)\t\t\t\t\t\\\n" + "-static ssize_t set_##value(struct device *dev, const char *buf,\t\\\n" + "+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf,\t\\\n" + " \t\tsize_t count)\t\t\t\t\t\\\n" + " {\t\t\t\t\t\t\t\t\\\n" + " \tstruct i2c_client *client = to_i2c_client(dev);\t\t\\\n" + "@@ -266,26 +266,26 @@ static ssize_t set_in_max(struct device \n" + " }\n" + " \n" + " #define show_in_offset(offset)\t\t\t\t\t\t\\\n" + "-static ssize_t show_in##offset(struct device *dev, char *buf)\t\t\\\n" + "+static ssize_t show_in##offset(struct device *dev, struct device_attribute *attr, char *buf)\t\t\\\n" + " {\t\t\t\t\t\t\t\t\t\\\n" + " \treturn show_in(dev, buf, offset);\t\t\t\t\\\n" + " }\t\t\t\t\t\t\t\t\t\\\n" + " static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL);\t\\\n" + "-static ssize_t show_in##offset##_min(struct device *dev, char *buf)\t\\\n" + "+static ssize_t show_in##offset##_min(struct device *dev, struct device_attribute *attr, char *buf)\t\\\n" + " {\t\t\t\t\t\t\t\t\t\\\n" + " \treturn show_in_min(dev, buf, offset);\t\t\t\t\\\n" + " }\t\t\t\t\t\t\t\t\t\\\n" + "-static ssize_t show_in##offset##_max(struct device *dev, char *buf)\t\\\n" + "+static ssize_t show_in##offset##_max(struct device *dev, struct device_attribute *attr, char *buf)\t\\\n" + " {\t\t\t\t\t\t\t\t\t\\\n" + " \treturn show_in_max(dev, buf, offset);\t\t\t\t\\\n" + " }\t\t\t\t\t\t\t\t\t\\\n" + " static ssize_t\t\t\t\t\t\t\t\t\\\n" + "-set_in##offset##_min(struct device *dev, const char *buf, size_t count)\t\\\n" + "+set_in##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)\t\\\n" + " {\t\t\t\t\t\t\t\t\t\\\n" + " \treturn set_in_min(dev, buf, count, offset);\t\t\t\\\n" + " }\t\t\t\t\t\t\t\t\t\\\n" + " static ssize_t\t\t\t\t\t\t\t\t\\\n" + "-set_in##offset##_max(struct device *dev, const char *buf, size_t count)\t\\\n" + "+set_in##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)\t\\\n" + " {\t\t\t\t\t\t\t\t\t\\\n" + " \treturn set_in_max(dev, buf, count, offset);\t\t\t\\\n" + " }\t\t\t\t\t\t\t\t\t\\\n" + "@@ -401,19 +401,19 @@ static ssize_t set_fan_min(struct device\n" + " }\n" + " \n" + " #define show_fan_offset(offset)\t\t\t\t\t\t\\\n" + "-static ssize_t show_fan_##offset (struct device *dev, char *buf)\t\\\n" + "+static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf)\t\\\n" + " {\t\t\t\t\t\t\t\t\t\\\n" + " return show_fan(dev, buf, offset - 1);\t\t\t\t\t\\\n" + " }\t\t\t\t\t\t\t\t\t\\\n" + "-static ssize_t show_fan_##offset##_div (struct device *dev, char *buf)\t\\\n" + "+static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf)\t\\\n" + " {\t\t\t\t\t\t\t\t\t\\\n" + " return show_fan_div(dev, buf, offset - 1);\t\t\t\t\\\n" + " }\t\t\t\t\t\t\t\t\t\\\n" + "-static ssize_t show_fan_##offset##_min (struct device *dev, char *buf)\t\\\n" + "+static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)\t\\\n" + " {\t\t\t\t\t\t\t\t\t\\\n" + " return show_fan_min(dev, buf, offset - 1);\t\t\t\t\\\n" + " }\t\t\t\t\t\t\t\t\t\\\n" + "-static ssize_t set_fan_##offset##_min (struct device *dev, \t\t\\\n" + "+static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr, \t\t\\\n" + " const char *buf, size_t count)\t\t\t\t\t\t\\\n" + " {\t\t\t\t\t\t\t\t\t\\\n" + " return set_fan_min(dev, buf, count, offset - 1);\t\t\t\\\n" + "@@ -429,7 +429,7 @@ show_fan_offset(1);\n" + " show_fan_offset(2);\n" + " \n" + " /* alarms */\n" + "-static ssize_t show_alarms(struct device *dev, char *buf)\n" + "+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tstruct adm9240_data *data = adm9240_update_device(dev);\n" + " \treturn sprintf(buf, \"%u\\n\", data->alarms);\n" + "@@ -437,7 +437,7 @@ static ssize_t show_alarms(struct device\n" + " static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);\n" + " \n" + " /* vid */\n" + "-static ssize_t show_vid(struct device *dev, char *buf)\n" + "+static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tstruct adm9240_data *data = adm9240_update_device(dev);\n" + " \treturn sprintf(buf, \"%d\\n\", vid_from_reg(data->vid, data->vrm));\n" + "@@ -445,13 +445,13 @@ static ssize_t show_vid(struct device *d\n" + " static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);\n" + " \n" + " /* analog output */\n" + "-static ssize_t show_aout(struct device *dev, char *buf)\n" + "+static ssize_t show_aout(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tstruct adm9240_data *data = adm9240_update_device(dev);\n" + " \treturn sprintf(buf, \"%d\\n\", AOUT_FROM_REG(data->aout));\n" + " }\n" + " \n" + "-static ssize_t set_aout(struct device *dev, const char *buf, size_t count)\n" + "+static ssize_t set_aout(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)\n" + " {\n" + " \tstruct i2c_client *client = to_i2c_client(dev);\n" + " \tstruct adm9240_data *data = i2c_get_clientdata(client);\n" + "@@ -466,7 +466,7 @@ static ssize_t set_aout(struct device *d\n" + " static DEVICE_ATTR(aout_output, S_IRUGO | S_IWUSR, show_aout, set_aout);\n" + " \n" + " /* chassis_clear */\n" + "-static ssize_t chassis_clear(struct device *dev, const char *buf, size_t count)\n" + "+static ssize_t chassis_clear(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)\n" + " {\n" + " \tstruct i2c_client *client = to_i2c_client(dev);\n" + " \tunsigned long val = simple_strtol(buf, NULL, 10);\n" + "diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/i2c/chips/atxp1.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/i2c/chips/atxp1.c\n" + "--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/i2c/chips/atxp1.c\t2005-05-18 20:30:41.000000000 -0400\n" + "+++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/i2c/chips/atxp1.c\t2005-05-18 20:40:53.000000000 -0400\n" + "@@ -99,7 +99,7 @@ static struct atxp1_data * atxp1_update_\n" + " }\n" + " \n" + " /* sys file functions for cpu0_vid */\n" + "-static ssize_t atxp1_showvcore(struct device *dev, char *buf)\n" + "+static ssize_t atxp1_showvcore(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tint size;\n" + " \tstruct atxp1_data *data;\n" + "@@ -111,7 +111,7 @@ static ssize_t atxp1_showvcore(struct de\n" + " \treturn size;\n" + " }\n" + " \n" + "-static ssize_t atxp1_storevcore(struct device *dev, const char* buf, size_t count)\n" + "+static ssize_t atxp1_storevcore(struct device *dev, struct device_attribute *attr, const char* buf, size_t count)\n" + " {\n" + " \tstruct atxp1_data *data;\n" + " \tstruct i2c_client *client;\n" + "@@ -169,7 +169,7 @@ static ssize_t atxp1_storevcore(struct d\n" + " static DEVICE_ATTR(cpu0_vid, S_IRUGO | S_IWUSR, atxp1_showvcore, atxp1_storevcore);\n" + " \n" + " /* sys file functions for GPIO1 */\n" + "-static ssize_t atxp1_showgpio1(struct device *dev, char *buf)\n" + "+static ssize_t atxp1_showgpio1(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tint size;\n" + " \tstruct atxp1_data *data;\n" + "@@ -181,7 +181,7 @@ static ssize_t atxp1_showgpio1(struct de\n" + " \treturn size;\n" + " }\n" + " \n" + "-static ssize_t atxp1_storegpio1(struct device *dev, const char* buf, size_t count)\n" + "+static ssize_t atxp1_storegpio1(struct device *dev, struct device_attribute *attr, const char* buf, size_t count)\n" + " {\n" + " \tstruct atxp1_data *data;\n" + " \tstruct i2c_client *client;\n" + "@@ -211,7 +211,7 @@ static ssize_t atxp1_storegpio1(struct d\n" + " static DEVICE_ATTR(gpio1, S_IRUGO | S_IWUSR, atxp1_showgpio1, atxp1_storegpio1);\n" + " \n" + " /* sys file functions for GPIO2 */\n" + "-static ssize_t atxp1_showgpio2(struct device *dev, char *buf)\n" + "+static ssize_t atxp1_showgpio2(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tint size;\n" + " \tstruct atxp1_data *data;\n" + "@@ -223,7 +223,7 @@ static ssize_t atxp1_showgpio2(struct de\n" + " \treturn size;\n" + " }\n" + " \n" + "-static ssize_t atxp1_storegpio2(struct device *dev, const char* buf, size_t count)\n" + "+static ssize_t atxp1_storegpio2(struct device *dev, struct device_attribute *attr, const char* buf, size_t count)\n" + " {\n" + " \tstruct atxp1_data *data;\n" + " \tstruct i2c_client *client;\n" + "diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/i2c/chips/w83627ehf.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/i2c/chips/w83627ehf.c\n" + "--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/i2c/chips/w83627ehf.c\t2005-05-18 20:30:41.000000000 -0400\n" + "+++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/i2c/chips/w83627ehf.c\t2005-05-18 20:40:53.000000000 -0400\n" + "@@ -486,7 +486,7 @@ store_fan_min(struct device *dev, const \n" + " \n" + " #define sysfs_fan_offset(offset) \\\n" + " static ssize_t \\\n" + "-show_reg_fan_##offset(struct device *dev, char *buf) \\\n" + "+show_reg_fan_##offset(struct device *dev, struct device_attribute *attr, char *buf) \\\n" + " { \\\n" + " \treturn show_fan(dev, buf, offset-1); \\\n" + " } \\\n" + "@@ -495,12 +495,12 @@ static DEVICE_ATTR(fan##offset##_input, \n" + " \n" + " #define sysfs_fan_min_offset(offset) \\\n" + " static ssize_t \\\n" + "-show_reg_fan##offset##_min(struct device *dev, char *buf) \\\n" + "+show_reg_fan##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \\\n" + " { \\\n" + " \treturn show_fan_min(dev, buf, offset-1); \\\n" + " } \\\n" + " static ssize_t \\\n" + "-store_reg_fan##offset##_min(struct device *dev, const char *buf, \\\n" + "+store_reg_fan##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \\\n" + " \t\t\t size_t count) \\\n" + " { \\\n" + " \treturn store_fan_min(dev, buf, count, offset-1); \\\n" + "@@ -511,7 +511,7 @@ static DEVICE_ATTR(fan##offset##_min, S_\n" + " \n" + " #define sysfs_fan_div_offset(offset) \\\n" + " static ssize_t \\\n" + "-show_reg_fan##offset##_div(struct device *dev, char *buf) \\\n" + "+show_reg_fan##offset##_div(struct device *dev, struct device_attribute *attr, char *buf) \\\n" + " { \\\n" + " \treturn show_fan_div(dev, buf, offset - 1); \\\n" + " } \\\n" + "@@ -536,7 +536,7 @@ sysfs_fan_div_offset(5);\n" + " \n" + " #define show_temp1_reg(reg) \\\n" + " static ssize_t \\\n" + "-show_##reg(struct device *dev, char *buf) \\\n" + "+show_##reg(struct device *dev, struct device_attribute *attr, char *buf) \\\n" + " { \\\n" + " \tstruct w83627ehf_data *data = w83627ehf_update_device(dev); \\\n" + " \treturn sprintf(buf, \"%d\\n\", temp1_from_reg(data->reg)); \\\n" + "@@ -547,7 +547,7 @@ show_temp1_reg(temp1_max_hyst);\n" + " \n" + " #define store_temp1_reg(REG, reg) \\\n" + " static ssize_t \\\n" + "-store_temp1_##reg(struct device *dev, const char *buf, size_t count) \\\n" + "+store_temp1_##reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \\\n" + " { \\\n" + " \tstruct i2c_client *client = to_i2c_client(dev); \\\n" + " \tstruct w83627ehf_data *data = i2c_get_clientdata(client); \\\n" + "@@ -601,7 +601,7 @@ store_temp_reg(HYST, temp_max_hyst);\n" + " \n" + " #define sysfs_temp_offset(offset) \\\n" + " static ssize_t \\\n" + "-show_reg_temp##offset (struct device *dev, char *buf) \\\n" + "+show_reg_temp##offset (struct device *dev, struct device_attribute *attr, char *buf) \\\n" + " { \\\n" + " \treturn show_temp(dev, buf, offset - 2); \\\n" + " } \\\n" + "@@ -610,12 +610,12 @@ static DEVICE_ATTR(temp##offset##_input,\n" + " \n" + " #define sysfs_temp_reg_offset(reg, offset) \\\n" + " static ssize_t \\\n" + "-show_reg_temp##offset##_##reg(struct device *dev, char *buf) \\\n" + "+show_reg_temp##offset##_##reg(struct device *dev, struct device_attribute *attr, char *buf) \\\n" + " { \\\n" + " \treturn show_temp_##reg(dev, buf, offset - 2); \\\n" + " } \\\n" + " static ssize_t \\\n" + "-store_reg_temp##offset##_##reg(struct device *dev, const char *buf, \\\n" + "+store_reg_temp##offset##_##reg(struct device *dev, struct device_attribute *attr, const char *buf, \\\n" + " \t\t\t size_t count) \\\n" + " { \\\n" + " \treturn store_temp_##reg(dev, buf, count, offset - 2); \\\n" + "diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/input/serio/serio.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/input/serio/serio.c\n" + "--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/input/serio/serio.c\t2005-05-18 20:35:26.000000000 -0400\n" + "+++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/input/serio/serio.c\t2005-05-18 20:41:24.000000000 -0400\n" + "@@ -358,31 +358,31 @@ static int serio_thread(void *nothing)\n" + " * Serio port operations\n" + " */\n" + " \n" + "-static ssize_t serio_show_description(struct device *dev, char *buf)\n" + "+static ssize_t serio_show_description(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tstruct serio *serio = to_serio_port(dev);\n" + " \treturn sprintf(buf, \"%s\\n\", serio->name);\n" + " }\n" + " \n" + "-static ssize_t serio_show_id_type(struct device *dev, char *buf)\n" + "+static ssize_t serio_show_id_type(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tstruct serio *serio = to_serio_port(dev);\n" + " \treturn sprintf(buf, \"%02x\\n\", serio->id.type);\n" + " }\n" + " \n" + "-static ssize_t serio_show_id_proto(struct device *dev, char *buf)\n" + "+static ssize_t serio_show_id_proto(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tstruct serio *serio = to_serio_port(dev);\n" + " \treturn sprintf(buf, \"%02x\\n\", serio->id.proto);\n" + " }\n" + " \n" + "-static ssize_t serio_show_id_id(struct device *dev, char *buf)\n" + "+static ssize_t serio_show_id_id(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tstruct serio *serio = to_serio_port(dev);\n" + " \treturn sprintf(buf, \"%02x\\n\", serio->id.id);\n" + " }\n" + " \n" + "-static ssize_t serio_show_id_extra(struct device *dev, char *buf)\n" + "+static ssize_t serio_show_id_extra(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tstruct serio *serio = to_serio_port(dev);\n" + " \treturn sprintf(buf, \"%02x\\n\", serio->id.extra);\n" + "@@ -406,7 +406,7 @@ static struct attribute_group serio_id_a\n" + " \t.attrs\t= serio_device_id_attrs,\n" + " };\n" + " \n" + "-static ssize_t serio_rebind_driver(struct device *dev, const char *buf, size_t count)\n" + "+static ssize_t serio_rebind_driver(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)\n" + " {\n" + " \tstruct serio *serio = to_serio_port(dev);\n" + " \tstruct device_driver *drv;\n" + "diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/message/fusion/mptscsih.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/message/fusion/mptscsih.c\n" + "--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/message/fusion/mptscsih.c\t2005-05-18 20:35:26.000000000 -0400\n" + "+++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/message/fusion/mptscsih.c\t2005-05-18 20:41:31.000000000 -0400\n" + "@@ -2352,7 +2352,7 @@ slave_configure_exit:\n" + " }\n" + " \n" + " ssize_t\n" + "-mptscsih_store_queue_depth(struct device *dev, const char *buf, size_t count)\n" + "+mptscsih_store_queue_depth(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)\n" + " {\n" + " \tint\t\t\t depth;\n" + " \tstruct scsi_device\t*sdev = to_scsi_device(dev);\n" + "diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/message/fusion/mptscsih.h linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/message/fusion/mptscsih.h\n" + "--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/message/fusion/mptscsih.h\t2005-05-18 20:31:19.000000000 -0400\n" + "+++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/message/fusion/mptscsih.h\t2005-05-18 20:41:31.000000000 -0400\n" + "@@ -103,5 +103,5 @@ extern int mptscsih_taskmgmt_complete(MP\n" + " extern int mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);\n" + " extern int mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply);\n" + " extern int mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset);\n" + "-extern ssize_t mptscsih_store_queue_depth(struct device *dev, const char *buf, size_t count);\n" + "+extern ssize_t mptscsih_store_queue_depth(struct device *dev, struct device_attribute *attr, const char *buf, size_t count);\n" + " extern void mptscsih_timer_expired(unsigned long data);\n" + "diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/pci/pci-sysfs.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/pci/pci-sysfs.c\n" + "--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/pci/pci-sysfs.c\t2005-05-18 20:35:26.000000000 -0400\n" + "+++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/pci/pci-sysfs.c\t2005-05-18 20:41:03.000000000 -0400\n" + "@@ -76,7 +76,7 @@ resource_show(struct device * dev, struc\n" + " \treturn (str - buf);\n" + " }\n" + " \n" + "-static ssize_t modalias_show(struct device *dev, char *buf)\n" + "+static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tstruct pci_dev *pci_dev = to_pci_dev(dev);\n" + " \n" + "diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/pcmcia/ds.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/pcmcia/ds.c\n" + "--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/pcmcia/ds.c\t2005-05-18 20:35:26.000000000 -0400\n" + "+++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/pcmcia/ds.c\t2005-05-18 20:41:32.000000000 -0400\n" + "@@ -848,7 +848,7 @@ pcmcia_device_stringattr(prod_id3, prod_\n" + " pcmcia_device_stringattr(prod_id4, prod_id[3]);\n" + " \n" + " \n" + "-static ssize_t pcmcia_store_allow_func_id_match (struct device * dev, const char * buf, size_t count)\n" + "+static ssize_t pcmcia_store_allow_func_id_match (struct device * dev, struct device_attribute *attr, const char * buf, size_t count)\n" + " {\n" + " \tstruct pcmcia_device *p_dev = to_pcmcia_dev(dev);\n" + " if (!count)\n" + "diff -uprN -X dontdiff linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/usb/core/sysfs.c linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/usb/core/sysfs.c\n" + "--- linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr.old/drivers/usb/core/sysfs.c\t2005-05-18 20:35:27.000000000 -0400\n" + "+++ linux-2.6.12-rc4-mm2-sysfsdyncallback-devattr/drivers/usb/core/sysfs.c\t2005-05-18 20:41:04.000000000 -0400\n" + "@@ -286,7 +286,7 @@ static ssize_t show_interface_string(str\n" + " }\n" + " static DEVICE_ATTR(interface, S_IRUGO, show_interface_string, NULL);\n" + " \n" + "-static ssize_t show_modalias(struct device *dev, char *buf)\n" + "+static ssize_t show_modalias(struct device *dev, struct device_attribute *attr, char *buf)\n" + " {\n" + " \tstruct usb_interface *intf;\n" + " \tstruct usb_device *udev;" -160838b1991a8ffed115a044199fa2c7f2f144c4c6640c98c84424ce1fe05df3 +03356c73849b24b5df28bb86db7a482271336e25140f2060c8a112a91c4d370d
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.