The patch titled
backlight tree versus acpi tree
has been removed from the -mm tree. Its filename was
backlight-tree-versus-acpi-tree.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: backlight tree versus acpi tree
From: Richard Purdie <rpurdie@xxxxxxxxx>
Fix up the sony-laptop driver in git-acpi to work with the recent
changes in the git-backlight tree.
Signed-off-by: Richard Purdie <rpurdie@xxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/misc/sony-laptop.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff -puN drivers/misc/sony-laptop.c~backlight-tree-versus-acpi-tree drivers/misc/sony-laptop.c
--- a/drivers/misc/sony-laptop.c~backlight-tree-versus-acpi-tree
+++ a/drivers/misc/sony-laptop.c
@@ -384,7 +384,7 @@ static void sony_snc_pf_remove(void)
static int sony_backlight_update_status(struct backlight_device *bd)
{
return acpi_callsetfunc(sony_acpi_handle, "SBRT",
- bd->props->brightness + 1, NULL);
+ bd->props.brightness + 1, NULL);
}
static int sony_backlight_get_brightness(struct backlight_device *bd)
@@ -398,11 +398,9 @@ static int sony_backlight_get_brightness
}
static struct backlight_device *sony_backlight_device;
-static struct backlight_properties sony_backlight_properties = {
- .owner = THIS_MODULE,
+static struct backlight_ops sony_backlight_ops = {
.update_status = sony_backlight_update_status,
.get_brightness = sony_backlight_get_brightness,
- .max_brightness = SONY_MAX_BRIGHTNESS - 1,
};
/*
@@ -484,15 +482,17 @@ static int sony_acpi_add(struct acpi_dev
if (ACPI_SUCCESS(acpi_get_handle(sony_acpi_handle, "GBRT", &handle))) {
sony_backlight_device = backlight_device_register("sony", NULL,
NULL,
- &sony_backlight_properties);
+ &sony_backlight_ops);
if (IS_ERR(sony_backlight_device)) {
printk(LOG_PFX "unable to register backlight device\n");
sony_backlight_device = NULL;
- } else
- sony_backlight_properties.brightness =
- sony_backlight_get_brightness
- (sony_backlight_device);
+ } else {
+ sony_backlight_device->props.brightness =
+ sony_backlight_get_brightness(sony_backlight_device);
+ sony_backlight_device->props.max_brightness =
+ SONY_MAX_BRIGHTNESS - 1;
+ }
}
if (sony_snc_pf_add())
_
Patches currently in -mm which might be from rpurdie@xxxxxxxxx are
origin.patch
git-leds.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
