Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/acpi Replace ACPI_FREE() with AcpiOsFree() so we no ...



details:   https://anonhg.NetBSD.org/src/rev/e423631ad059
branches:  trunk
changeset: 752691:e423631ad059
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Thu Mar 04 03:10:18 2010 +0000

description:
Replace ACPI_FREE() with AcpiOsFree() so we no longer need to define
_COMPONENT (we don't have a bit defined for SMBUS anyway).  This was
uncovered by turning on ACPI_DEBUG for the i386 ALL kernel config.

Reported by Greg Woods on current-users@

diffstat:

 sys/dev/acpi/smbus_acpi.c |  15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diffs (64 lines):

diff -r d28b4d252234 -r e423631ad059 sys/dev/acpi/smbus_acpi.c
--- a/sys/dev/acpi/smbus_acpi.c Wed Mar 03 17:58:36 2010 +0000
+++ b/sys/dev/acpi/smbus_acpi.c Thu Mar 04 03:10:18 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: smbus_acpi.c,v 1.3 2010/03/01 13:16:21 jruoho Exp $ */
+/* $NetBSD: smbus_acpi.c,v 1.4 2010/03/04 03:10:18 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbus_acpi.c,v 1.3 2010/03/01 13:16:21 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbus_acpi.c,v 1.4 2010/03/04 03:10:18 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -55,9 +55,6 @@
 
 #include <dev/i2c/i2cvar.h>
 
-#define _COMPONENT          ACPI_SMBUS_COMPONENT
-ACPI_MODULE_NAME            ("acpi_smbus")
-
 /*
  * ACPI SMBus CMI protocol codes
  */
@@ -166,7 +163,7 @@
        }
 done:
        if (smi_buf.Pointer != NULL)
-               ACPI_FREE(smi_buf.Pointer);
+               AcpiOsFree(smi_buf.Pointer);
 
        return r;
 }
@@ -215,7 +212,7 @@
                }
        }
        if (smi_buf.Pointer != NULL)
-               ACPI_FREE(smi_buf.Pointer);
+               AcpiOsFree(smi_buf.Pointer);
 
        /* Install notify handler if possible */
        rv = AcpiInstallNotifyHandler(sc->sc_devnode->ad_handle,
@@ -422,7 +419,7 @@
                }
        }
        if (smbuf.Pointer)
-               ACPI_FREE(smbuf.Pointer);
+               AcpiOsFree(smbuf.Pointer);
 
        return r;
 }
@@ -467,7 +464,7 @@
                }
 done:
                if (alert.Pointer != NULL)
-                       ACPI_FREE(alert.Pointer);
+                       AcpiOsFree(alert.Pointer);
        } while (status == 0);
 }
 



Home | Main Index | Thread Index | Old Index