[PATCH v2 30/32] toshiba-acpi: Port to new backlight interface selection API

[Hans de Goede]

Hi,

On 06/14/2015 05:15 AM, Azael Avalos wrote:
> Hi Hans,
>
> Sorry for the late reply, I was out of town.
>
> 2015-06-12 5:23 GMT-06:00 Hans de Goede <hdegoede at redhat.com>:
>> Port the backlight selection logic to the new backlight interface
>> selection API.
>>
>> Also fix a compiler warning about bt_present not being initialized.
>>
>> Signed-off-by: Hans de Goede <hdegoede at redhat.com>
>> ---
>>   drivers/platform/x86/toshiba_acpi.c | 9 +++------
>>   1 file changed, 3 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
>> index 9956b990..c484d47 100644
>> --- a/drivers/platform/x86/toshiba_acpi.c
>> +++ b/drivers/platform/x86/toshiba_acpi.c
>> @@ -2640,14 +2640,11 @@ static int toshiba_acpi_setup_backlight(struct toshiba_acpi_dev *dev)
>>           */
>>          if (dev->tr_backlight_supported ||
>>              dmi_check_system(toshiba_vendor_backlight_dmi))
>> -               acpi_video_dmi_promote_vendor();
>> +               acpi_video_set_dmi_backlight_type(acpi_backlight_vendor);
>>
>> -       if (acpi_video_backlight_support())
>> +       if (acpi_video_get_backlight_type() != acpi_backlight_vendor)
>>                  return 0;
>>
>> -       /* acpi-video may have loaded before we called dmi_promote_vendor() */
>> -       acpi_video_unregister_backlight();
>> -
>>          memset(&props, 0, sizeof(props));
>>          props.type = BACKLIGHT_PLATFORM;
>>          props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;
>> @@ -2733,7 +2730,7 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev)
>>          const char *hci_method;
>>          u32 special_functions;
>>          u32 dummy;
>> -       bool bt_present;
>> +       bool bt_present = false;
>>          int ret = 0;
>>
>>          if (toshiba_acpi)
>> --
>> 2.4.2
>>
>
>
> Please drop the last chunk of this patch as commit
> 2b74103547b4dfaac10cd55464cd2bcc26022a66 removed that line,
> other than that:

Done for v3 of the patch-set

> Acked-by: Azael Avalos <coproscefalo at gmail.com>

Thanks,

Hans