diff options
Diffstat (limited to 'drivers/rtc/rtc-ds1374.c')
-rw-r--r-- | drivers/rtc/rtc-ds1374.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c index 94366e12f40f..9e6e14fb53d7 100644 --- a/drivers/rtc/rtc-ds1374.c +++ b/drivers/rtc/rtc-ds1374.c | |||
@@ -65,7 +65,7 @@ struct ds1374 { | |||
65 | static struct i2c_driver ds1374_driver; | 65 | static struct i2c_driver ds1374_driver; |
66 | 66 | ||
67 | static int ds1374_read_rtc(struct i2c_client *client, u32 *time, | 67 | static int ds1374_read_rtc(struct i2c_client *client, u32 *time, |
68 | int reg, int nbytes) | 68 | int reg, int nbytes) |
69 | { | 69 | { |
70 | u8 buf[4]; | 70 | u8 buf[4]; |
71 | int ret; | 71 | int ret; |
@@ -90,7 +90,7 @@ static int ds1374_read_rtc(struct i2c_client *client, u32 *time, | |||
90 | } | 90 | } |
91 | 91 | ||
92 | static int ds1374_write_rtc(struct i2c_client *client, u32 time, | 92 | static int ds1374_write_rtc(struct i2c_client *client, u32 time, |
93 | int reg, int nbytes) | 93 | int reg, int nbytes) |
94 | { | 94 | { |
95 | u8 buf[4]; | 95 | u8 buf[4]; |
96 | int i; | 96 | int i; |
@@ -119,8 +119,7 @@ static int ds1374_check_rtc_status(struct i2c_client *client) | |||
119 | 119 | ||
120 | if (stat & DS1374_REG_SR_OSF) | 120 | if (stat & DS1374_REG_SR_OSF) |
121 | dev_warn(&client->dev, | 121 | dev_warn(&client->dev, |
122 | "oscillator discontinuity flagged, " | 122 | "oscillator discontinuity flagged, time unreliable\n"); |
123 | "time unreliable\n"); | ||
124 | 123 | ||
125 | stat &= ~(DS1374_REG_SR_OSF | DS1374_REG_SR_AF); | 124 | stat &= ~(DS1374_REG_SR_OSF | DS1374_REG_SR_AF); |
126 | 125 | ||
@@ -363,7 +362,7 @@ static int ds1374_probe(struct i2c_client *client, | |||
363 | 362 | ||
364 | if (client->irq > 0) { | 363 | if (client->irq > 0) { |
365 | ret = devm_request_irq(&client->dev, client->irq, ds1374_irq, 0, | 364 | ret = devm_request_irq(&client->dev, client->irq, ds1374_irq, 0, |
366 | "ds1374", client); | 365 | "ds1374", client); |
367 | if (ret) { | 366 | if (ret) { |
368 | dev_err(&client->dev, "unable to request IRQ\n"); | 367 | dev_err(&client->dev, "unable to request IRQ\n"); |
369 | return ret; | 368 | return ret; |
@@ -373,7 +372,7 @@ static int ds1374_probe(struct i2c_client *client, | |||
373 | } | 372 | } |
374 | 373 | ||
375 | ds1374->rtc = devm_rtc_device_register(&client->dev, client->name, | 374 | ds1374->rtc = devm_rtc_device_register(&client->dev, client->name, |
376 | &ds1374_rtc_ops, THIS_MODULE); | 375 | &ds1374_rtc_ops, THIS_MODULE); |
377 | if (IS_ERR(ds1374->rtc)) { | 376 | if (IS_ERR(ds1374->rtc)) { |
378 | dev_err(&client->dev, "unable to register the class device\n"); | 377 | dev_err(&client->dev, "unable to register the class device\n"); |
379 | return PTR_ERR(ds1374->rtc); | 378 | return PTR_ERR(ds1374->rtc); |