summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorGordon Willem Klok <gwk@cvs.openbsd.org>2007-03-26 00:27:44 +0000
committerGordon Willem Klok <gwk@cvs.openbsd.org>2007-03-26 00:27:44 +0000
commit5afbd53b18a20457a5e7c08cadd1b1a6957cd493 (patch)
treecc8a834cf9527c2078d0b487128c990c319d333c /sys
parent94b1bc93ad4f73d739fd82448ba4c15286ceacd6 (diff)
ichss_cookie is a bad name, and should not be a void pointer.
Spotted by Stefan Sperling <stsp AT tsp.in-berlin.de> when reviewing his piix speedstep diff. ok tedu@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/pci/ichpcib.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/i386/pci/ichpcib.c b/sys/arch/i386/pci/ichpcib.c
index e9390053820..fca3d7e2521 100644
--- a/sys/arch/i386/pci/ichpcib.c
+++ b/sys/arch/i386/pci/ichpcib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ichpcib.c,v 1.16 2006/12/12 23:14:27 dim Exp $ */
+/* $OpenBSD: ichpcib.c,v 1.17 2007/03/26 00:27:43 gwk Exp $ */
/*
* Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
*
@@ -82,7 +82,7 @@ struct cfdriver ichpcib_cd = {
#ifndef SMALL_KERNEL
static const char p4hint[] = "Mobile Intel(R) Pentium(R) 4";
-static void *ichss_cookie; /* XXX */
+struct ichpcib_softc *ichss_sc;
extern int setperf_prio;
#endif /* !SMALL_KERNEL */
@@ -159,7 +159,7 @@ ichpcib_attach(struct device *parent, struct device *self, void *aux)
ICH_GEN_PMCON1_SS_EN);
/* Hook into hw.setperf sysctl */
- ichss_cookie = sc;
+ ichss_sc = sc;
cpu_setperf = ichss_setperf;
setperf_prio = 2;
}
@@ -232,13 +232,13 @@ ichss_present(struct pci_attach_args *pa)
void
ichss_setperf(int level)
{
- struct ichpcib_softc *sc = ichss_cookie;
+ struct ichpcib_softc *sc = ichss_sc;
u_int8_t state, ostate, cntl;
int s;
#ifdef DIAGNOSTIC
if (sc == NULL) {
- printf("%s: no cookie", __func__);
+ printf("%s: no ichss_sc", __func__);
return;
}
#endif