diff options
| author | Yani Ioannou <yani.ioannou@gmail.com> | 2005-06-23 22:02:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 00:05:29 -0700 |
| commit | 3e05d2b8d3dd34b0237f489e991ed081cb0bf007 (patch) | |
| tree | d0e18c3c7ed42891bb67eb85c0cbbc34517921f6 /drivers/message/i2o | |
| parent | f52bdbe9fcf2453d402376e22de1eca6dfc96890 (diff) | |
| download | op-kernel-dev-3e05d2b8d3dd34b0237f489e991ed081cb0bf007.zip op-kernel-dev-3e05d2b8d3dd34b0237f489e991ed081cb0bf007.tar.gz | |
[PATCH] tpm: device attribute fixes
This patch updates all the device attribute callbacks that weren't
updated with the new parameter, I guess because they weren't in Greg's
tree (including drivers/pcmcia/ds.c). Without the patch these
callbacks are probably broken (and generate a warning along the lines
of "assignment from incompatible pointer type").
Please see http://lkml.org/lkml/2005/5/19/40 for the scripts I used to
update the attributes automatically.
Signed-off-by: Yani Ioannou <yani.ioannou@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/message/i2o')
| -rw-r--r-- | drivers/message/i2o/bus-osm.c | 2 | ||||
| -rw-r--r-- | drivers/message/i2o/exec-osm.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/message/i2o/bus-osm.c b/drivers/message/i2o/bus-osm.c index d43c358..151b228 100644 --- a/drivers/message/i2o/bus-osm.c +++ b/drivers/message/i2o/bus-osm.c @@ -59,7 +59,7 @@ static int i2o_bus_scan(struct i2o_device *dev) * * Returns count. */ -static ssize_t i2o_bus_store_scan(struct device *d, const char *buf, +static ssize_t i2o_bus_store_scan(struct device *d, struct device_attribute *attr, const char *buf, size_t count) { struct i2o_device *i2o_dev = to_i2o_device(d); diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c index 1b73898..bda2c62 100644 --- a/drivers/message/i2o/exec-osm.c +++ b/drivers/message/i2o/exec-osm.c @@ -261,7 +261,7 @@ static int i2o_msg_post_wait_complete(struct i2o_controller *c, u32 m, * * Returns number of bytes printed into buffer. */ -static ssize_t i2o_exec_show_vendor_id(struct device *d, char *buf) +static ssize_t i2o_exec_show_vendor_id(struct device *d, struct device_attribute *attr, char *buf) { struct i2o_device *dev = to_i2o_device(d); u16 id; @@ -281,7 +281,7 @@ static ssize_t i2o_exec_show_vendor_id(struct device *d, char *buf) * * Returns number of bytes printed into buffer. */ -static ssize_t i2o_exec_show_product_id(struct device *d, char *buf) +static ssize_t i2o_exec_show_product_id(struct device *d, struct device_attribute *attr, char *buf) { struct i2o_device *dev = to_i2o_device(d); u16 id; |
