Module Name: src
Committed By: pgoyette
Date: Thu Mar 4 03:10:18 UTC 2010
Modified Files:
src/sys/dev/acpi: smbus_acpi.c
Log Message:
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@
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/smbus_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/smbus_acpi.c
diff -u src/sys/dev/acpi/smbus_acpi.c:1.3 src/sys/dev/acpi/smbus_acpi.c:1.4
--- src/sys/dev/acpi/smbus_acpi.c:1.3 Mon Mar 1 13:16:21 2010
+++ src/sys/dev/acpi/smbus_acpi.c Thu Mar 4 03:10:18 2010
@@ -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);
}
