diff options
| author | Evgeniy Polyakov <johnpol@2ka.mipt.ru> | 2005-12-06 13:38:27 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-23 17:28:11 -0800 |
| commit | ccd6994000fb6d08ee1be8a7fa20c8d602a2267d (patch) | |
| tree | 88badd14da5f2c0593a88a351db6a664c3b6fbb8 /drivers/w1/w1.c | |
| parent | a1a051b1870f9e4607526c7e403abab06526c6d9 (diff) | |
| download | linux-stable-ccd6994000fb6d08ee1be8a7fa20c8d602a2267d.tar.gz linux-stable-ccd6994000fb6d08ee1be8a7fa20c8d602a2267d.tar.bz2 linux-stable-ccd6994000fb6d08ee1be8a7fa20c8d602a2267d.zip | |
[PATCH] W1: Change the type 'unsigned long' member of 'struct w1_bus_master' to 'void *'.
Signed-off-by: Ben Gardner <bgardner@wabtec.com>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/w1/w1.c')
| -rw-r--r-- | drivers/w1/w1.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 024206c4a0e4..f0b47fe4ed25 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -552,7 +552,7 @@ static void w1_slave_detach(struct w1_slave *sl) kfree(sl); } -static struct w1_master *w1_search_master(unsigned long data) +static struct w1_master *w1_search_master(void *data) { struct w1_master *dev; int found = 0; @@ -583,7 +583,7 @@ void w1_reconnect_slaves(struct w1_family *f) spin_unlock_bh(&w1_mlock); } -static void w1_slave_found(unsigned long data, u64 rn) +static void w1_slave_found(void *data, u64 rn) { int slave_count; struct w1_slave *sl; @@ -595,8 +595,8 @@ static void w1_slave_found(unsigned long data, u64 rn) dev = w1_search_master(data); if (!dev) { - printk(KERN_ERR "Failed to find w1 master device for data %08lx, it is impossible.\n", - data); + printk(KERN_ERR "Failed to find w1 master device for data %p, " + "it is impossible.\n", data); return; } |