]> err.no Git - linux-2.6/commitdiff
pci-acpi: remove unused variable in __pci_osc_support_set
authorKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Thu, 15 May 2008 06:22:35 +0000 (15:22 +0900)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 10 Jun 2008 17:59:48 +0000 (10:59 -0700)
The 'retval' variable in __pci_osc_support_set() is no longer
used. Remove this unused variable.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Acked-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
drivers/pci/pci-acpi.c

index 951021838055ef14238906f6370a05254d2861ce..3f279990cd7e679815bed2209ddca1e7ebcc7746 100644 (file)
@@ -120,7 +120,6 @@ static acpi_status acpi_query_osc(acpi_handle handle,
                                  u32 level, void *context, void **retval)
 {
        acpi_status status;
-       acpi_status *ret_status = (acpi_status *)retval;
        struct acpi_osc_data *osc_data;
        u32 flags = (unsigned long)context, support_set;
        acpi_handle tmp;
@@ -143,8 +142,6 @@ static acpi_status acpi_query_osc(acpi_handle handle,
        osc_args.capbuf[OSC_CONTROL_TYPE] = OSC_CONTROL_MASKS;
 
        status = acpi_run_osc(handle, &osc_args);
-       *ret_status = status;
-
        if (ACPI_SUCCESS(status)) {
                osc_data->support_set = support_set;
                osc_data->query_result = osc_args.query_result;
@@ -164,15 +161,11 @@ static acpi_status acpi_query_osc(acpi_handle handle,
  **/
 acpi_status __pci_osc_support_set(u32 flags, const char *hid)
 {
-       acpi_status retval = AE_NOT_FOUND;
-
-       if (!(flags & OSC_SUPPORT_MASKS)) {
+       if (!(flags & OSC_SUPPORT_MASKS))
                return AE_TYPE;
-       }
-       acpi_get_devices(hid,
-                       acpi_query_osc,
-                       (void *)(unsigned long)flags,
-                       (void **) &retval );
+
+       acpi_get_devices(hid, acpi_query_osc,
+                        (void *)(unsigned long)flags, NULL);
        return AE_OK;
 }