openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Yani Ioannou 2005-06-23 22:02:28 -07:00 committed by Linus Torvalds
parent f52bdbe9fc
commit 3e05d2b8d3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/message/i2o/bus-osm.c
View File

@ -59,7 +59,7 @@ static int i2o_bus_scan(struct i2o_device *dev)
* *
* Returns count. * 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) size_t count)
{ {
struct i2o_device *i2o_dev = to_i2o_device(d); struct i2o_device *i2o_dev = to_i2o_device(d);

4
drivers/message/i2o/exec-osm.c
View File

@ -261,7 +261,7 @@ static int i2o_msg_post_wait_complete(struct i2o_controller *c, u32 m,
* *
* Returns number of bytes printed into buffer. * 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); struct i2o_device *dev = to_i2o_device(d);
u16 id; 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. * 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); struct i2o_device *dev = to_i2o_device(d);
u16 id; u16 id;