diff options
author | David Brownell <david-b@pacbell.net> | 2006-12-10 05:19:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-10 12:55:40 -0500 |
commit | a14e18935076ce084c4edbc57883f38e642c8e5d (patch) | |
tree | c35e51c304aa3bb410d8dcba150254d156f1394f /drivers/rtc/rtc-pcf8563.c | |
parent | 884b4aaaa242a2db8c8252796f0118164a680ab5 (diff) |
[PATCH] RTCs don't use i2c_adapter.dev
Update more I2C drivers that live outside drivers/i2c to understand that using
adapter->dev is not The Way. When actually referring to the adapter hardware,
adapter->class_dev.dev is the answer. When referring to a device connected to
it, client->dev.dev is the answer.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/rtc/rtc-pcf8563.c')
-rw-r--r-- | drivers/rtc/rtc-pcf8563.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c index a760cf69af90..4b72b8ef5d66 100644 --- a/drivers/rtc/rtc-pcf8563.c +++ b/drivers/rtc/rtc-pcf8563.c | |||
@@ -192,7 +192,7 @@ static int pcf8563_validate_client(struct i2c_client *client) | |||
192 | xfer = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs)); | 192 | xfer = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs)); |
193 | 193 | ||
194 | if (xfer != ARRAY_SIZE(msgs)) { | 194 | if (xfer != ARRAY_SIZE(msgs)) { |
195 | dev_err(&client->adapter->dev, | 195 | dev_err(&client->dev, |
196 | "%s: could not read register 0x%02X\n", | 196 | "%s: could not read register 0x%02X\n", |
197 | __FUNCTION__, pattern[i].reg); | 197 | __FUNCTION__, pattern[i].reg); |
198 | 198 | ||
@@ -203,7 +203,7 @@ static int pcf8563_validate_client(struct i2c_client *client) | |||
203 | 203 | ||
204 | if (value > pattern[i].max || | 204 | if (value > pattern[i].max || |
205 | value < pattern[i].min) { | 205 | value < pattern[i].min) { |
206 | dev_dbg(&client->adapter->dev, | 206 | dev_dbg(&client->dev, |
207 | "%s: pattern=%d, reg=%x, mask=0x%02x, min=%d, " | 207 | "%s: pattern=%d, reg=%x, mask=0x%02x, min=%d, " |
208 | "max=%d, value=%d, raw=0x%02X\n", | 208 | "max=%d, value=%d, raw=0x%02X\n", |
209 | __FUNCTION__, i, pattern[i].reg, pattern[i].mask, | 209 | __FUNCTION__, i, pattern[i].reg, pattern[i].mask, |
@@ -253,7 +253,7 @@ static int pcf8563_probe(struct i2c_adapter *adapter, int address, int kind) | |||
253 | 253 | ||
254 | int err = 0; | 254 | int err = 0; |
255 | 255 | ||
256 | dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); | 256 | dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__); |
257 | 257 | ||
258 | if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { | 258 | if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { |
259 | err = -ENODEV; | 259 | err = -ENODEV; |