diff options
author | Evgeniy Polyakov <johnpol@2ka.mipt.ru> | 2005-12-06 05:38:27 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-23 20:28:11 -0500 |
commit | ccd6994000fb6d08ee1be8a7fa20c8d602a2267d (patch) | |
tree | 88badd14da5f2c0593a88a351db6a664c3b6fbb8 /drivers/w1/matrox_w1.c | |
parent | a1a051b1870f9e4607526c7e403abab06526c6d9 (diff) |
[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/matrox_w1.c')
-rw-r--r-- | drivers/w1/matrox_w1.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/w1/matrox_w1.c b/drivers/w1/matrox_w1.c index 0b03f8f93f63..750a1aacf6f5 100644 --- a/drivers/w1/matrox_w1.c +++ b/drivers/w1/matrox_w1.c | |||
@@ -90,8 +90,8 @@ struct matrox_device | |||
90 | struct w1_bus_master *bus_master; | 90 | struct w1_bus_master *bus_master; |
91 | }; | 91 | }; |
92 | 92 | ||
93 | static u8 matrox_w1_read_ddc_bit(unsigned long); | 93 | static u8 matrox_w1_read_ddc_bit(void *); |
94 | static void matrox_w1_write_ddc_bit(unsigned long, u8); | 94 | static void matrox_w1_write_ddc_bit(void *, u8); |
95 | 95 | ||
96 | /* | 96 | /* |
97 | * These functions read and write DDC Data bit. | 97 | * These functions read and write DDC Data bit. |
@@ -122,10 +122,10 @@ static __inline__ void matrox_w1_write_reg(struct matrox_device *dev, u8 reg, u8 | |||
122 | wmb(); | 122 | wmb(); |
123 | } | 123 | } |
124 | 124 | ||
125 | static void matrox_w1_write_ddc_bit(unsigned long data, u8 bit) | 125 | static void matrox_w1_write_ddc_bit(void *data, u8 bit) |
126 | { | 126 | { |
127 | u8 ret; | 127 | u8 ret; |
128 | struct matrox_device *dev = (struct matrox_device *) data; | 128 | struct matrox_device *dev = data; |
129 | 129 | ||
130 | if (bit) | 130 | if (bit) |
131 | bit = 0; | 131 | bit = 0; |
@@ -137,10 +137,10 @@ static void matrox_w1_write_ddc_bit(unsigned long data, u8 bit) | |||
137 | matrox_w1_write_reg(dev, MATROX_GET_DATA, 0x00); | 137 | matrox_w1_write_reg(dev, MATROX_GET_DATA, 0x00); |
138 | } | 138 | } |
139 | 139 | ||
140 | static u8 matrox_w1_read_ddc_bit(unsigned long data) | 140 | static u8 matrox_w1_read_ddc_bit(void *data) |
141 | { | 141 | { |
142 | u8 ret; | 142 | u8 ret; |
143 | struct matrox_device *dev = (struct matrox_device *) data; | 143 | struct matrox_device *dev = data; |
144 | 144 | ||
145 | ret = matrox_w1_read_reg(dev, MATROX_GET_DATA); | 145 | ret = matrox_w1_read_reg(dev, MATROX_GET_DATA); |
146 | 146 | ||
@@ -198,7 +198,7 @@ static int __devinit matrox_w1_probe(struct pci_dev *pdev, const struct pci_devi | |||
198 | 198 | ||
199 | matrox_w1_hw_init(dev); | 199 | matrox_w1_hw_init(dev); |
200 | 200 | ||
201 | dev->bus_master->data = (unsigned long) dev; | 201 | dev->bus_master->data = dev; |
202 | dev->bus_master->read_bit = &matrox_w1_read_ddc_bit; | 202 | dev->bus_master->read_bit = &matrox_w1_read_ddc_bit; |
203 | dev->bus_master->write_bit = &matrox_w1_write_ddc_bit; | 203 | dev->bus_master->write_bit = &matrox_w1_write_ddc_bit; |
204 | 204 | ||