mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
[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:
parent
f52bdbe9fc
commit
3e05d2b8d3
2 changed files with 3 additions and 3 deletions
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue