tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[ARM] 5044/1: pwm_bl: add init/notify/exit callbacks
This allows platform code to manipulate GPIOs and brightness level as
needed.
Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
authored by
Philipp Zabel
and committed by
Russell King
3b73125a
4a730719
+35
-7
+32
-7
drivers/video/backlight/pwm_bl.c
+32
-7
drivers/video/backlight/pwm_bl.c
···
23
23
struct pwm_bl_data {
24
24
struct pwm_device *pwm;
25
25
unsigned int period;
26
+
int (*notify)(int brightness);
26
27
};
27
28
28
29
static int pwm_backlight_update_status(struct backlight_device *bl)
···
37
36
38
37
if (bl->props.fb_blank != FB_BLANK_UNBLANK)
39
38
brightness = 0;
39
+
40
+
if (pb->notify)
41
+
brightness = pb->notify(brightness);
40
42
41
43
if (brightness == 0) {
42
44
pwm_config(pb->pwm, 0, pb->period);
···
66
62
struct platform_pwm_backlight_data *data = pdev->dev.platform_data;
67
63
struct backlight_device *bl;
68
64
struct pwm_bl_data *pb;
65
+
int ret;
69
66
70
67
if (!data)
71
68
return -EINVAL;
72
69
70
+
if (data->init) {
71
+
ret = data->init(&pdev->dev);
72
+
if (ret < 0)
73
+
return ret;
74
+
}
75
+
73
76
pb = kzalloc(sizeof(*pb), GFP_KERNEL);
74
-
if (!pb)
75
-
return -ENOMEM;
77
+
if (!pb) {
78
+
ret = -ENOMEM;
79
+
goto err_alloc;
80
+
}
76
81
77
82
pb->period = data->pwm_period_ns;
83
+
pb->notify = data->notify;
78
84
79
85
pb->pwm = pwm_request(data->pwm_id, "backlight");
80
86
if (pb->pwm == NULL) {
81
87
dev_err(&pdev->dev, "unable to request PWM for backlight\n");
82
-
kfree(pb);
83
-
return -EBUSY;
88
+
ret = -EBUSY;
89
+
goto err_pwm;
84
90
}
85
91
86
92
bl = backlight_device_register(pdev->name, &pdev->dev,
87
93
pb, &pwm_backlight_ops);
88
94
if (IS_ERR(bl)) {
89
95
dev_err(&pdev->dev, "failed to register backlight\n");
90
-
pwm_free(pb->pwm);
91
-
kfree(pb);
92
-
return PTR_ERR(bl);
96
+
ret = PTR_ERR(bl);
97
+
goto err_bl;
93
98
}
94
99
95
100
bl->props.max_brightness = data->max_brightness;
···
107
94
108
95
platform_set_drvdata(pdev, bl);
109
96
return 0;
97
+
98
+
err_bl:
99
+
pwm_free(pb->pwm);
100
+
err_pwm:
101
+
kfree(pb);
102
+
err_alloc:
103
+
if (data->exit)
104
+
data->exit(&pdev->dev);
105
+
return ret;
110
106
}
111
107
112
108
static int pwm_backlight_remove(struct platform_device *pdev)
113
109
{
110
+
struct platform_pwm_backlight_data *data = pdev->dev.platform_data;
114
111
struct backlight_device *bl = platform_get_drvdata(pdev);
115
112
struct pwm_bl_data *pb = dev_get_drvdata(&bl->dev);
116
113
···
129
106
pwm_disable(pb->pwm);
130
107
pwm_free(pb->pwm);
131
108
kfree(pb);
109
+
if (data->exit)
110
+
data->exit(&pdev->dev);
132
111
return 0;
133
112
}
134
113