|
@@ -579,11 +579,10 @@ static struct platform_driver fujitsupf_driver = {
|
|
|
|
|
|
static void dmi_check_cb_common(const struct dmi_system_id *id)
|
|
|
{
|
|
|
- acpi_handle handle;
|
|
|
pr_info("Identified laptop model '%s'\n", id->ident);
|
|
|
if (use_alt_lcd_levels == -1) {
|
|
|
- if (ACPI_SUCCESS(acpi_get_handle(NULL,
|
|
|
- "\\_SB.PCI0.LPCB.FJEX.SBL2", &handle)))
|
|
|
+ if (acpi_has_method(NULL,
|
|
|
+ "\\_SB.PCI0.LPCB.FJEX.SBL2"))
|
|
|
use_alt_lcd_levels = 1;
|
|
|
else
|
|
|
use_alt_lcd_levels = 0;
|
|
@@ -646,7 +645,6 @@ static struct dmi_system_id fujitsu_dmi_table[] = {
|
|
|
|
|
|
static int acpi_fujitsu_add(struct acpi_device *device)
|
|
|
{
|
|
|
- acpi_handle handle;
|
|
|
int result = 0;
|
|
|
int state = 0;
|
|
|
struct input_dev *input;
|
|
@@ -695,8 +693,7 @@ static int acpi_fujitsu_add(struct acpi_device *device)
|
|
|
|
|
|
fujitsu->dev = device;
|
|
|
|
|
|
- if (ACPI_SUCCESS
|
|
|
- (acpi_get_handle(device->handle, METHOD_NAME__INI, &handle))) {
|
|
|
+ if (acpi_has_method(device->handle, METHOD_NAME__INI)) {
|
|
|
vdbg_printk(FUJLAPTOP_DBG_INFO, "Invoking _INI\n");
|
|
|
if (ACPI_FAILURE
|
|
|
(acpi_evaluate_object
|
|
@@ -796,7 +793,6 @@ static void acpi_fujitsu_notify(struct acpi_device *device, u32 event)
|
|
|
|
|
|
static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
|
|
|
{
|
|
|
- acpi_handle handle;
|
|
|
int result = 0;
|
|
|
int state = 0;
|
|
|
struct input_dev *input;
|
|
@@ -859,8 +855,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
|
|
|
|
|
|
fujitsu_hotkey->dev = device;
|
|
|
|
|
|
- if (ACPI_SUCCESS
|
|
|
- (acpi_get_handle(device->handle, METHOD_NAME__INI, &handle))) {
|
|
|
+ if (acpi_has_method(device->handle, METHOD_NAME__INI)) {
|
|
|
vdbg_printk(FUJLAPTOP_DBG_INFO, "Invoking _INI\n");
|
|
|
if (ACPI_FAILURE
|
|
|
(acpi_evaluate_object
|