diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-11 16:45:41 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-11 16:45:43 +1100 |
| commit | 2bcae7925413156780f0bc00b3a3b20a0e09c948 (patch) | |
| tree | 71c6f9d388e95490096c2e24fb7b5331cc947912 /drivers/video/backlight/kb3886_bl.c | |
| parent | 80d50b9fca54d3014895f492f2cf291251d41f6d (diff) | |
| parent | 7c5598d4c8740214860372b6e6114f2675d68429 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/x86/mm/init.c
fs/anon_inodes.c
fs/autofs4/inode.c
include/linux/lglock.h
kernel/Makefile
scripts/bloat-o-meter
Diffstat (limited to 'drivers/video/backlight/kb3886_bl.c')
| -rw-r--r-- | drivers/video/backlight/kb3886_bl.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c index bca6ccc74dfb..7592cc25c963 100644 --- a/drivers/video/backlight/kb3886_bl.c +++ b/drivers/video/backlight/kb3886_bl.c @@ -141,7 +141,7 @@ static const struct backlight_ops kb3886bl_ops = { static int kb3886bl_probe(struct platform_device *pdev) { struct backlight_properties props; - struct kb3886bl_machinfo *machinfo = pdev->dev.platform_data; + struct kb3886bl_machinfo *machinfo = dev_get_platdata(&pdev->dev); bl_machinfo = machinfo; if (!machinfo->limit_mask) @@ -150,10 +150,10 @@ static int kb3886bl_probe(struct platform_device *pdev) memset(&props, 0, sizeof(struct backlight_properties)); props.type = BACKLIGHT_RAW; props.max_brightness = machinfo->max_intensity; - kb3886_backlight_device = backlight_device_register("kb3886-bl", - &pdev->dev, NULL, - &kb3886bl_ops, - &props); + kb3886_backlight_device = devm_backlight_device_register(&pdev->dev, + "kb3886-bl", &pdev->dev, + NULL, &kb3886bl_ops, + &props); if (IS_ERR(kb3886_backlight_device)) return PTR_ERR(kb3886_backlight_device); @@ -166,18 +166,8 @@ static int kb3886bl_probe(struct platform_device *pdev) return 0; } -static int kb3886bl_remove(struct platform_device *pdev) -{ - struct backlight_device *bd = platform_get_drvdata(pdev); - - backlight_device_unregister(bd); - - return 0; -} - static struct platform_driver kb3886bl_driver = { .probe = kb3886bl_probe, - .remove = kb3886bl_remove, .driver = { .name = "kb3886-bl", .pm = &kb3886bl_pm_ops, |