diff options
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-ds1672.c | 2 | ||||
| -rw-r--r-- | drivers/rtc/rtc-omap.c | 4 | ||||
| -rw-r--r-- | drivers/rtc/rtc-pcf8563.c | 2 | ||||
| -rw-r--r-- | drivers/rtc/rtc-rs5c372.c | 2 | ||||
| -rw-r--r-- | drivers/rtc/rtc-s3c.c | 4 | ||||
| -rw-r--r-- | drivers/rtc/rtc-x1205.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c index 205fa28593b7..dfef1637bfb8 100644 --- a/drivers/rtc/rtc-ds1672.c +++ b/drivers/rtc/rtc-ds1672.c | |||
| @@ -199,7 +199,7 @@ static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind) | |||
| 199 | struct i2c_client *client; | 199 | struct i2c_client *client; |
| 200 | struct rtc_device *rtc; | 200 | struct rtc_device *rtc; |
| 201 | 201 | ||
| 202 | dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__); | 202 | dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); |
| 203 | 203 | ||
| 204 | if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { | 204 | if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { |
| 205 | err = -ENODEV; | 205 | err = -ENODEV; |
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index d59880d44fba..9de8d67f4f8d 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c | |||
| @@ -417,13 +417,13 @@ static int __devinit omap_rtc_probe(struct platform_device *pdev) | |||
| 417 | rtc_write(OMAP_RTC_STATUS_ALARM, OMAP_RTC_STATUS_REG); | 417 | rtc_write(OMAP_RTC_STATUS_ALARM, OMAP_RTC_STATUS_REG); |
| 418 | 418 | ||
| 419 | /* handle periodic and alarm irqs */ | 419 | /* handle periodic and alarm irqs */ |
| 420 | if (request_irq(omap_rtc_timer, rtc_irq, SA_INTERRUPT, | 420 | if (request_irq(omap_rtc_timer, rtc_irq, IRQF_DISABLED, |
| 421 | rtc->class_dev.class_id, &rtc->class_dev)) { | 421 | rtc->class_dev.class_id, &rtc->class_dev)) { |
| 422 | pr_debug("%s: RTC timer interrupt IRQ%d already claimed\n", | 422 | pr_debug("%s: RTC timer interrupt IRQ%d already claimed\n", |
| 423 | pdev->name, omap_rtc_timer); | 423 | pdev->name, omap_rtc_timer); |
| 424 | goto fail0; | 424 | goto fail0; |
| 425 | } | 425 | } |
| 426 | if (request_irq(omap_rtc_alarm, rtc_irq, SA_INTERRUPT, | 426 | if (request_irq(omap_rtc_alarm, rtc_irq, IRQF_DISABLED, |
| 427 | rtc->class_dev.class_id, &rtc->class_dev)) { | 427 | rtc->class_dev.class_id, &rtc->class_dev)) { |
| 428 | pr_debug("%s: RTC alarm interrupt IRQ%d already claimed\n", | 428 | pr_debug("%s: RTC alarm interrupt IRQ%d already claimed\n", |
| 429 | pdev->name, omap_rtc_alarm); | 429 | pdev->name, omap_rtc_alarm); |
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c index 038118bbfaea..0242d803ebe5 100644 --- a/drivers/rtc/rtc-pcf8563.c +++ b/drivers/rtc/rtc-pcf8563.c | |||
| @@ -279,7 +279,7 @@ static int pcf8563_probe(struct i2c_adapter *adapter, int address, int kind) | |||
| 279 | 279 | ||
| 280 | int err = 0; | 280 | int err = 0; |
| 281 | 281 | ||
| 282 | dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__); | 282 | dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); |
| 283 | 283 | ||
| 284 | if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { | 284 | if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { |
| 285 | err = -ENODEV; | 285 | err = -ENODEV; |
diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c index e7851e3739ab..09bbe575647b 100644 --- a/drivers/rtc/rtc-rs5c372.c +++ b/drivers/rtc/rtc-rs5c372.c | |||
| @@ -499,7 +499,7 @@ static int rs5c372_probe(struct i2c_adapter *adapter, int address, int kind) | |||
| 499 | struct rs5c372 *rs5c372; | 499 | struct rs5c372 *rs5c372; |
| 500 | struct rtc_time tm; | 500 | struct rtc_time tm; |
| 501 | 501 | ||
| 502 | dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__); | 502 | dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); |
| 503 | 503 | ||
| 504 | if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { | 504 | if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { |
| 505 | err = -ENODEV; | 505 | err = -ENODEV; |
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index f406a2b55aea..9a79a24a7487 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c | |||
| @@ -350,7 +350,7 @@ static int s3c_rtc_open(struct device *dev) | |||
| 350 | int ret; | 350 | int ret; |
| 351 | 351 | ||
| 352 | ret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq, | 352 | ret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq, |
| 353 | SA_INTERRUPT, "s3c2410-rtc alarm", rtc_dev); | 353 | IRQF_DISABLED, "s3c2410-rtc alarm", rtc_dev); |
| 354 | 354 | ||
| 355 | if (ret) { | 355 | if (ret) { |
| 356 | dev_err(dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret); | 356 | dev_err(dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret); |
| @@ -358,7 +358,7 @@ static int s3c_rtc_open(struct device *dev) | |||
| 358 | } | 358 | } |
| 359 | 359 | ||
| 360 | ret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq, | 360 | ret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq, |
| 361 | SA_INTERRUPT, "s3c2410-rtc tick", rtc_dev); | 361 | IRQF_DISABLED, "s3c2410-rtc tick", rtc_dev); |
| 362 | 362 | ||
| 363 | if (ret) { | 363 | if (ret) { |
| 364 | dev_err(dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret); | 364 | dev_err(dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret); |
diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c index 019ae255b0c8..513d1a611aab 100644 --- a/drivers/rtc/rtc-x1205.c +++ b/drivers/rtc/rtc-x1205.c | |||
| @@ -506,7 +506,7 @@ static int x1205_probe(struct i2c_adapter *adapter, int address, int kind) | |||
| 506 | struct i2c_client *client; | 506 | struct i2c_client *client; |
| 507 | struct rtc_device *rtc; | 507 | struct rtc_device *rtc; |
| 508 | 508 | ||
| 509 | dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__); | 509 | dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); |
| 510 | 510 | ||
| 511 | if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { | 511 | if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { |
| 512 | err = -ENODEV; | 512 | err = -ENODEV; |