Commit f673934c authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds

backlight: ot200_bl: use devm_gpio_request()

The devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_gpio_request() for these functions.
Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Acked-by: default avatarChristian Gmeiner <christian.gmeiner@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5f9dd5c9
...@@ -84,7 +84,8 @@ static int ot200_backlight_probe(struct platform_device *pdev) ...@@ -84,7 +84,8 @@ static int ot200_backlight_probe(struct platform_device *pdev)
int retval = 0; int retval = 0;
/* request gpio */ /* request gpio */
if (gpio_request(GPIO_DIMM, "ot200 backlight dimmer") < 0) { if (devm_gpio_request(&pdev->dev, GPIO_DIMM,
"ot200 backlight dimmer") < 0) {
dev_err(&pdev->dev, "failed to request GPIO %d\n", GPIO_DIMM); dev_err(&pdev->dev, "failed to request GPIO %d\n", GPIO_DIMM);
return -ENODEV; return -ENODEV;
} }
...@@ -93,8 +94,7 @@ static int ot200_backlight_probe(struct platform_device *pdev) ...@@ -93,8 +94,7 @@ static int ot200_backlight_probe(struct platform_device *pdev)
pwm_timer = cs5535_mfgpt_alloc_timer(7, MFGPT_DOMAIN_ANY); pwm_timer = cs5535_mfgpt_alloc_timer(7, MFGPT_DOMAIN_ANY);
if (!pwm_timer) { if (!pwm_timer) {
dev_err(&pdev->dev, "MFGPT 7 not available\n"); dev_err(&pdev->dev, "MFGPT 7 not available\n");
retval = -ENODEV; return -ENODEV;
goto error_mfgpt_alloc;
} }
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
...@@ -131,8 +131,6 @@ static int ot200_backlight_probe(struct platform_device *pdev) ...@@ -131,8 +131,6 @@ static int ot200_backlight_probe(struct platform_device *pdev)
error_devm_kzalloc: error_devm_kzalloc:
cs5535_mfgpt_free_timer(pwm_timer); cs5535_mfgpt_free_timer(pwm_timer);
error_mfgpt_alloc:
gpio_free(GPIO_DIMM);
return retval; return retval;
} }
...@@ -149,7 +147,6 @@ static int ot200_backlight_remove(struct platform_device *pdev) ...@@ -149,7 +147,6 @@ static int ot200_backlight_remove(struct platform_device *pdev)
MAX_COMP2 - dim_table[100]); MAX_COMP2 - dim_table[100]);
cs5535_mfgpt_free_timer(pwm_timer); cs5535_mfgpt_free_timer(pwm_timer);
gpio_free(GPIO_DIMM);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment