Messages in this thread Patch in this message | | | Date | Sat, 14 May 2005 05:31:16 -0400 | From | Yani Ioannou <> | Subject | [PATCH 2.6.12-rc4 8/12] drivers/ieee1394/nodemgr.c - drivers/s390/cio/cmf.c: (dynamic sysfs callbacks) update device attribute callbacks |
| |
Signed-off-by: Yani Ioannou <yani.ioannou@gmail.com>
--- ieee1394/nodemgr.c | 16 ++++++++-------- ieee1394/sbp2.c | 2 +- input/gameport/gameport.c | 4 ++-- input/keyboard/atkbd.c | 4 ++-- input/mouse/psmouse.h | 4 ++-- input/serio/serio.c | 16 ++++++++-------- macintosh/therm_adt746x.c | 8 ++++---- macintosh/therm_pm72.c | 4 ++-- macintosh/therm_windtunnel.c | 4 ++-- mca/mca-bus.c | 4 ++-- message/fusion/mptscsih.c | 2 +- mmc/mmc_sysfs.c | 2 +- pci/hotplug/cpqphp_sysfs.c | 4 ++-- pci/hotplug/shpchp_sysfs.c | 4 ++-- pci/pci-sysfs.c | 6 +++--- pcmcia/ds.c | 4 ++-- pnp/card.c | 4 ++-- pnp/interface.c | 8 ++++---- s390/block/dasd_devmap.c | 10 +++++----- s390/block/dcssblk.c | 24 ++++++++++++------------ s390/char/raw3270.c | 6 +++--- s390/char/tape_core.c | 10 +++++----- s390/char/vmlogrdr.c | 12 ++++++------ s390/cio/ccwgroup.c | 6 +++--- s390/cio/chsc.c | 6 +++--- s390/cio/cmf.c | 12 ++++++------ 26 files changed, 93 insertions(+), 93 deletions(-) diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/ieee1394/nodemgr.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/ieee1394/nodemgr.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/ieee1394/nodemgr.c 2005-05-11 00:28:12.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/ieee1394/nodemgr.c 2005-05-11 00:33:44.000000000 -0400 @@ -220,7 +220,7 @@ struct device nodemgr_dev_template_host #define fw_attr(class, class_type, field, type, format_string) \ -static ssize_t fw_show_##class##_##field (struct device *dev, char *buf)\ +static ssize_t fw_show_##class##_##field (struct device *dev, char *buf, void *private)\ { \ class_type *class; \ class = container_of(dev, class_type, device); \ @@ -232,7 +232,7 @@ static struct device_attribute dev_attr_ }; #define fw_attr_td(class, class_type, td_kv) \ -static ssize_t fw_show_##class##_##td_kv (struct device *dev, char *buf)\ +static ssize_t fw_show_##class##_##td_kv (struct device *dev, char *buf, void *private)\ { \ int len; \ class_type *class = container_of(dev, class_type, device); \ @@ -265,7 +265,7 @@ static struct driver_attribute driver_at }; -static ssize_t fw_show_ne_bus_options(struct device *dev, char *buf) +static ssize_t fw_show_ne_bus_options(struct device *dev, char *buf, void *private) { struct node_entry *ne = container_of(dev, struct node_entry, device); @@ -281,7 +281,7 @@ static ssize_t fw_show_ne_bus_options(st static DEVICE_ATTR(bus_options,S_IRUGO,fw_show_ne_bus_options,NULL); -static ssize_t fw_show_ne_tlabels_free(struct device *dev, char *buf) +static ssize_t fw_show_ne_tlabels_free(struct device *dev, char *buf, void *private) { struct node_entry *ne = container_of(dev, struct node_entry, device); return sprintf(buf, "%d\n", atomic_read(&ne->tpool->count.count) + 1); @@ -289,7 +289,7 @@ static ssize_t fw_show_ne_tlabels_free(s static DEVICE_ATTR(tlabels_free,S_IRUGO,fw_show_ne_tlabels_free,NULL); -static ssize_t fw_show_ne_tlabels_allocations(struct device *dev, char *buf) +static ssize_t fw_show_ne_tlabels_allocations(struct device *dev, char *buf, void *private) { struct node_entry *ne = container_of(dev, struct node_entry, device); return sprintf(buf, "%u\n", ne->tpool->allocations); @@ -297,7 +297,7 @@ static ssize_t fw_show_ne_tlabels_alloca static DEVICE_ATTR(tlabels_allocations,S_IRUGO,fw_show_ne_tlabels_allocations,NULL); -static ssize_t fw_show_ne_tlabels_mask(struct device *dev, char *buf) +static ssize_t fw_show_ne_tlabels_mask(struct device *dev, char *buf, void *private) { struct node_entry *ne = container_of(dev, struct node_entry, device); #if (BITS_PER_LONG <= 32) @@ -309,7 +309,7 @@ static ssize_t fw_show_ne_tlabels_mask(s static DEVICE_ATTR(tlabels_mask, S_IRUGO, fw_show_ne_tlabels_mask, NULL); -static ssize_t fw_set_ignore_driver(struct device *dev, const char *buf, size_t count) +static ssize_t fw_set_ignore_driver(struct device *dev, const char *buf, size_t count, void *private) { struct unit_directory *ud = container_of(dev, struct unit_directory, device); int state = simple_strtoul(buf, NULL, 10); @@ -324,7 +324,7 @@ static ssize_t fw_set_ignore_driver(stru return count; } -static ssize_t fw_get_ignore_driver(struct device *dev, char *buf) +static ssize_t fw_get_ignore_driver(struct device *dev, char *buf, void *private) { struct unit_directory *ud = container_of(dev, struct unit_directory, device); diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/ieee1394/sbp2.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/ieee1394/sbp2.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/ieee1394/sbp2.c 2005-05-11 00:28:12.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/ieee1394/sbp2.c 2005-05-11 00:33:45.000000000 -0400 @@ -2766,7 +2766,7 @@ static const char *sbp2scsi_info (struct return "SCSI emulation for IEEE-1394 SBP-2 Devices"; } -static ssize_t sbp2_sysfs_ieee1394_id_show(struct device *dev, char *buf) +static ssize_t sbp2_sysfs_ieee1394_id_show(struct device *dev, char *buf, void *private) { struct scsi_device *sdev; struct scsi_id_instance_data *scsi_id; diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/input/gameport/gameport.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/input/gameport/gameport.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/input/gameport/gameport.c 2005-05-11 00:28:12.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/input/gameport/gameport.c 2005-05-11 00:33:30.000000000 -0400 @@ -453,13 +453,13 @@ static int gameport_thread(void *nothing * Gameport port operations */ -static ssize_t gameport_show_description(struct device *dev, char *buf) +static ssize_t gameport_show_description(struct device *dev, char *buf, void *private) { struct gameport *gameport = to_gameport_port(dev); return sprintf(buf, "%s\n", gameport->name); } -static ssize_t gameport_rebind_driver(struct device *dev, const char *buf, size_t count) +static ssize_t gameport_rebind_driver(struct device *dev, const char *buf, size_t count, void *private) { struct gameport *gameport = to_gameport_port(dev); struct device_driver *drv; diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/input/keyboard/atkbd.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/input/keyboard/atkbd.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/input/keyboard/atkbd.c 2005-05-11 00:28:12.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/input/keyboard/atkbd.c 2005-05-11 00:33:30.000000000 -0400 @@ -219,11 +219,11 @@ static ssize_t atkbd_attr_set_helper(str #define ATKBD_DEFINE_ATTR(_name) \ static ssize_t atkbd_show_##_name(struct atkbd *, char *); \ static ssize_t atkbd_set_##_name(struct atkbd *, const char *, size_t); \ -static ssize_t atkbd_do_show_##_name(struct device *d, char *b) \ +static ssize_t atkbd_do_show_##_name(struct device *d, char *b, void *private) \ { \ return atkbd_attr_show_helper(d, b, atkbd_show_##_name); \ } \ -static ssize_t atkbd_do_set_##_name(struct device *d, const char *b, size_t s) \ +static ssize_t atkbd_do_set_##_name(struct device *d, const char *b, size_t s, void *private) \ { \ return atkbd_attr_set_helper(d, b, s, atkbd_set_##_name); \ } \ diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/input/mouse/psmouse.h linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/input/mouse/psmouse.h --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/input/mouse/psmouse.h 2005-05-11 00:28:12.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/input/mouse/psmouse.h 2005-05-11 00:33:29.000000000 -0400 @@ -91,11 +91,11 @@ ssize_t psmouse_attr_set_helper(struct d #define PSMOUSE_DEFINE_ATTR(_name) \ static ssize_t psmouse_attr_show_##_name(struct psmouse *, char *); \ static ssize_t psmouse_attr_set_##_name(struct psmouse *, const char *, size_t);\ -static ssize_t psmouse_do_show_##_name(struct device *d, char *b) \ +static ssize_t psmouse_do_show_##_name(struct device *d, char *b, void *private) \ { \ return psmouse_attr_show_helper(d, b, psmouse_attr_show_##_name); \ } \ -static ssize_t psmouse_do_set_##_name(struct device *d, const char *b, size_t s)\ +static ssize_t psmouse_do_set_##_name(struct device *d, const char *b, size_t s, void *private)\ { \ return psmouse_attr_set_helper(d, b, s, psmouse_attr_set_##_name); \ } \ diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/input/serio/serio.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/input/serio/serio.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/input/serio/serio.c 2005-05-11 00:28:12.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/input/serio/serio.c 2005-05-11 00:33:29.000000000 -0400 @@ -358,37 +358,37 @@ 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, char *buf, void *private) { 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, char *buf, void *private) { 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, char *buf, void *private) { 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, char *buf, void *private) { 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, char *buf, void *private) { struct serio *serio = to_serio_port(dev); return sprintf(buf, "%02x\n", serio->id.extra); } -static ssize_t serio_rebind_driver(struct device *dev, const char *buf, size_t count) +static ssize_t serio_rebind_driver(struct device *dev, const char *buf, size_t count, void *private) { struct serio *serio = to_serio_port(dev); struct device_driver *drv; @@ -419,13 +419,13 @@ static ssize_t serio_rebind_driver(struc return retval; } -static ssize_t serio_show_bind_mode(struct device *dev, char *buf) +static ssize_t serio_show_bind_mode(struct device *dev, char *buf, void *private) { struct serio *serio = to_serio_port(dev); return sprintf(buf, "%s\n", serio->manual_bind ? "manual" : "auto"); } -static ssize_t serio_set_bind_mode(struct device *dev, const char *buf, size_t count) +static ssize_t serio_set_bind_mode(struct device *dev, const char *buf, size_t count, void *private) { struct serio *serio = to_serio_port(dev); int retval; diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/macintosh/therm_adt746x.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/macintosh/therm_adt746x.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/macintosh/therm_adt746x.c 2005-05-11 00:28:12.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/macintosh/therm_adt746x.c 2005-05-11 00:33:49.000000000 -0400 @@ -456,13 +456,13 @@ static int attach_one_thermostat(struct * */ #define BUILD_SHOW_FUNC_INT(name, data) \ -static ssize_t show_##name(struct device *dev, char *buf) \ +static ssize_t show_##name(struct device *dev, char *buf, void *private) \ { \ return sprintf(buf, "%d\n", data); \ } #define BUILD_SHOW_FUNC_FAN(name, data) \ -static ssize_t show_##name(struct device *dev, char *buf) \ +static ssize_t show_##name(struct device *dev, char *buf, void *private) \ { \ return sprintf(buf, "%d (%d rpm)\n", \ thermostat->last_speed[data], \ @@ -471,7 +471,7 @@ static ssize_t show_##name(struct device } #define BUILD_STORE_FUNC_DEG(name, data) \ -static ssize_t store_##name(struct device *dev, const char *buf, size_t n) \ +static ssize_t store_##name(struct device *dev, const char *buf, size_t n, void *private) \ { \ int val; \ int i; \ @@ -484,7 +484,7 @@ static ssize_t store_##name(struct devic } #define BUILD_STORE_FUNC_INT(name, data) \ -static ssize_t store_##name(struct device *dev, const char *buf, size_t n) \ +static ssize_t store_##name(struct device *dev, const char *buf, size_t n, void *private) \ { \ u32 val; \ val = simple_strtoul(buf, NULL, 10); \ diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/macintosh/therm_pm72.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/macintosh/therm_pm72.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/macintosh/therm_pm72.c 2005-05-11 00:28:12.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/macintosh/therm_pm72.c 2005-05-11 00:33:49.000000000 -0400 @@ -685,7 +685,7 @@ static void fetch_cpu_pumps_minmax(void) * the input twice... I accept patches :) */ #define BUILD_SHOW_FUNC_FIX(name, data) \ -static ssize_t show_##name(struct device *dev, char *buf) \ +static ssize_t show_##name(struct device *dev, char *buf, void *private) \ { \ ssize_t r; \ down(&driver_lock); \ @@ -694,7 +694,7 @@ static ssize_t show_##name(struct device return r; \ } #define BUILD_SHOW_FUNC_INT(name, data) \ -static ssize_t show_##name(struct device *dev, char *buf) \ +static ssize_t show_##name(struct device *dev, char *buf, void *private) \ { \ return sprintf(buf, "%d", data); \ } diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/macintosh/therm_windtunnel.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/macintosh/therm_windtunnel.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/macintosh/therm_windtunnel.c 2005-05-11 00:28:12.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/macintosh/therm_windtunnel.c 2005-05-11 00:33:49.000000000 -0400 @@ -107,13 +107,13 @@ print_temp( const char *s, int temp ) } static ssize_t -show_cpu_temperature( struct device *dev, char *buf ) +show_cpu_temperature( struct device *dev, char *buf, void *private) { return sprintf(buf, "%d.%d\n", x.temp>>8, (x.temp & 255)*10/256 ); } static ssize_t -show_case_temperature( struct device *dev, char *buf ) +show_case_temperature( struct device *dev, char *buf, void *private) { return sprintf(buf, "%d.%d\n", x.casetemp>>8, (x.casetemp & 255)*10/256 ); } diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/mca/mca-bus.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/mca/mca-bus.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/mca/mca-bus.c 2005-05-11 00:28:08.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/mca/mca-bus.c 2005-05-11 00:32:32.000000000 -0400 @@ -69,7 +69,7 @@ struct bus_type mca_bus_type = { }; EXPORT_SYMBOL (mca_bus_type); -static ssize_t mca_show_pos_id(struct device *dev, char *buf) +static ssize_t mca_show_pos_id(struct device *dev, char *buf, void *private) { /* four digits, \n and trailing \0 */ struct mca_device *mca_dev = to_mca_device(dev); @@ -81,7 +81,7 @@ static ssize_t mca_show_pos_id(struct de len = sprintf(buf, "none\n"); return len; } -static ssize_t mca_show_pos(struct device *dev, char *buf) +static ssize_t mca_show_pos(struct device *dev, char *buf, void *private) { /* enough for 8 two byte hex chars plus space and new line */ int j, len=0; diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/message/fusion/mptscsih.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/message/fusion/mptscsih.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/message/fusion/mptscsih.c 2005-05-11 00:28:12.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/message/fusion/mptscsih.c 2005-05-11 00:33:43.000000000 -0400 @@ -2759,7 +2759,7 @@ slave_configure_exit: } static ssize_t -mptscsih_store_queue_depth(struct device *dev, const char *buf, size_t count) +mptscsih_store_queue_depth(struct device *dev, const char *buf, size_t count, void *private) { int depth; struct scsi_device *sdev = to_scsi_device(dev); diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/mmc/mmc_sysfs.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/mmc/mmc_sysfs.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/mmc/mmc_sysfs.c 2005-05-11 00:28:08.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/mmc/mmc_sysfs.c 2005-05-11 00:32:32.000000000 -0400 @@ -22,7 +22,7 @@ #define to_mmc_driver(d) container_of(d, struct mmc_driver, drv) #define MMC_ATTR(name, fmt, args...) \ -static ssize_t mmc_##name##_show (struct device *dev, char *buf) \ +static ssize_t mmc_##name##_show (struct device *dev, char *buf, void *private) \ { \ struct mmc_card *card = dev_to_mmc_card(dev); \ return sprintf(buf, fmt, args); \ diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/pci/hotplug/cpqphp_sysfs.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/pci/hotplug/cpqphp_sysfs.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/pci/hotplug/cpqphp_sysfs.c 2005-05-11 00:28:09.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/pci/hotplug/cpqphp_sysfs.c 2005-05-11 00:32:47.000000000 -0400 @@ -38,7 +38,7 @@ /* A few routines that create sysfs entries for the hot plug controller */ -static ssize_t show_ctrl (struct device *dev, char *buf) +static ssize_t show_ctrl (struct device *dev, char *buf, void *private) { struct pci_dev *pci_dev; struct controller *ctrl; @@ -82,7 +82,7 @@ static ssize_t show_ctrl (struct device } static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL); -static ssize_t show_dev (struct device *dev, char *buf) +static ssize_t show_dev (struct device *dev, char *buf, void *private) { struct pci_dev *pci_dev; struct controller *ctrl; diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/pci/hotplug/shpchp_sysfs.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/pci/hotplug/shpchp_sysfs.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/pci/hotplug/shpchp_sysfs.c 2005-05-11 00:28:09.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/pci/hotplug/shpchp_sysfs.c 2005-05-11 00:32:47.000000000 -0400 @@ -38,7 +38,7 @@ /* A few routines that create sysfs entries for the hot plug controller */ -static ssize_t show_ctrl (struct device *dev, char *buf) +static ssize_t show_ctrl (struct device *dev, char *buf, void *private) { struct pci_dev *pci_dev; struct controller *ctrl; @@ -82,7 +82,7 @@ static ssize_t show_ctrl (struct device } static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL); -static ssize_t show_dev (struct device *dev, char *buf) +static ssize_t show_dev (struct device *dev, char *buf, void *private) { struct pci_dev *pci_dev; struct controller *ctrl; diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/pci/pci-sysfs.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/pci/pci-sysfs.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/pci/pci-sysfs.c 2005-05-11 00:28:09.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/pci/pci-sysfs.c 2005-05-11 00:32:46.000000000 -0400 @@ -29,7 +29,7 @@ static int sysfs_initialized; /* = 0 */ /* show configuration fields */ #define pci_config_attr(field, format_string) \ static ssize_t \ -field##_show(struct device *dev, char *buf) \ +field##_show(struct device *dev, char *buf, void *private) \ { \ struct pci_dev *pdev; \ \ @@ -44,7 +44,7 @@ pci_config_attr(subsystem_device, "0x%04 pci_config_attr(class, "0x%06x\n"); pci_config_attr(irq, "%u\n"); -static ssize_t local_cpus_show(struct device *dev, char *buf) +static ssize_t local_cpus_show(struct device *dev, char *buf, void *private) { cpumask_t mask = pcibus_to_cpumask(to_pci_dev(dev)->bus); int len = cpumask_scnprintf(buf, PAGE_SIZE-2, mask); @@ -54,7 +54,7 @@ static ssize_t local_cpus_show(struct de /* show resources */ static ssize_t -resource_show(struct device * dev, char * buf) +resource_show(struct device * dev, char * buf, void *private) { struct pci_dev * pci_dev = to_pci_dev(dev); char * str = buf; diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/pcmcia/ds.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/pcmcia/ds.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/pcmcia/ds.c 2005-05-11 00:28:12.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/pcmcia/ds.c 2005-05-11 00:33:46.000000000 -0400 @@ -604,14 +604,14 @@ static int pcmcia_bus_match(struct devic /************************ per-device sysfs output ***************************/ #define pcmcia_device_attr(field, test, format) \ -static ssize_t field##_show (struct device *dev, char *buf) \ +static ssize_t field##_show (struct device *dev, char *buf, void *private) \ { \ struct pcmcia_device *p_dev = to_pcmcia_dev(dev); \ return p_dev->test ? sprintf (buf, format, p_dev->field) : -ENODEV; \ } #define pcmcia_device_stringattr(name, field) \ -static ssize_t name##_show (struct device *dev, char *buf) \ +static ssize_t name##_show (struct device *dev, char *buf, void *private) \ { \ struct pcmcia_device *p_dev = to_pcmcia_dev(dev); \ return p_dev->field ? sprintf (buf, "%s\n", p_dev->field) : -ENODEV; \ diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/pnp/card.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/pnp/card.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/pnp/card.c 2005-05-11 00:28:09.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/pnp/card.c 2005-05-11 00:32:48.000000000 -0400 @@ -140,7 +140,7 @@ static void pnp_release_card(struct devi } -static ssize_t pnp_show_card_name(struct device *dmdev, char *buf) +static ssize_t pnp_show_card_name(struct device *dmdev, char *buf, void *private) { char *str = buf; struct pnp_card *card = to_pnp_card(dmdev); @@ -150,7 +150,7 @@ static ssize_t pnp_show_card_name(struct static DEVICE_ATTR(name,S_IRUGO,pnp_show_card_name,NULL); -static ssize_t pnp_show_card_ids(struct device *dmdev, char *buf) +static ssize_t pnp_show_card_ids(struct device *dmdev, char *buf, void *private) { char *str = buf; struct pnp_card *card = to_pnp_card(dmdev); diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/pnp/interface.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/pnp/interface.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/pnp/interface.c 2005-05-11 00:28:09.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/pnp/interface.c 2005-05-11 00:32:48.000000000 -0400 @@ -205,7 +205,7 @@ static void pnp_print_option(pnp_info_bu } -static ssize_t pnp_show_options(struct device *dmdev, char *buf) +static ssize_t pnp_show_options(struct device *dmdev, char *buf, void *private) { struct pnp_dev *dev = to_pnp_dev(dmdev); struct pnp_option * independent = dev->independent; @@ -236,7 +236,7 @@ static ssize_t pnp_show_options(struct d static DEVICE_ATTR(options,S_IRUGO,pnp_show_options,NULL); -static ssize_t pnp_show_current_resources(struct device *dmdev, char *buf) +static ssize_t pnp_show_current_resources(struct device *dmdev, char *buf, void *private) { struct pnp_dev *dev = to_pnp_dev(dmdev); int i, ret; @@ -308,7 +308,7 @@ static ssize_t pnp_show_current_resource extern struct semaphore pnp_res_mutex; static ssize_t -pnp_set_current_resources(struct device * dmdev, const char * ubuf, size_t count) +pnp_set_current_resources(struct device * dmdev, const char * ubuf, size_t count, void *private) { struct pnp_dev *dev = to_pnp_dev(dmdev); char *buf = (void *)ubuf; @@ -444,7 +444,7 @@ pnp_set_current_resources(struct device static DEVICE_ATTR(resources,S_IRUGO | S_IWUSR, pnp_show_current_resources,pnp_set_current_resources); -static ssize_t pnp_show_current_ids(struct device *dmdev, char *buf) +static ssize_t pnp_show_current_ids(struct device *dmdev, char *buf, void *private) { char *str = buf; struct pnp_dev *dev = to_pnp_dev(dmdev); diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/block/dasd_devmap.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/block/dasd_devmap.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/block/dasd_devmap.c 2005-05-11 00:28:10.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/block/dasd_devmap.c 2005-05-11 00:33:16.000000000 -0400 @@ -615,7 +615,7 @@ dasd_device_from_cdev(struct ccw_device * readonly controls the readonly status of a dasd */ static ssize_t -dasd_ro_show(struct device *dev, char *buf) +dasd_ro_show(struct device *dev, char *buf, void *private) { struct dasd_devmap *devmap; int ro_flag; @@ -629,7 +629,7 @@ dasd_ro_show(struct device *dev, char *b } static ssize_t -dasd_ro_store(struct device *dev, const char *buf, size_t count) +dasd_ro_store(struct device *dev, const char *buf, size_t count, void *private) { struct dasd_devmap *devmap; int ro_flag; @@ -656,7 +656,7 @@ static DEVICE_ATTR(readonly, 0644, dasd_ * to talk to the device */ static ssize_t -dasd_use_diag_show(struct device *dev, char *buf) +dasd_use_diag_show(struct device *dev, char *buf, void *private) { struct dasd_devmap *devmap; int use_diag; @@ -670,7 +670,7 @@ dasd_use_diag_show(struct device *dev, c } static ssize_t -dasd_use_diag_store(struct device *dev, const char *buf, size_t count) +dasd_use_diag_store(struct device *dev, const char *buf, size_t count, void *private) { struct dasd_devmap *devmap; ssize_t rc; @@ -698,7 +698,7 @@ static DEVICE_ATTR(use_diag, 0644, dasd_use_diag_show, dasd_use_diag_store); static ssize_t -dasd_discipline_show(struct device *dev, char *buf) +dasd_discipline_show(struct device *dev, char *buf, void *private) { struct dasd_devmap *devmap; char *dname; diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/block/dcssblk.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/block/dcssblk.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/block/dcssblk.c 2005-05-11 00:28:10.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/block/dcssblk.c 2005-05-11 00:33:16.000000000 -0400 @@ -46,15 +46,15 @@ static struct block_device_operations dc }; static ssize_t dcssblk_add_store(struct device * dev, const char * buf, - size_t count); + size_t count, void *private); static ssize_t dcssblk_remove_store(struct device * dev, const char * buf, - size_t count); + size_t count, void *private); static ssize_t dcssblk_save_store(struct device * dev, const char * buf, - size_t count); -static ssize_t dcssblk_save_show(struct device *dev, char *buf); + size_t count, void *private); +static ssize_t dcssblk_save_show(struct device *dev, char *buf, void *private); static ssize_t dcssblk_shared_store(struct device * dev, const char * buf, - size_t count); -static ssize_t dcssblk_shared_show(struct device *dev, char *buf); + size_t count, void *private); +static ssize_t dcssblk_shared_show(struct device *dev, char *buf, void *private); static DEVICE_ATTR(add, S_IWUSR, NULL, dcssblk_add_store); static DEVICE_ATTR(remove, S_IWUSR, NULL, dcssblk_remove_store); @@ -195,7 +195,7 @@ dcssblk_segment_warn(int rc, char* seg_n * operation (show + store) */ static ssize_t -dcssblk_shared_show(struct device *dev, char *buf) +dcssblk_shared_show(struct device *dev, char *buf, void *private) { struct dcssblk_dev_info *dev_info; @@ -204,7 +204,7 @@ dcssblk_shared_show(struct device *dev, } static ssize_t -dcssblk_shared_store(struct device *dev, const char *inbuf, size_t count) +dcssblk_shared_store(struct device *dev, const char *inbuf, size_t count, void *private) { struct dcssblk_dev_info *dev_info; int rc; @@ -288,7 +288,7 @@ out: * (show + store) */ static ssize_t -dcssblk_save_show(struct device *dev, char *buf) +dcssblk_save_show(struct device *dev, char *buf, void *private) { struct dcssblk_dev_info *dev_info; @@ -297,7 +297,7 @@ dcssblk_save_show(struct device *dev, ch } static ssize_t -dcssblk_save_store(struct device *dev, const char *inbuf, size_t count) +dcssblk_save_store(struct device *dev, const char *inbuf, size_t count, void *private) { struct dcssblk_dev_info *dev_info; @@ -343,7 +343,7 @@ dcssblk_save_store(struct device *dev, c * device attribute for adding devices */ static ssize_t -dcssblk_add_store(struct device *dev, const char *buf, size_t count) +dcssblk_add_store(struct device *dev, const char *buf, size_t count, void *private) { int rc, i; struct dcssblk_dev_info *dev_info; @@ -517,7 +517,7 @@ out_nobuf: * device attribute for removing devices */ static ssize_t -dcssblk_remove_store(struct device *dev, const char *buf, size_t count) +dcssblk_remove_store(struct device *dev, const char *buf, size_t count, void *private) { struct dcssblk_dev_info *dev_info; int rc, i; diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/char/raw3270.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/char/raw3270.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/char/raw3270.c 2005-05-11 00:28:10.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/char/raw3270.c 2005-05-11 00:33:15.000000000 -0400 @@ -1084,7 +1084,7 @@ raw3270_probe (struct ccw_device *cdev) * Additional attributes for a 3270 device */ static ssize_t -raw3270_model_show(struct device *dev, char *buf) +raw3270_model_show(struct device *dev, char *buf, void *private) { return snprintf(buf, PAGE_SIZE, "%i\n", ((struct raw3270 *) dev->driver_data)->model); @@ -1092,7 +1092,7 @@ raw3270_model_show(struct device *dev, c static DEVICE_ATTR(model, 0444, raw3270_model_show, 0); static ssize_t -raw3270_rows_show(struct device *dev, char *buf) +raw3270_rows_show(struct device *dev, char *buf, void *private) { return snprintf(buf, PAGE_SIZE, "%i\n", ((struct raw3270 *) dev->driver_data)->rows); @@ -1100,7 +1100,7 @@ raw3270_rows_show(struct device *dev, ch static DEVICE_ATTR(rows, 0444, raw3270_rows_show, 0); static ssize_t -raw3270_columns_show(struct device *dev, char *buf) +raw3270_columns_show(struct device *dev, char *buf, void *private) { return snprintf(buf, PAGE_SIZE, "%i\n", ((struct raw3270 *) dev->driver_data)->cols); diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/char/tape_core.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/char/tape_core.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/char/tape_core.c 2005-05-11 00:28:10.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/char/tape_core.c 2005-05-11 00:33:16.000000000 -0400 @@ -107,7 +107,7 @@ busid_to_int(char *bus_id) * replaced by a link to the cdev tree. */ static ssize_t -tape_medium_state_show(struct device *dev, char *buf) +tape_medium_state_show(struct device *dev, char *buf, void *private) { struct tape_device *tdev; @@ -119,7 +119,7 @@ static DEVICE_ATTR(medium_state, 0444, tape_medium_state_show, NULL); static ssize_t -tape_first_minor_show(struct device *dev, char *buf) +tape_first_minor_show(struct device *dev, char *buf, void *private) { struct tape_device *tdev; @@ -131,7 +131,7 @@ static DEVICE_ATTR(first_minor, 0444, tape_first_minor_show, NULL); static ssize_t -tape_state_show(struct device *dev, char *buf) +tape_state_show(struct device *dev, char *buf, void *private) { struct tape_device *tdev; @@ -144,7 +144,7 @@ static DEVICE_ATTR(state, 0444, tape_state_show, NULL); static ssize_t -tape_operation_show(struct device *dev, char *buf) +tape_operation_show(struct device *dev, char *buf, void *private) { struct tape_device *tdev; ssize_t rc; @@ -171,7 +171,7 @@ static DEVICE_ATTR(operation, 0444, tape_operation_show, NULL); static ssize_t -tape_blocksize_show(struct device *dev, char *buf) +tape_blocksize_show(struct device *dev, char *buf, void *private) { struct tape_device *tdev; diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/char/vmlogrdr.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/char/vmlogrdr.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/char/vmlogrdr.c 2005-05-11 00:28:10.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/char/vmlogrdr.c 2005-05-11 00:33:16.000000000 -0400 @@ -548,7 +548,7 @@ vmlogrdr_read (struct file *filp, char * } static ssize_t -vmlogrdr_autopurge_store(struct device * dev, const char * buf, size_t count) { +vmlogrdr_autopurge_store(struct device * dev, const char * buf, size_t count, void *private) { struct vmlogrdr_priv_t *priv = dev->driver_data; ssize_t ret = count; @@ -567,7 +567,7 @@ vmlogrdr_autopurge_store(struct device * static ssize_t -vmlogrdr_autopurge_show(struct device *dev, char *buf) { +vmlogrdr_autopurge_show(struct device *dev, char *buf, void *private) { struct vmlogrdr_priv_t *priv = dev->driver_data; return sprintf(buf, "%u\n", priv->autopurge); } @@ -578,7 +578,7 @@ static DEVICE_ATTR(autopurge, 0644, vmlo static ssize_t -vmlogrdr_purge_store(struct device * dev, const char * buf, size_t count) { +vmlogrdr_purge_store(struct device * dev, const char * buf, size_t count, void *private) { char cp_command[80]; char cp_response[80]; @@ -620,7 +620,7 @@ static DEVICE_ATTR(purge, 0200, NULL, vm static ssize_t vmlogrdr_autorecording_store(struct device *dev, const char *buf, - size_t count) { + size_t count, void *private) { struct vmlogrdr_priv_t *priv = dev->driver_data; ssize_t ret = count; @@ -639,7 +639,7 @@ vmlogrdr_autorecording_store(struct devi static ssize_t -vmlogrdr_autorecording_show(struct device *dev, char *buf) { +vmlogrdr_autorecording_show(struct device *dev, char *buf, void *private) { struct vmlogrdr_priv_t *priv = dev->driver_data; return sprintf(buf, "%u\n", priv->autorecording); } @@ -650,7 +650,7 @@ static DEVICE_ATTR(autorecording, 0644, static ssize_t -vmlogrdr_recording_store(struct device * dev, const char * buf, size_t count) { +vmlogrdr_recording_store(struct device * dev, const char * buf, size_t count, void *private) { struct vmlogrdr_priv_t *priv = dev->driver_data; ssize_t ret; diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/cio/ccwgroup.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/cio/ccwgroup.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/cio/ccwgroup.c 2005-05-11 00:28:10.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/cio/ccwgroup.c 2005-05-11 00:33:15.000000000 -0400 @@ -77,7 +77,7 @@ __ccwgroup_remove_symlinks(struct ccwgro * longer needed or accidentially created. Saves memory :) */ static ssize_t -ccwgroup_ungroup_store(struct device *dev, const char *buf, size_t count) +ccwgroup_ungroup_store(struct device *dev, const char *buf, size_t count, void *private) { struct ccwgroup_device *gdev; @@ -310,7 +310,7 @@ ccwgroup_set_offline(struct ccwgroup_dev } static ssize_t -ccwgroup_online_store (struct device *dev, const char *buf, size_t count) +ccwgroup_online_store (struct device *dev, const char *buf, size_t count, void *private) { struct ccwgroup_device *gdev; struct ccwgroup_driver *gdrv; @@ -338,7 +338,7 @@ ccwgroup_online_store (struct device *de } static ssize_t -ccwgroup_online_show (struct device *dev, char *buf) +ccwgroup_online_show (struct device *dev, char *buf, void *private) { int online; diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/cio/chsc.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/cio/chsc.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/cio/chsc.c 2005-05-11 00:28:10.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/cio/chsc.c 2005-05-11 00:33:15.000000000 -0400 @@ -852,7 +852,7 @@ out: * Files for the channel path entries. */ static ssize_t -chp_status_show(struct device *dev, char *buf) +chp_status_show(struct device *dev, char *buf, void *private) { struct channel_path *chp = container_of(dev, struct channel_path, dev); @@ -863,7 +863,7 @@ chp_status_show(struct device *dev, char } static ssize_t -chp_status_write(struct device *dev, const char *buf, size_t count) +chp_status_write(struct device *dev, const char *buf, size_t count, void *private) { struct channel_path *cp = container_of(dev, struct channel_path, dev); char cmd[10]; @@ -888,7 +888,7 @@ chp_status_write(struct device *dev, con static DEVICE_ATTR(status, 0644, chp_status_show, chp_status_write); static ssize_t -chp_type_show(struct device *dev, char *buf) +chp_type_show(struct device *dev, char *buf, void *private) { struct channel_path *chp = container_of(dev, struct channel_path, dev); diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/cio/cmf.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/cio/cmf.c --- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/cio/cmf.c 2005-05-11 00:28:10.000000000 -0400 +++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/cio/cmf.c 2005-05-11 00:33:15.000000000 -0400 @@ -796,7 +796,7 @@ cmb_show_attr(struct device *dev, char * } static ssize_t -cmb_show_avg_sample_interval(struct device *dev, char *buf) +cmb_show_avg_sample_interval(struct device *dev, char *buf, void *private) { struct ccw_device *cdev; long interval; @@ -813,7 +813,7 @@ cmb_show_avg_sample_interval(struct devi } static ssize_t -cmb_show_avg_utilization(struct device *dev, char *buf) +cmb_show_avg_utilization(struct device *dev, char *buf, void *private) { struct cmbdata data; u64 utilization; @@ -842,12 +842,12 @@ cmb_show_avg_utilization(struct device * } #define cmf_attr(name) \ -static ssize_t show_ ## name (struct device * dev, char * buf) \ +static ssize_t show_ ## name (struct device * dev, char * buf, void *private) \ { return cmb_show_attr((dev), buf, cmb_ ## name); } \ static DEVICE_ATTR(name, 0444, show_ ## name, NULL); #define cmf_attr_avg(name) \ -static ssize_t show_avg_ ## name (struct device * dev, char * buf) \ +static ssize_t show_avg_ ## name (struct device * dev, char * buf, void *private) \ { return cmb_show_attr((dev), buf, cmb_ ## name); } \ static DEVICE_ATTR(avg_ ## name, 0444, show_avg_ ## name, NULL); @@ -902,12 +902,12 @@ static struct attribute_group cmf_attr_g .attrs = cmf_attributes_ext, }; -static ssize_t cmb_enable_show(struct device *dev, char *buf) +static ssize_t cmb_enable_show(struct device *dev, char *buf, void *private) { return sprintf(buf, "%d\n", to_ccwdev(dev)->private->cmb ? 1 : 0); } -static ssize_t cmb_enable_store(struct device *dev, const char *buf, size_t c) +static ssize_t cmb_enable_store(struct device *dev, const char *buf, size_t c, void *private) { struct ccw_device *cdev; int ret; | |