Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad...

[~andy/linux] / drivers / video / backlight / adp8860_bl.c

diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c
index a77c9cad33208478c98fc48600e41bb095022d7f..75b10f8761276a889bde8be038e23212f8730eba 100644 (file)
--- a/drivers/video/backlight/adp8860_bl.c
+++ b/drivers/video/backlight/adp8860_bl.c
@@ -249,12 +249,14 @@ static int adp8860_led_probe(struct i2c_client *client)
                if (led_dat->id > 7 || led_dat->id < 1) {
                        dev_err(&client->dev, "Invalid LED ID %d\n",
                                led_dat->id);
+                       ret = -EINVAL;
                        goto err;
                }
 
                if (pdata->bl_led_assign & (1 << (led_dat->id - 1))) {
                        dev_err(&client->dev, "LED %d used by Backlight\n",
                                led_dat->id);
+                       ret = -EBUSY;
                        goto err;
                }
 
@@ -773,25 +775,29 @@ static int adp8860_remove(struct i2c_client *client)
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int adp8860_i2c_suspend(struct i2c_client *client, pm_message_t message)
+#ifdef CONFIG_PM_SLEEP
+static int adp8860_i2c_suspend(struct device *dev)
 {
+       struct i2c_client *client = to_i2c_client(dev);
+
        adp8860_clr_bits(client, ADP8860_MDCR, NSTBY);
 
        return 0;
 }
 
-static int adp8860_i2c_resume(struct i2c_client *client)
+static int adp8860_i2c_resume(struct device *dev)
 {
+       struct i2c_client *client = to_i2c_client(dev);
+
        adp8860_set_bits(client, ADP8860_MDCR, NSTBY | BLEN);
 
        return 0;
 }
-#else
-#define adp8860_i2c_suspend NULL
-#define adp8860_i2c_resume NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(adp8860_i2c_pm_ops, adp8860_i2c_suspend,
+                       adp8860_i2c_resume);
+
 static const struct i2c_device_id adp8860_id[] = {
        { "adp8860", adp8860 },
        { "adp8861", adp8861 },
@@ -802,12 +808,11 @@ MODULE_DEVICE_TABLE(i2c, adp8860_id);
 
 static struct i2c_driver adp8860_driver = {
        .driver = {
-               .name = KBUILD_MODNAME,
+               .name   = KBUILD_MODNAME,
+               .pm     = &adp8860_i2c_pm_ops,
        },
        .probe    = adp8860_probe,
        .remove   = adp8860_remove,
-       .suspend = adp8860_i2c_suspend,
-       .resume  = adp8860_i2c_resume,
        .id_table = adp8860_id,
 };