From: Alessandro Zummo Move registration error message from drivers to core. Signed-off-by: Alessandro Zummo Cc: Lennert Buytenhek Signed-off-by: Andrew Morton --- drivers/rtc/class.c | 2 ++ drivers/rtc/rtc-ds1672.c | 2 -- drivers/rtc/rtc-ep93xx.c | 1 - drivers/rtc/rtc-m48t86.c | 4 +--- drivers/rtc/rtc-pcf8563.c | 2 -- drivers/rtc/rtc-rs5c372.c | 2 -- drivers/rtc/rtc-sa1100.c | 1 - drivers/rtc/rtc-test.c | 2 -- drivers/rtc/rtc-x1205.c | 2 -- 9 files changed, 3 insertions(+), 15 deletions(-) diff -puN drivers/rtc/class.c~rtc-subsystem-compact-error-messages drivers/rtc/class.c --- devel/drivers/rtc/class.c~rtc-subsystem-compact-error-messages 2006-04-01 15:20:51.000000000 -0800 +++ devel-akpm/drivers/rtc/class.c 2006-04-01 15:20:51.000000000 -0800 @@ -96,6 +96,8 @@ exit_idr: 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); diff -puN drivers/rtc/rtc-ds1672.c~rtc-subsystem-compact-error-messages drivers/rtc/rtc-ds1672.c --- devel/drivers/rtc/rtc-ds1672.c~rtc-subsystem-compact-error-messages 2006-04-01 15:20:51.000000000 -0800 +++ devel-akpm/drivers/rtc/rtc-ds1672.c 2006-04-01 15:20:51.000000000 -0800 @@ -229,8 +229,6 @@ static int ds1672_probe(struct i2c_adapt if (IS_ERR(rtc)) { err = PTR_ERR(rtc); - dev_err(&client->dev, - "unable to register the class device\n"); goto exit_detach; } diff -puN drivers/rtc/rtc-ep93xx.c~rtc-subsystem-compact-error-messages drivers/rtc/rtc-ep93xx.c --- devel/drivers/rtc/rtc-ep93xx.c~rtc-subsystem-compact-error-messages 2006-04-01 15:20:51.000000000 -0800 +++ devel-akpm/drivers/rtc/rtc-ep93xx.c 2006-04-01 15:20:51.000000000 -0800 @@ -109,7 +109,6 @@ static int __devinit ep93xx_rtc_probe(st &dev->dev, &ep93xx_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) { - dev_err(&dev->dev, "unable to register\n"); return PTR_ERR(rtc); } diff -puN drivers/rtc/rtc-m48t86.c~rtc-subsystem-compact-error-messages drivers/rtc/rtc-m48t86.c --- devel/drivers/rtc/rtc-m48t86.c~rtc-subsystem-compact-error-messages 2006-04-01 15:20:51.000000000 -0800 +++ devel-akpm/drivers/rtc/rtc-m48t86.c 2006-04-01 15:20:51.000000000 -0800 @@ -151,10 +151,8 @@ static int __devinit m48t86_rtc_probe(st 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); diff -puN drivers/rtc/rtc-pcf8563.c~rtc-subsystem-compact-error-messages drivers/rtc/rtc-pcf8563.c --- devel/drivers/rtc/rtc-pcf8563.c~rtc-subsystem-compact-error-messages 2006-04-01 15:20:51.000000000 -0800 +++ devel-akpm/drivers/rtc/rtc-pcf8563.c 2006-04-01 15:20:51.000000000 -0800 @@ -290,8 +290,6 @@ static int pcf8563_probe(struct i2c_adap if (IS_ERR(rtc)) { err = PTR_ERR(rtc); - dev_err(&client->dev, - "unable to register the class device\n"); goto exit_detach; } diff -puN drivers/rtc/rtc-rs5c372.c~rtc-subsystem-compact-error-messages drivers/rtc/rtc-rs5c372.c --- devel/drivers/rtc/rtc-rs5c372.c~rtc-subsystem-compact-error-messages 2006-04-01 15:20:51.000000000 -0800 +++ devel-akpm/drivers/rtc/rtc-rs5c372.c 2006-04-01 15:20:51.000000000 -0800 @@ -233,8 +233,6 @@ static int rs5c372_probe(struct i2c_adap if (IS_ERR(rtc)) { err = PTR_ERR(rtc); - dev_err(&client->dev, - "unable to register the class device\n"); goto exit_detach; } diff -puN drivers/rtc/rtc-sa1100.c~rtc-subsystem-compact-error-messages drivers/rtc/rtc-sa1100.c --- devel/drivers/rtc/rtc-sa1100.c~rtc-subsystem-compact-error-messages 2006-04-01 15:20:51.000000000 -0800 +++ devel-akpm/drivers/rtc/rtc-sa1100.c 2006-04-01 15:20:51.000000000 -0800 @@ -341,7 +341,6 @@ static int sa1100_rtc_probe(struct platf THIS_MODULE); if (IS_ERR(rtc)) { - dev_err(&pdev->dev, "Unable to register the RTC device\n"); return PTR_ERR(rtc); } diff -puN drivers/rtc/rtc-test.c~rtc-subsystem-compact-error-messages drivers/rtc/rtc-test.c --- devel/drivers/rtc/rtc-test.c~rtc-subsystem-compact-error-messages 2006-04-01 15:20:51.000000000 -0800 +++ devel-akpm/drivers/rtc/rtc-test.c 2006-04-01 15:20:51.000000000 -0800 @@ -119,8 +119,6 @@ static int test_probe(struct platform_de &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); diff -puN drivers/rtc/rtc-x1205.c~rtc-subsystem-compact-error-messages drivers/rtc/rtc-x1205.c --- devel/drivers/rtc/rtc-x1205.c~rtc-subsystem-compact-error-messages 2006-04-01 15:20:51.000000000 -0800 +++ devel-akpm/drivers/rtc/rtc-x1205.c 2006-04-01 15:20:51.000000000 -0800 @@ -544,8 +544,6 @@ static int x1205_probe(struct i2c_adapte if (IS_ERR(rtc)) { err = PTR_ERR(rtc); - dev_err(&client->dev, - "unable to register the class device\n"); goto exit_detach; } _