|
From: Henrique de M. H. <hm...@hm...> - 2006-11-22 20:13:52
|
From: Henrique de Moraes Holschuh <hm...@hm...>
This patch cleans up the recently added backlight device support by Holge=
r
Macht <hm...@su...> to properly init and de-init itself using the ibms
struct as the other "subdrivers" in ibm-acpi.
Signed-off-by: Henrique de Moraes Holschuh <hm...@hm...>
Cc: Holger Macht <hm...@su...>
---
drivers/acpi/ibm_acpi.c | 50 +++++++++++++++++++++++++++++------------=
------
1 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
index 576b09b..96e945c 100644
--- a/drivers/acpi/ibm_acpi.c
+++ b/drivers/acpi/ibm_acpi.c
@@ -395,7 +395,7 @@ struct ibm_struct {
=20
static struct proc_dir_entry *proc_dir =3D NULL;
=20
-static struct backlight_device *ibm_backlight_device;
+static struct backlight_device *ibm_backlight_device =3D NULL;
=20
#define onoff(status,bit) ((status) & (1 << (bit)) ? "on" : "off")
#define enabled(status,bit) ((status) & (1 << (bit)) ? "enabled" : "disa=
bled")
@@ -1634,6 +1634,7 @@ static int brightness_get(struct backlig
return -EIO;
=20
level &=3D 0x7;
+
return level;
}
=20
@@ -1708,6 +1709,33 @@ static int brightness_update_status(stru
return brightness_set(bd->props->brightness);
}
=20
+static struct backlight_properties ibm_backlight_data =3D {
+ .owner =3D THIS_MODULE,
+ .get_brightness =3D brightness_get,
+ .update_status =3D brightness_update_status,
+ .max_brightness =3D 7,
+};
+
+static int brightness_init(void)
+{
+ ibm_backlight_device =3D backlight_device_register("ibm", NULL,
+ &ibm_backlight_data);
+ if (IS_ERR(ibm_backlight_device)) {
+ printk(IBM_ERR "Could not register backlight device\n");
+ return PTR_ERR(ibm_backlight_device);
+ }
+
+ return 0;
+}
+
+static void brightness_exit(void)
+{
+ if (ibm_backlight_device) {
+ backlight_device_unregister(ibm_backlight_device);
+ ibm_backlight_device =3D NULL;
+ }
+}
+
static int volume_offset =3D 0x30;
=20
static int volume_read(char *p)
@@ -2370,6 +2398,8 @@ static struct ibm_struct ibms[] =3D {
.name =3D "brightness",
.read =3D brightness_read,
.write =3D brightness_write,
+ .init =3D brightness_init,
+ .exit =3D brightness_exit,
},
{
.name =3D "volume",
@@ -2632,20 +2662,10 @@ IBM_PARAM(brightness);
IBM_PARAM(volume);
IBM_PARAM(fan);
=20
-static struct backlight_properties ibm_backlight_data =3D {
- .owner =3D THIS_MODULE,
- .get_brightness =3D brightness_get,
- .update_status =3D brightness_update_status,
- .max_brightness =3D 7,
-};
-
static void acpi_ibm_exit(void)
{
int i;
=20
- if (ibm_backlight_device)
- backlight_device_unregister(ibm_backlight_device);
-
for (i =3D ARRAY_SIZE(ibms) - 1; i >=3D 0; i--)
ibm_exit(&ibms[i]);
=20
@@ -2746,14 +2766,6 @@ static int __init acpi_ibm_init(void)
}
}
=20
- ibm_backlight_device =3D backlight_device_register("ibm", NULL,
- &ibm_backlight_data);
- if (IS_ERR(ibm_backlight_device)) {
- printk(IBM_ERR "Could not register ibm backlight device\n");
- ibm_backlight_device =3D NULL;
- acpi_ibm_exit();
- }
-
return 0;
}
=20
|
