Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 25545
b: refs/heads/master
c: d1d65b7
h: refs/heads/master
i:
  25543: 0264a52
v: v3
  • Loading branch information
Alessandro Zummo authored and Linus Torvalds committed Apr 11, 2006
1 parent e68d157 commit 1d0e7bc
Show file tree
Hide file tree
Showing 10 changed files with 4 additions and 16 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: 8289607249ad25ecfc9a3742873fcd8f319d5b09
refs/heads/master: d1d65b7712016ca5ff2e44470eb13e772999de94
2 changes: 2 additions & 0 deletions trunk/drivers/rtc/class.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
idr_remove(&rtc_idr, id);

exit:
dev_err(dev, "rtc core: unable to register %s, err = %d\n",
name, err);
return ERR_PTR(err);
}
EXPORT_SYMBOL_GPL(rtc_device_register);
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/rtc/rtc-ds1672.c
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,6 @@ static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind)

if (IS_ERR(rtc)) {
err = PTR_ERR(rtc);
dev_err(&client->dev,
"unable to register the class device\n");
goto exit_detach;
}

Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/rtc/rtc-ep93xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ static int __devinit ep93xx_rtc_probe(struct platform_device *dev)
&dev->dev, &ep93xx_rtc_ops, THIS_MODULE);

if (IS_ERR(rtc)) {
dev_err(&dev->dev, "unable to register\n");
return PTR_ERR(rtc);
}

Expand Down
4 changes: 1 addition & 3 deletions trunk/drivers/rtc/rtc-m48t86.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,8 @@ static int __devinit m48t86_rtc_probe(struct platform_device *dev)
struct rtc_device *rtc = rtc_device_register("m48t86",
&dev->dev, &m48t86_rtc_ops, THIS_MODULE);

if (IS_ERR(rtc)) {
dev_err(&dev->dev, "unable to register\n");
if (IS_ERR(rtc))
return PTR_ERR(rtc);
}

platform_set_drvdata(dev, rtc);

Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/rtc/rtc-pcf8563.c
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,6 @@ static int pcf8563_probe(struct i2c_adapter *adapter, int address, int kind)

if (IS_ERR(rtc)) {
err = PTR_ERR(rtc);
dev_err(&client->dev,
"unable to register the class device\n");
goto exit_detach;
}

Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/rtc/rtc-rs5c372.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,6 @@ static int rs5c372_probe(struct i2c_adapter *adapter, int address, int kind)

if (IS_ERR(rtc)) {
err = PTR_ERR(rtc);
dev_err(&client->dev,
"unable to register the class device\n");
goto exit_detach;
}

Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/rtc/rtc-sa1100.c
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,6 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
THIS_MODULE);

if (IS_ERR(rtc)) {
dev_err(&pdev->dev, "Unable to register the RTC device\n");
return PTR_ERR(rtc);
}

Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/rtc/rtc-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,6 @@ static int test_probe(struct platform_device *plat_dev)
&test_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc)) {
err = PTR_ERR(rtc);
dev_err(&plat_dev->dev,
"unable to register the class device\n");
return err;
}
device_create_file(&plat_dev->dev, &dev_attr_irq);
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/rtc/rtc-x1205.c
Original file line number Diff line number Diff line change
Expand Up @@ -544,8 +544,6 @@ static int x1205_probe(struct i2c_adapter *adapter, int address, int kind)

if (IS_ERR(rtc)) {
err = PTR_ERR(rtc);
dev_err(&client->dev,
"unable to register the class device\n");
goto exit_detach;
}

Expand Down

0 comments on commit 1d0e7bc

Please sign in to comment.