diff options
| author | Patrick Mochel <mochel@osdl.org> | 2003-01-13 00:01:59 -0600 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2003-01-13 00:01:59 -0600 |
| commit | bb8d2379e00686e52252cc059e61a229c4019803 (patch) | |
| tree | 478ff6256b6462330dc85cea289b9c6a75210059 /include | |
| parent | 29b498838d9fda88b960caa7d93f09eaf6fd4cd8 (diff) | |
| parent | 71b9ad66b2618659a784ae1559f8b4cc992661bc (diff) | |
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/device.h | 8 | ||||
| -rw-r--r-- | include/linux/kobject.h | 2 | ||||
| -rw-r--r-- | include/linux/sysfs.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 7c4bc77b695d..c2b01b98c464 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -98,7 +98,7 @@ int bus_for_each_drv(struct bus_type * bus, struct device_driver * start, struct bus_attribute { struct attribute attr; ssize_t (*show)(struct bus_type *, char * buf); - ssize_t (*store)(struct bus_type *, const char * buf); + ssize_t (*store)(struct bus_type *, const char * buf, size_t count); }; #define BUS_ATTR(_name,_mode,_show,_store) \ @@ -141,7 +141,7 @@ extern void put_driver(struct device_driver * drv); struct driver_attribute { struct attribute attr; ssize_t (*show)(struct device_driver *, char * buf); - ssize_t (*store)(struct device_driver *, const char * buf); + ssize_t (*store)(struct device_driver *, const char * buf, size_t count); }; #define DRIVER_ATTR(_name,_mode,_show,_store) \ @@ -182,7 +182,7 @@ extern void put_devclass(struct device_class *); struct devclass_attribute { struct attribute attr; ssize_t (*show)(struct device_class *, char * buf); - ssize_t (*store)(struct device_class *, const char * buf); + ssize_t (*store)(struct device_class *, const char * buf, size_t count); }; #define DEVCLASS_ATTR(_name,_str,_mode,_show,_store) \ @@ -320,7 +320,7 @@ extern void device_release_driver(struct device * dev); struct device_attribute { struct attribute attr; ssize_t (*show)(struct device * dev, char * buf); - ssize_t (*store)(struct device * dev, const char * buf); + ssize_t (*store)(struct device * dev, const char * buf, size_t count); }; #define DEVICE_ATTR(_name,_mode,_show,_store) \ diff --git a/include/linux/kobject.h b/include/linux/kobject.h index 0cc01658044d..409d2af385cb 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -166,7 +166,7 @@ static inline void subsys_put(struct subsystem * s) struct subsys_attribute { struct attribute attr; ssize_t (*show)(struct subsystem *, char *); - ssize_t (*store)(struct subsystem *, const char *); + ssize_t (*store)(struct subsystem *, const char *, size_t); }; extern int subsys_create_file(struct subsystem * , struct subsys_attribute *); diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index b3cc047255b8..6a4cb2ffeaa9 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h @@ -18,7 +18,7 @@ struct attribute { struct sysfs_ops { ssize_t (*show)(struct kobject *, struct attribute *,char *); - ssize_t (*store)(struct kobject *,struct attribute *,const char *); + ssize_t (*store)(struct kobject *,struct attribute *,const char *, size_t); }; extern int |