diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2013-01-29 10:48:30 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 10:48:30 +0100 |
| commit | 617677295b53a40d0e54aac4cbbc216ffbc755dd (patch) | |
| tree | 51b9e87213243ed5efff252c8e8d8fec4eebc588 /drivers/video/backlight/tosa_bl.c | |
| parent | time: x86: report_lost_ticks doesn't exist any more (diff) | |
| parent | Merge tag 'regulator-3.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator (diff) | |
| download | linux-dev-617677295b53a40d0e54aac4cbbc216ffbc755dd.tar.xz linux-dev-617677295b53a40d0e54aac4cbbc216ffbc755dd.zip | |
Merge branch 'master' into for-next
Conflicts:
drivers/devfreq/exynos4_bus.c
Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
Diffstat (limited to 'drivers/video/backlight/tosa_bl.c')
| -rw-r--r-- | drivers/video/backlight/tosa_bl.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c index 49342e1d20be..588682cc1614 100644 --- a/drivers/video/backlight/tosa_bl.c +++ b/drivers/video/backlight/tosa_bl.c @@ -78,7 +78,7 @@ static const struct backlight_ops bl_ops = { .update_status = tosa_bl_update_status, }; -static int __devinit tosa_bl_probe(struct i2c_client *client, +static int tosa_bl_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct backlight_properties props; @@ -92,14 +92,12 @@ static int __devinit tosa_bl_probe(struct i2c_client *client, data->comadj = sharpsl_param.comadj == -1 ? COMADJ_DEFAULT : sharpsl_param.comadj; - ret = devm_gpio_request(&client->dev, TOSA_GPIO_BL_C20MA, "backlight"); + ret = devm_gpio_request_one(&client->dev, TOSA_GPIO_BL_C20MA, + GPIOF_OUT_INIT_LOW, "backlight"); if (ret) { dev_dbg(&data->bl->dev, "Unable to request gpio!\n"); return ret; } - ret = gpio_direction_output(TOSA_GPIO_BL_C20MA, 0); - if (ret) - return ret; i2c_set_clientdata(client, data); data->i2c = client; @@ -126,7 +124,7 @@ err_reg: return ret; } -static int __devexit tosa_bl_remove(struct i2c_client *client) +static int tosa_bl_remove(struct i2c_client *client) { struct tosa_bl_data *data = i2c_get_clientdata(client); @@ -163,14 +161,13 @@ static const struct i2c_device_id tosa_bl_id[] = { { }, }; - static struct i2c_driver tosa_bl_driver = { .driver = { .name = "tosa-bl", .owner = THIS_MODULE, }, .probe = tosa_bl_probe, - .remove = __devexit_p(tosa_bl_remove), + .remove = tosa_bl_remove, .suspend = tosa_bl_suspend, .resume = tosa_bl_resume, .id_table = tosa_bl_id, |