Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[firefly-linux-kernel-4.4.55.git] / drivers / leds / leds-lp8788.c

diff --git a/drivers/leds/leds-lp8788.c b/drivers/leds/leds-lp8788.c
index 4353942c5fd1e1e5099433fa6f5e42cfda9ed763..7c2cb384e7ae74f9250b99bc5d5e16479fdd6c3a 100644 (file)
--- a/drivers/leds/leds-lp8788.c
+++ b/drivers/leds/leds-lp8788.c
@@ -130,9 +130,10 @@ static int lp8788_led_probe(struct platform_device *pdev)
        struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);
        struct lp8788_led_platform_data *led_pdata;
        struct lp8788_led *led;
+       struct device *dev = &pdev->dev;
        int ret;
 
-       led = devm_kzalloc(lp->dev, sizeof(struct lp8788_led), GFP_KERNEL);
+       led = devm_kzalloc(dev, sizeof(struct lp8788_led), GFP_KERNEL);
        if (!led)
                return -ENOMEM;
 
@@ -154,13 +155,13 @@ static int lp8788_led_probe(struct platform_device *pdev)
 
        ret = lp8788_led_init_device(led, led_pdata);
        if (ret) {
-               dev_err(lp->dev, "led init device err: %d\n", ret);
+               dev_err(dev, "led init device err: %d\n", ret);
                return ret;
        }
 
-       ret = led_classdev_register(lp->dev, &led->led_dev);
+       ret = led_classdev_register(dev, &led->led_dev);
        if (ret) {
-               dev_err(lp->dev, "led register err: %d\n", ret);
+               dev_err(dev, "led register err: %d\n", ret);
                return ret;
        }