drivers/rtc/rtc-max77686.c: fix incorrect return value on error

[~andy/linux] / drivers / misc / bh1770glc.c

diff --git a/drivers/misc/bh1770glc.c b/drivers/misc/bh1770glc.c
index 2ed8fc3be7e66e5e6b4972560c223ba48542b337..f4975f7d0d5b0df5fad0c75a8d5d2bbc886fba9a 100644 (file)
--- a/drivers/misc/bh1770glc.c
+++ b/drivers/misc/bh1770glc.c
@@ -1310,7 +1310,7 @@ static int bh1770_remove(struct i2c_client *client)
        return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int bh1770_suspend(struct device *dev)
 {
        struct i2c_client *client = container_of(dev, struct i2c_client, dev);
@@ -1346,11 +1346,6 @@ static int bh1770_resume(struct device *dev)
        }
        return ret;
 }
-
-#else
-#define bh1770_suspend NULL
-#define bh1770_shutdown NULL
-#define bh1770_resume  NULL
 #endif
 
 #ifdef CONFIG_PM_RUNTIME