Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 43953
b: refs/heads/master
c: a14e189
h: refs/heads/master
i:
  43951: 80c2001
v: v3
  • Loading branch information
David Brownell authored and Linus Torvalds committed Dec 10, 2006
1 parent 9805888 commit c45b6ea
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 884b4aaaa242a2db8c8252796f0118164a680ab5
refs/heads/master: a14e18935076ce084c4edbc57883f38e642c8e5d
2 changes: 1 addition & 1 deletion trunk/drivers/rtc/rtc-ds1672.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind)
struct i2c_client *client;
struct rtc_device *rtc;

dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__);

if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
err = -ENODEV;
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/rtc/rtc-pcf8563.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ static int pcf8563_validate_client(struct i2c_client *client)
xfer = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));

if (xfer != ARRAY_SIZE(msgs)) {
dev_err(&client->adapter->dev,
dev_err(&client->dev,
"%s: could not read register 0x%02X\n",
__FUNCTION__, pattern[i].reg);

Expand All @@ -203,7 +203,7 @@ static int pcf8563_validate_client(struct i2c_client *client)

if (value > pattern[i].max ||
value < pattern[i].min) {
dev_dbg(&client->adapter->dev,
dev_dbg(&client->dev,
"%s: pattern=%d, reg=%x, mask=0x%02x, min=%d, "
"max=%d, value=%d, raw=0x%02X\n",
__FUNCTION__, i, pattern[i].reg, pattern[i].mask,
Expand Down Expand Up @@ -253,7 +253,7 @@ static int pcf8563_probe(struct i2c_adapter *adapter, int address, int kind)

int err = 0;

dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__);

if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
err = -ENODEV;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/rtc/rtc-rs5c372.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ static int rs5c372_probe(struct i2c_adapter *adapter, int address, int kind)
struct i2c_client *client;
struct rs5c372 *rs5c372;

dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__);

if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
err = -ENODEV;
Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/rtc/rtc-x1205.c
Original file line number Diff line number Diff line change
Expand Up @@ -372,15 +372,15 @@ static int x1205_validate_client(struct i2c_client *client)
};

if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) {
dev_err(&client->adapter->dev,
dev_err(&client->dev,
"%s: could not read register %x\n",
__FUNCTION__, probe_zero_pattern[i]);

return -EIO;
}

if ((buf & probe_zero_pattern[i+1]) != 0) {
dev_err(&client->adapter->dev,
dev_err(&client->dev,
"%s: register=%02x, zero pattern=%d, value=%x\n",
__FUNCTION__, probe_zero_pattern[i], i, buf);

Expand All @@ -400,7 +400,7 @@ static int x1205_validate_client(struct i2c_client *client)
};

if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) {
dev_err(&client->adapter->dev,
dev_err(&client->dev,
"%s: could not read register %x\n",
__FUNCTION__, probe_limits_pattern[i].reg);

Expand All @@ -411,7 +411,7 @@ static int x1205_validate_client(struct i2c_client *client)

if (value > probe_limits_pattern[i].max ||
value < probe_limits_pattern[i].min) {
dev_dbg(&client->adapter->dev,
dev_dbg(&client->dev,
"%s: register=%x, lim pattern=%d, value=%d\n",
__FUNCTION__, probe_limits_pattern[i].reg,
i, value);
Expand Down Expand Up @@ -506,7 +506,7 @@ static int x1205_probe(struct i2c_adapter *adapter, int address, int kind)
struct i2c_client *client;
struct rtc_device *rtc;

dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__);

if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
err = -ENODEV;
Expand Down

0 comments on commit c45b6ea

Please sign in to comment.