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

From: Hans de Goede <hdegoede@redhat.com>
To: Darren Hart <dvhart@infradead.org>,
	"Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: "Matthew Garrett" <mjg59@srcf.ucam.org>,
	"Hans de Goede" <hdegoede@redhat.com>,
	"Ike Panhc" <ike.pan@canonical.com>,
	linux-acpi@vger.kernel.org, ibm-acpi-devel@lists.sourceforge.net,
	acpi4asus-user@lists.sourceforge.net,
	"Henrique de Moraes Holschuh" <ibm-acpi@hmh.eng.br>,
	dri-devel@lists.freedesktop.org,
	"Azael Avalos" <coproscefalo@gmail.com>,
	"Lee Chun-Yi" <jlee@suse.com>,
	"Mattia Dongili" <malattia@linux.it>,
	"Cezary Jackiewicz" <cezary.jackiewicz@gmail.com>,
	"Ben Skeggs" <bskeggs@redhat.com>,
	"Corentin Chary" <corentin.chary@gmail.com>,
	"Pali Rohár" <pali.rohar@gmail.com>,
	platform-driver-x86@vger.kernel.org,
	"Aaron Lu" <aaron.lu@intel.com>
Subject: [PATCH v2 30/32] toshiba-acpi: Port to new backlight interface selection API
Date: Fri, 12 Jun 2015 13:23:49 +0200	[thread overview]
Message-ID: <1434108231-12323-31-git-send-email-hdegoede@redhat.com> (raw)
In-Reply-To: <1434108231-12323-1-git-send-email-hdegoede@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@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

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
