These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / rtc / rtc-ds1374.c

diff --git a/kernel/drivers/rtc/rtc-ds1374.c b/kernel/drivers/rtc/rtc-ds1374.c
index 167783f..3b3049c 100644 (file)
--- a/kernel/drivers/rtc/rtc-ds1374.c
+++ b/kernel/drivers/rtc/rtc-ds1374.c
@@ -664,11 +664,8 @@ static int ds1374_remove(struct i2c_client *client)
 {
        struct ds1374 *ds1374 = i2c_get_clientdata(client);
 #ifdef CONFIG_RTC_DRV_DS1374_WDT
-       int res;
-
-       res = misc_deregister(&ds1374_miscdev);
-       if (!res)
-               ds1374_miscdev.parent = NULL;
+       misc_deregister(&ds1374_miscdev);
+       ds1374_miscdev.parent = NULL;
        unregister_reboot_notifier(&ds1374_wdt_notifier);
 #endif
 
@@ -689,7 +686,7 @@ static int ds1374_suspend(struct device *dev)
 {
        struct i2c_client *client = to_i2c_client(dev);
 
-       if (client->irq >= 0 && device_may_wakeup(&client->dev))
+       if (client->irq > 0 && device_may_wakeup(&client->dev))
                enable_irq_wake(client->irq);
        return 0;
 }
@@ -698,7 +695,7 @@ static int ds1374_resume(struct device *dev)
 {
        struct i2c_client *client = to_i2c_client(dev);
 
-       if (client->irq >= 0 && device_may_wakeup(&client->dev))
+       if (client->irq > 0 && device_may_wakeup(&client->dev))
                disable_irq_wake(client->irq);
        return 0;
 }
@@ -709,7 +706,6 @@ static SIMPLE_DEV_PM_OPS(ds1374_pm, ds1374_suspend, ds1374_resume);
 static struct i2c_driver ds1374_driver = {
        .driver = {
                .name = "rtc-ds1374",
-               .owner = THIS_MODULE,
                .pm = &ds1374_pm,
        },
        .probe = ds1374_probe,