@@ -485,23 +485,21 @@ static int ab8500_rtc_probe(struct platform_device *pdev)
(struct rtc_class_ops *)platid->driver_data,
THIS_MODULE);
if (IS_ERR(rtc)) {
- dev_err(&pdev->dev, "Registration failed\n");
- err = PTR_ERR(rtc);
- return err;
+ return PTR_ERR(rtc);
}
err = devm_request_threaded_irq(&pdev->dev, irq, NULL,
rtc_alarm_handler, IRQF_NO_SUSPEND | IRQF_ONESHOT,
"ab8500-rtc", rtc);
- if (err < 0)
- return err;
+ if (err) {
+ dev_err(&pdev->dev, "unable to request IRQ, alarm not available\n");
+ }
platform_set_drvdata(pdev, rtc);
err = ab8500_sysfs_rtc_register(&pdev->dev);
if (err) {
dev_err(&pdev->dev, "sysfs RTC failed to register\n");
- return err;
}
return 0;
@@ -283,11 +283,11 @@ static int da9055_rtc_probe(struct platform_device *pdev)
ret = da9055_rtc_device_init(rtc->da9055, pdata);
if (ret < 0)
- goto err_rtc;
+ return ret;
ret = da9055_reg_read(rtc->da9055, DA9055_REG_ALARM_Y);
if (ret < 0)
- goto err_rtc;
+ return ret;
if (ret & DA9055_RTC_ALM_EN)
rtc->alarm_enable = 1;
@@ -297,8 +297,7 @@ static int da9055_rtc_probe(struct platform_device *pdev)
rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
&da9055_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc->rtc)) {
- ret = PTR_ERR(rtc->rtc);
- goto err_rtc;
+ return PTR_ERR(rtc->rtc);
}
alm_irq = platform_get_irq_byname(pdev, "ALM");
@@ -310,9 +309,7 @@ static int da9055_rtc_probe(struct platform_device *pdev)
if (ret != 0)
dev_err(rtc->da9055->dev, "irq registration failed: %d\n", ret);
-err_rtc:
- return ret;
-
+ return 0;
}
#ifdef CONFIG_PM
@@ -756,19 +756,17 @@ static int ds1305_probe(struct spi_device *spi)
status = devm_request_irq(&spi->dev, spi->irq, ds1305_irq,
0, dev_name(&ds1305->rtc->dev), ds1305);
if (status < 0) {
- dev_dbg(&spi->dev, "request_irq %d --> %d\n",
+ dev_err(&spi->dev, "request_irq %d --> %d\n",
spi->irq, status);
- return status;
+ } else {
+ device_set_wakeup_capable(&spi->dev, 1);
}
-
- device_set_wakeup_capable(&spi->dev, 1);
}
/* export NVRAM */
status = sysfs_create_bin_file(&spi->dev.kobj, &nvram);
if (status < 0) {
- dev_dbg(&spi->dev, "register nvram --> %d\n", status);
- return status;
+ dev_err(&spi->dev, "register nvram --> %d\n", status);
}
return 0;
@@ -930,52 +930,54 @@ read_rtc:
ds1307->rtc = devm_rtc_device_register(&client->dev, client->name,
&ds13xx_rtc_ops, THIS_MODULE);
if (IS_ERR(ds1307->rtc)) {
- err = PTR_ERR(ds1307->rtc);
- dev_err(&client->dev,
- "unable to register the class device\n");
- goto exit;
+ return PTR_ERR(ds1307->rtc);
}
if (want_irq) {
err = request_irq(client->irq, ds1307_irq, IRQF_SHARED,
ds1307->rtc->name, client);
if (err) {
- dev_err(&client->dev,
- "unable to request IRQ!\n");
- goto exit;
- }
+ client->irq = 0;
+ dev_err(&client->dev, "unable to request IRQ!\n");
+ } else {
- device_set_wakeup_capable(&client->dev, 1);
- set_bit(HAS_ALARM, &ds1307->flags);
- dev_dbg(&client->dev, "got IRQ %d\n", client->irq);
+ device_set_wakeup_capable(&client->dev, 1);
+ set_bit(HAS_ALARM, &ds1307->flags);
+ dev_dbg(&client->dev, "got IRQ %d\n", client->irq);
+ }
}
if (chip->nvram_size) {
+
ds1307->nvram = devm_kzalloc(&client->dev,
sizeof(struct bin_attribute),
GFP_KERNEL);
if (!ds1307->nvram) {
- err = -ENOMEM;
- goto err_irq;
+ dev_err(&client->dev, "cannot allocate memory for nvram sysfs\n");
+ } else {
+
+ ds1307->nvram->attr.name = "nvram";
+ ds1307->nvram->attr.mode = S_IRUGO | S_IWUSR;
+
+ sysfs_bin_attr_init(ds1307->nvram);
+
+ ds1307->nvram->read = ds1307_nvram_read;
+ ds1307->nvram->write = ds1307_nvram_write;
+ ds1307->nvram->size = chip->nvram_size;
+ ds1307->nvram_offset = chip->nvram_offset;
+
+ err = sysfs_create_bin_file(&client->dev.kobj, ds1307->nvram);
+ if (err) {
+ dev_err(&client->dev, "unable to create sysfs file: %s\n", ds1307->nvram->attr.name);
+ } else {
+ set_bit(HAS_NVRAM, &ds1307->flags);
+ dev_info(&client->dev, "%zu bytes nvram\n", ds1307->nvram->size);
+ }
}
- ds1307->nvram->attr.name = "nvram";
- ds1307->nvram->attr.mode = S_IRUGO | S_IWUSR;
- sysfs_bin_attr_init(ds1307->nvram);
- ds1307->nvram->read = ds1307_nvram_read;
- ds1307->nvram->write = ds1307_nvram_write;
- ds1307->nvram->size = chip->nvram_size;
- ds1307->nvram_offset = chip->nvram_offset;
- err = sysfs_create_bin_file(&client->dev.kobj, ds1307->nvram);
- if (err)
- goto err_irq;
- set_bit(HAS_NVRAM, &ds1307->flags);
- dev_info(&client->dev, "%zu bytes nvram\n", ds1307->nvram->size);
}
return 0;
-err_irq:
- free_irq(client->irq, client);
exit:
return err;
}
@@ -473,7 +473,6 @@ static struct bin_attribute ds1511_nvram_attr = {
static int ds1511_rtc_probe(struct platform_device *pdev)
{
- struct rtc_device *rtc;
struct resource *res;
struct rtc_plat_data *pdata;
int ret = 0;
@@ -526,15 +525,17 @@ static int ds1511_rtc_probe(struct platform_device *pdev)
}
}
- rtc = devm_rtc_device_register(&pdev->dev, pdev->name, &ds1511_rtc_ops,
+ pdata->rtc = devm_rtc_device_register(&pdev->dev, pdev->name, &ds1511_rtc_ops,
THIS_MODULE);
- if (IS_ERR(rtc))
- return PTR_ERR(rtc);
- pdata->rtc = rtc;
+ if (IS_ERR(pdata->rtc))
+ return PTR_ERR(pdata->rtc);
ret = sysfs_create_bin_file(&pdev->dev.kobj, &ds1511_nvram_attr);
+ if (ret) {
+ dev_err(&pdev->dev, "Unable to create sysfs entry: %s\n", ds1511_nvram_attr.attr.name);
+ }
- return ret;
+ return 0;
}
static int ds1511_rtc_remove(struct platform_device *pdev)
@@ -278,7 +278,6 @@ static struct bin_attribute ds1553_nvram_attr = {
static int ds1553_rtc_probe(struct platform_device *pdev)
{
- struct rtc_device *rtc;
struct resource *res;
unsigned int cen, sec;
struct rtc_plat_data *pdata;
@@ -321,15 +320,17 @@ static int ds1553_rtc_probe(struct platform_device *pdev)
}
}
- rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
+ pdata->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
&ds1553_rtc_ops, THIS_MODULE);
- if (IS_ERR(rtc))
- return PTR_ERR(rtc);
- pdata->rtc = rtc;
+ if (IS_ERR(pdata->rtc))
+ return PTR_ERR(pdata->rtc);
ret = sysfs_create_bin_file(&pdev->dev.kobj, &ds1553_nvram_attr);
+ if (ret) {
+ dev_err(&pdev->dev, "unable to create sysfs file: %s\n", ds1553_nvram_attr.attr.name);
+ }
- return ret;
+ return 0;
}
static int ds1553_rtc_remove(struct platform_device *pdev)
@@ -177,8 +177,9 @@ static int ds1672_probe(struct i2c_client *client,
/* read control register */
err = ds1672_get_control(client, &control);
- if (err)
- goto exit_devreg;
+ if (err) {
+ dev_warn(&client->dev, "Unable to read the control register\n");
+ }
if (control & DS1672_REG_CONTROL_EOSC)
dev_warn(&client->dev, "Oscillator not enabled. "
@@ -186,13 +187,11 @@ static int ds1672_probe(struct i2c_client *client,
/* Register sysfs hooks */
err = device_create_file(&client->dev, &dev_attr_control);
- if (err)
- goto exit_devreg;
+ if (err) {
+ dev_err(&client->dev, "Unable to create sysfs entry: %s\n", dev_attr_control.attr.name);
+ }
return 0;
-
- exit_devreg:
- return err;
}
static struct i2c_device_id ds1672_id[] = {
@@ -204,8 +204,11 @@ static int ds1742_rtc_probe(struct platform_device *pdev)
return PTR_ERR(rtc);
ret = sysfs_create_bin_file(&pdev->dev.kobj, &pdata->nvram_attr);
+ if (ret) {
+ dev_err(&pdev->dev, "Unable to create sysfs entry: %s\n", pdata->nvram_attr.attr.name);
+ }
- return ret;
+ return 0;
}
static int ds1742_rtc_remove(struct platform_device *pdev)
@@ -414,7 +414,6 @@ static int ds3232_probe(struct i2c_client *client,
ds3232->rtc = devm_rtc_device_register(&client->dev, client->name,
&ds3232_rtc_ops, THIS_MODULE);
if (IS_ERR(ds3232->rtc)) {
- dev_err(&client->dev, "unable to register the class device\n");
return PTR_ERR(ds3232->rtc);
}
@@ -423,7 +422,6 @@ static int ds3232_probe(struct i2c_client *client,
"ds3232", client);
if (ret) {
dev_err(&client->dev, "unable to request IRQ\n");
- return ret;
}
}
@@ -153,8 +153,9 @@ static int ep93xx_rtc_probe(struct platform_device *pdev)
}
err = sysfs_create_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files);
- if (err)
- goto exit;
+ if (err) {
+ dev_err(&pdev->dev, "Unable to create sysfs entries\n");
+ }
return 0;
@@ -642,6 +642,17 @@ isl1208_probe(struct i2c_client *client, const struct i2c_device_id *id)
dev_info(&client->dev,
"chip found, driver version " DRV_VERSION "\n");
+ rc = isl1208_i2c_get_sr(client);
+ if (rc < 0) {
+ dev_err(&client->dev, "reading status failed\n");
+ return rc;
+ }
+
+ if (rc & ISL1208_REG_SR_RTCF)
+ dev_warn(&client->dev, "rtc power failure detected, "
+ "please set clock.\n");
+
+
if (client->irq > 0) {
rc = devm_request_threaded_irq(&client->dev, client->irq, NULL,
isl1208_rtc_interrupt,
@@ -667,19 +678,10 @@ isl1208_probe(struct i2c_client *client, const struct i2c_device_id *id)
i2c_set_clientdata(client, rtc);
- rc = isl1208_i2c_get_sr(client);
- if (rc < 0) {
- dev_err(&client->dev, "reading status failed\n");
- return rc;
- }
-
- if (rc & ISL1208_REG_SR_RTCF)
- dev_warn(&client->dev, "rtc power failure detected, "
- "please set clock.\n");
-
rc = sysfs_create_group(&client->dev.kobj, &isl1208_rtc_sysfs_files);
- if (rc)
- return rc;
+ if (rc) {
+ dev_err(&client->dev, "Unable to create sysfs entries\n");
+ }
return 0;
}
@@ -247,6 +247,16 @@ static int jz4740_rtc_probe(struct platform_device *pdev)
return -EBUSY;
}
+ scratchpad = jz4740_rtc_reg_read(rtc, JZ_REG_RTC_SCRATCHPAD);
+ if (scratchpad != 0x12345678) {
+ ret = jz4740_rtc_reg_write(rtc, JZ_REG_RTC_SCRATCHPAD, 0x12345678);
+ ret = jz4740_rtc_reg_write(rtc, JZ_REG_RTC_SEC, 0);
+ if (ret) {
+ dev_err(&pdev->dev, "Could not write write to RTC registers\n");
+ return ret;
+ }
+ }
+
spin_lock_init(&rtc->lock);
platform_set_drvdata(pdev, rtc);
@@ -256,26 +266,13 @@ static int jz4740_rtc_probe(struct platform_device *pdev)
rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
&jz4740_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc->rtc)) {
- ret = PTR_ERR(rtc->rtc);
- dev_err(&pdev->dev, "Failed to register rtc device: %d\n", ret);
- return ret;
+ return PTR_ERR(rtc->rtc);
}
ret = devm_request_irq(&pdev->dev, rtc->irq, jz4740_rtc_irq, 0,
pdev->name, rtc);
if (ret) {
dev_err(&pdev->dev, "Failed to request rtc irq: %d\n", ret);
- return ret;
- }
-
- scratchpad = jz4740_rtc_reg_read(rtc, JZ_REG_RTC_SCRATCHPAD);
- if (scratchpad != 0x12345678) {
- ret = jz4740_rtc_reg_write(rtc, JZ_REG_RTC_SCRATCHPAD, 0x12345678);
- ret = jz4740_rtc_reg_write(rtc, JZ_REG_RTC_SEC, 0);
- if (ret) {
- dev_err(&pdev->dev, "Could not write write to RTC registers\n");
- return ret;
- }
}
return 0;
@@ -355,22 +355,22 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev)
&mc13xxx_rtc_ops, THIS_MODULE);
if (IS_ERR(priv->rtc)) {
ret = PTR_ERR(priv->rtc);
+ }
- mc13xxx_lock(mc13xxx);
+ mc13xxx_lock(mc13xxx);
- mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_TODA, priv);
+ mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_TODA, priv);
err_alarm_irq_request:
- mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_1HZ, priv);
+ mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_1HZ, priv);
err_update_irq_request:
err_reset_irq_status:
- mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_RTCRST, priv);
+ mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_RTCRST, priv);
err_reset_irq_request:
- mc13xxx_unlock(mc13xxx);
- }
+ mc13xxx_unlock(mc13xxx);
return ret;
}
@@ -376,7 +376,7 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
if (IS_ERR(ldata->rtc)) {
ret = PTR_ERR(ldata->rtc);
goto out_no_rtc;
- }
+ }
if (request_irq(adev->irq[0], pl031_interrupt,
vendor->irqflags, "rtc-pl031", ldata)) {
@@ -454,8 +454,6 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev)
rtc_dd->rtc = devm_rtc_device_register(&pdev->dev, "pm8xxx_rtc",
&pm8xxx_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc_dd->rtc)) {
- dev_err(&pdev->dev, "%s: RTC registration failed (%ld)\n",
- __func__, PTR_ERR(rtc_dd->rtc));
return PTR_ERR(rtc_dd->rtc);
}
@@ -465,13 +463,10 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev)
"pm8xxx_rtc_alarm", rtc_dd);
if (rc < 0) {
dev_err(&pdev->dev, "Request IRQ failed (%d)\n", rc);
- return rc;
}
device_init_wakeup(&pdev->dev, 1);
- dev_dbg(&pdev->dev, "Probe success !!\n");
-
return 0;
}
@@ -577,16 +577,14 @@ static int rs5c372_probe(struct i2c_client *client,
smbus_mode = 1;
else {
/* Still no good, give up */
- err = -ENODEV;
- goto exit;
+ return -ENODEV;
}
}
rs5c372 = devm_kzalloc(&client->dev, sizeof(struct rs5c372),
GFP_KERNEL);
if (!rs5c372) {
- err = -ENOMEM;
- goto exit;
+ return -ENOMEM;
}
rs5c372->client = client;
@@ -598,8 +596,8 @@ static int rs5c372_probe(struct i2c_client *client,
rs5c372->smbus = smbus_mode;
err = rs5c_get_regs(rs5c372);
- if (err < 0)
- goto exit;
+ if (err)
+ return err;
/* clock may be set for am/pm or 24 hr time */
switch (rs5c372->type) {
@@ -623,7 +621,7 @@ static int rs5c372_probe(struct i2c_client *client,
break;
default:
dev_err(&client->dev, "unknown RTC type\n");
- goto exit;
+ return -ENODEV;
}
/* if the oscillator lost power and no other software (like
@@ -635,7 +633,7 @@ static int rs5c372_probe(struct i2c_client *client,
err = rs5c_oscillator_setup(rs5c372);
if (unlikely(err < 0)) {
dev_err(&client->dev, "setup error\n");
- goto exit;
+ return err;
}
if (rs5c372_get_datetime(client, &tm) < 0)
@@ -660,18 +658,15 @@ static int rs5c372_probe(struct i2c_client *client,
&rs5c372_rtc_ops, THIS_MODULE);
if (IS_ERR(rs5c372->rtc)) {
- err = PTR_ERR(rs5c372->rtc);
- goto exit;
+ return PTR_ERR(rs5c372->rtc);
}
err = rs5c_sysfs_register(&client->dev);
- if (err)
- goto exit;
+ if (err) {
+ dev_err(&client->dev, "Unable to create sysfs entries\n");
+ }
return 0;
-
-exit:
- return err;
}
static int rs5c372_remove(struct i2c_client *client)
@@ -545,15 +545,13 @@ static int rx8025_probe(struct i2c_client *client,
| I2C_FUNC_SMBUS_I2C_BLOCK)) {
dev_err(&adapter->dev,
"doesn't support required functionality\n");
- err = -EIO;
- goto errout;
+ return -EIO;
}
rx8025 = devm_kzalloc(&client->dev, sizeof(*rx8025), GFP_KERNEL);
if (!rx8025) {
dev_err(&adapter->dev, "failed to alloc memory\n");
- err = -ENOMEM;
- goto errout;
+ return -ENOMEM;
}
rx8025->client = client;
@@ -562,7 +560,7 @@ static int rx8025_probe(struct i2c_client *client,
err = rx8025_init_client(client, &need_reset);
if (err)
- goto errout;
+ return err;
if (need_reset) {
struct rtc_time tm;
@@ -575,9 +573,7 @@ static int rx8025_probe(struct i2c_client *client,
rx8025->rtc = devm_rtc_device_register(&client->dev, client->name,
&rx8025_rtc_ops, THIS_MODULE);
if (IS_ERR(rx8025->rtc)) {
- err = PTR_ERR(rx8025->rtc);
- dev_err(&client->dev, "unable to register the class device\n");
- goto errout;
+ return PTR_ERR(rx8025->rtc);
}
if (client->irq > 0) {
@@ -585,8 +581,8 @@ static int rx8025_probe(struct i2c_client *client,
err = request_irq(client->irq, rx8025_irq,
0, "rx8025", client);
if (err) {
- dev_err(&client->dev, "unable to request IRQ\n");
- goto errout;
+ client->irq = 0;
+ dev_err(&client->dev, "Unable to request IRQ\n");
}
}
@@ -594,18 +590,11 @@ static int rx8025_probe(struct i2c_client *client,
rx8025->rtc->max_user_freq = 1;
err = rx8025_sysfs_register(&client->dev);
- if (err)
- goto errout_irq;
+ if (err) {
+ dev_err(&client->dev, "Unable to create sysfs entries\n");
+ }
return 0;
-
-errout_irq:
- if (client->irq > 0)
- free_irq(client->irq, client);
-
-errout:
- dev_err(&adapter->dev, "probing for rx8025 failed\n");
- return err;
}
static int rx8025_remove(struct i2c_client *client)
@@ -293,9 +293,7 @@ static int sirfsoc_rtc_probe(struct platform_device *pdev)
rtcdrv->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
&sirfsoc_rtc_ops, THIS_MODULE);
if (IS_ERR(rtcdrv->rtc)) {
- err = PTR_ERR(rtcdrv->rtc);
- dev_err(&pdev->dev, "can't register RTC device\n");
- return err;
+ return PTR_ERR(rtcdrv->rtc);
}
/* 0x3 -> RTC_CLK */
@@ -322,7 +320,6 @@ static int sirfsoc_rtc_probe(struct platform_device *pdev)
rtcdrv);
if (err) {
dev_err(&pdev->dev, "Unable to register for the SiRF SOC RTC IRQ\n");
- return err;
}
return 0;
@@ -104,20 +104,17 @@ static int test_probe(struct platform_device *plat_dev)
rtc = devm_rtc_device_register(&plat_dev->dev, "test",
&test_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc)) {
- err = PTR_ERR(rtc);
- return err;
+ return PTR_ERR(rtc);
}
err = device_create_file(&plat_dev->dev, &dev_attr_irq);
- if (err)
- goto err;
+ if (err) {
+ dev_err(&plat_dev->dev, "Unable to create sysfs entry: %s\n", dev_attr_irq.attr.name);
+ }
platform_set_drvdata(plat_dev, rtc);
return 0;
-
-err:
- return err;
}
static int test_remove(struct platform_device *plat_dev)
@@ -529,8 +529,6 @@ static int twl_rtc_probe(struct platform_device *pdev)
rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
&twl_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc)) {
- dev_err(&pdev->dev, "can't register RTC device, err %ld\n",
- PTR_ERR(rtc));
return PTR_ERR(rtc);
}
@@ -540,7 +538,6 @@ static int twl_rtc_probe(struct platform_device *pdev)
dev_name(&rtc->dev), rtc);
if (ret < 0) {
dev_err(&pdev->dev, "IRQ is not free.\n");
- return ret;
}
platform_set_drvdata(pdev, rtc);
@@ -659,8 +659,9 @@ static int x1205_probe(struct i2c_client *client,
}
err = x1205_sysfs_register(&client->dev);
- if (err)
- return err;
+ if (err) {
+ dev_err(&client->dev, "Unable to create sysfs entries\n");
+ }
return 0;
}