 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_cpu_pstate.c,v 1.25 2010/08/16 20:07:57 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_pstate.c,v 1.26 2010/08/16 20:20:44 jruoho Exp $ */
 /*-
  * Copyright (c) 2010 Jukka Ruohonen <jruohonen@iki.fi>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -17,27 +17,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_pstate.c,v 1.25 2010/08/16 20:07:57 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_pstate.c,v 1.26 2010/08/16 20:20:44 jruoho Exp $");
 #include <sys/param.h>
 #include <sys/evcnt.h>
 #include <sys/kmem.h>
 #include <sys/once.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/acpi/acpi_cpu.h>
 #define _COMPONENT	 ACPI_BUS_COMPONENT
 ACPI_MODULE_NAME	 ("acpi_cpu_pstate")
 @@ -660,30 +660,26 @@ acpicpu_pstate_pct(struct acpicpu_softc
 				rv = AE_AML_BAD_RESOURCE_VALUE;
 				goto out;
+			}
 			if (width != 8 && width != 16 && width != 32) {
 				rv = AE_AML_BAD_RESOURCE_VALUE;
 				goto out;
+			}
 			break;
 		case ACPI_ADR_SPACE_FIXED_HARDWARE:
 			/*
 			 * With XPSS the _PCT registers incorporate
 			 * the addresses of the appropriate MSRs.
 			 */
 			if ((sc->sc_flags & ACPICPU_FLAG_P_XPSS) != 0) {
 				if (reg[i]->reg_bitwidth != 64) {
 					rv = AE_AML_BAD_RESOURCE_VALUE;
 					goto out;
+				}
 				if (reg[i]->reg_bitoffset != 0) {
 					rv = AE_AML_BAD_RESOURCE_VALUE;
 					goto out;
+				}
 				break;
 @@ -705,28 +701,28 @@ acpicpu_pstate_pct(struct acpicpu_softc
 	if (reg[0]->reg_spaceid != reg[1]->reg_spaceid) {
 		rv = AE_AML_INVALID_SPACE_ID;
 		goto out;
+	}
 	(void)memcpy(&sc->sc_pstate_control, reg[0], size);
 	(void)memcpy(&sc->sc_pstate_status,  reg[1], size);
 	if ((sc->sc_flags & ACPICPU_FLAG_P_XPSS) == 0)
 		goto out;
 	/*
 	 * In XPSS the control address can not be zero,
-	 * but the status address may be. Comparable to
+	 * but the status address may be. In this case,
-	 * T-states, in this we can ignore the status
+	 * comparable to T-states, we can ignore the status
 	 * check during the P-state (FFH) transition.
 	 */
 	if (sc->sc_pstate_control.reg_addr == 0) {
 		rv = AE_AML_BAD_RESOURCE_LENGTH;
 		goto out;
+	}
 	/*
 	 * If XPSS is present, copy the MSR addresses
 	 * to the P-state structures for convenience.
 	 */
 	for (i = 0; i < sc->sc_pstate_count; i++) {