|
@@ -1509,7 +1509,6 @@ static void sony_nc_function_resume(void)
|
|
|
static int sony_nc_resume(struct device *dev)
|
|
|
{
|
|
|
struct sony_nc_value *item;
|
|
|
- acpi_handle handle;
|
|
|
|
|
|
for (item = sony_nc_values; item->name; item++) {
|
|
|
int ret;
|
|
@@ -1524,15 +1523,13 @@ static int sony_nc_resume(struct device *dev)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "ECON",
|
|
|
- &handle))) {
|
|
|
+ if (acpi_has_method(sony_nc_acpi_handle, "ECON")) {
|
|
|
int arg = 1;
|
|
|
if (sony_nc_int_call(sony_nc_acpi_handle, "ECON", &arg, NULL))
|
|
|
dprintk("ECON Method failed\n");
|
|
|
}
|
|
|
|
|
|
- if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "SN00",
|
|
|
- &handle)))
|
|
|
+ if (acpi_has_method(sony_nc_acpi_handle, "SN00"))
|
|
|
sony_nc_function_resume();
|
|
|
|
|
|
return 0;
|
|
@@ -2690,7 +2687,6 @@ static void sony_nc_backlight_ng_read_limits(int handle,
|
|
|
|
|
|
static void sony_nc_backlight_setup(void)
|
|
|
{
|
|
|
- acpi_handle unused;
|
|
|
int max_brightness = 0;
|
|
|
const struct backlight_ops *ops = NULL;
|
|
|
struct backlight_properties props;
|
|
@@ -2725,8 +2721,7 @@ static void sony_nc_backlight_setup(void)
|
|
|
sony_nc_backlight_ng_read_limits(0x14c, &sony_bl_props);
|
|
|
max_brightness = sony_bl_props.maxlvl - sony_bl_props.offset;
|
|
|
|
|
|
- } else if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "GBRT",
|
|
|
- &unused))) {
|
|
|
+ } else if (acpi_has_method(sony_nc_acpi_handle, "GBRT")) {
|
|
|
ops = &sony_backlight_ops;
|
|
|
max_brightness = SONY_MAX_BRIGHTNESS - 1;
|
|
|
|
|
@@ -2758,7 +2753,6 @@ static int sony_nc_add(struct acpi_device *device)
|
|
|
{
|
|
|
acpi_status status;
|
|
|
int result = 0;
|
|
|
- acpi_handle handle;
|
|
|
struct sony_nc_value *item;
|
|
|
|
|
|
pr_info("%s v%s\n", SONY_NC_DRIVER_NAME, SONY_LAPTOP_DRIVER_VERSION);
|
|
@@ -2798,15 +2792,13 @@ static int sony_nc_add(struct acpi_device *device)
|
|
|
goto outplatform;
|
|
|
}
|
|
|
|
|
|
- if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "ECON",
|
|
|
- &handle))) {
|
|
|
+ if (acpi_has_method(sony_nc_acpi_handle, "ECON")) {
|
|
|
int arg = 1;
|
|
|
if (sony_nc_int_call(sony_nc_acpi_handle, "ECON", &arg, NULL))
|
|
|
dprintk("ECON Method failed\n");
|
|
|
}
|
|
|
|
|
|
- if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "SN00",
|
|
|
- &handle))) {
|
|
|
+ if (acpi_has_method(sony_nc_acpi_handle, "SN00")) {
|
|
|
dprintk("Doing SNC setup\n");
|
|
|
/* retrieve the available handles */
|
|
|
result = sony_nc_handles_setup(sony_pf_device);
|
|
@@ -2829,9 +2821,8 @@ static int sony_nc_add(struct acpi_device *device)
|
|
|
|
|
|
/* find the available acpiget as described in the DSDT */
|
|
|
for (; item->acpiget && *item->acpiget; ++item->acpiget) {
|
|
|
- if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle,
|
|
|
- *item->acpiget,
|
|
|
- &handle))) {
|
|
|
+ if (acpi_has_method(sony_nc_acpi_handle,
|
|
|
+ *item->acpiget)) {
|
|
|
dprintk("Found %s getter: %s\n",
|
|
|
item->name, *item->acpiget);
|
|
|
item->devattr.attr.mode |= S_IRUGO;
|
|
@@ -2841,9 +2832,8 @@ static int sony_nc_add(struct acpi_device *device)
|
|
|
|
|
|
/* find the available acpiset as described in the DSDT */
|
|
|
for (; item->acpiset && *item->acpiset; ++item->acpiset) {
|
|
|
- if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle,
|
|
|
- *item->acpiset,
|
|
|
- &handle))) {
|
|
|
+ if (acpi_has_method(sony_nc_acpi_handle,
|
|
|
+ *item->acpiset)) {
|
|
|
dprintk("Found %s setter: %s\n",
|
|
|
item->name, *item->acpiset);
|
|
|
item->devattr.attr.mode |= S_IWUSR;
|