diff options
| author | Patrick Mochel <mochel@osdl.org> | 2003-01-10 02:57:21 -0600 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2003-01-10 02:57:21 -0600 |
| commit | 601c09192dae1da98e8877e707d7ee58ac243d9b (patch) | |
| tree | 32dea12f7b9a57ebe9d17f50036a72a214845b46 /include/linux | |
| parent | efa0596f2d555b4a544939c96814cff14b93fd9c (diff) | |
| parent | b2aa16e83d30e24f5e7faea1aa532e3f6ebdec18 (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/linux')
| -rw-r--r-- | include/linux/device.h | 16 | ||||
| -rw-r--r-- | include/linux/kobject.h | 4 | ||||
| -rw-r--r-- | include/linux/sysfs.h | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index d5aa116942b8..7c4bc77b695d 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -97,8 +97,8 @@ 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, size_t count, loff_t off); - ssize_t (*store)(struct bus_type *, const char * buf, size_t count, loff_t off); + ssize_t (*show)(struct bus_type *, char * buf); + ssize_t (*store)(struct bus_type *, const char * buf); }; #define BUS_ATTR(_name,_mode,_show,_store) \ @@ -140,8 +140,8 @@ extern void put_driver(struct device_driver * drv); struct driver_attribute { struct attribute attr; - ssize_t (*show)(struct device_driver *, char * buf, size_t count, loff_t off); - ssize_t (*store)(struct device_driver *, const char * buf, size_t count, loff_t off); + ssize_t (*show)(struct device_driver *, char * buf); + ssize_t (*store)(struct device_driver *, const char * buf); }; #define DRIVER_ATTR(_name,_mode,_show,_store) \ @@ -181,8 +181,8 @@ extern void put_devclass(struct device_class *); struct devclass_attribute { struct attribute attr; - ssize_t (*show)(struct device_class *, char * buf, size_t count, loff_t off); - ssize_t (*store)(struct device_class *, const char * buf, size_t count, loff_t off); + ssize_t (*show)(struct device_class *, char * buf); + ssize_t (*store)(struct device_class *, const char * buf); }; #define DEVCLASS_ATTR(_name,_str,_mode,_show,_store) \ @@ -319,8 +319,8 @@ extern void device_release_driver(struct device * dev); struct device_attribute { struct attribute attr; - ssize_t (*show)(struct device * dev, char * buf, size_t count, loff_t off); - ssize_t (*store)(struct device * dev, const char * buf, size_t count, loff_t off); + ssize_t (*show)(struct device * dev, char * buf); + ssize_t (*store)(struct device * dev, const char * buf); }; #define DEVICE_ATTR(_name,_mode,_show,_store) \ diff --git a/include/linux/kobject.h b/include/linux/kobject.h index ff15fe1bc8fd..0cc01658044d 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -165,8 +165,8 @@ static inline void subsys_put(struct subsystem * s) struct subsys_attribute { struct attribute attr; - ssize_t (*show)(struct subsystem *, char *, size_t, loff_t); - ssize_t (*store)(struct subsystem *, const char *, size_t, loff_t); + ssize_t (*show)(struct subsystem *, char *); + ssize_t (*store)(struct subsystem *, const char *); }; extern int subsys_create_file(struct subsystem * , struct subsys_attribute *); diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index 29c3eb8d2c9e..b3cc047255b8 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h @@ -17,8 +17,8 @@ struct attribute { }; struct sysfs_ops { - ssize_t (*show)(struct kobject *, struct attribute *,char *, size_t, loff_t); - ssize_t (*store)(struct kobject *,struct attribute *,const char *, size_t, loff_t); + ssize_t (*show)(struct kobject *, struct attribute *,char *); + ssize_t (*store)(struct kobject *,struct attribute *,const char *); }; extern int |