d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r199016: acpi: remove 'magic' ivar

Browse Source 
Note that the ivar itself is kept in the stable branches, only its use is
dropped.
This commit is contained in:
Andriy Gapon 2009-12-01 06:11:42 +00:00
parent 0b1a7fea85
commit e9aa44c800
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/stable/8/; revision=199984
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/acpica/acpi_cpu.c
View File

@ -255,7 +255,7 @@ acpi_cpu_probe(device_t dev)
/* Mark this processor as in-use and save our derived id for attach. */
cpu_softc[cpu_id] = (void *)1;
acpi_set_magic(dev, cpu_id);
acpi_set_private(dev, (void*)(intptr_t)cpu_id);
device_set_desc(dev, "ACPI CPU");
return (0);
@ -286,7 +286,7 @@ acpi_cpu_attach(device_t dev)
sc = device_get_softc(dev);
sc->cpu_dev = dev;
sc->cpu_handle = acpi_get_handle(dev);
cpu_id = acpi_get_magic(dev);
cpu_id = (int)(intptr_t)acpi_get_private(dev);
cpu_softc[cpu_id] = sc;
pcpu_data = pcpu_find(cpu_id);
pcpu_data->pc_device = dev;

14
sys/dev/acpica/acpi_ec.c
View File

@ -129,9 +129,6 @@ struct acpi_ec_params {
int uid;
};
/* Indicate that this device has already been probed via ECDT. */
#define DEV_ECDT(x) (acpi_get_magic(x) == (uintptr_t)&acpi_ec_devclass)
/*
* Driver softc.
*/
@ -332,7 +329,6 @@ acpi_ec_ecdt_probe(device_t parent)
params->uid = ecdt->Uid;
acpi_GetInteger(h, "_GLK", &params->glk);
acpi_set_private(child, params);
acpi_set_magic(child, (uintptr_t)&acpi_ec_devclass);
/* Finish the attach process. */
if (device_probe_and_attach(child) != 0)
@ -348,6 +344,7 @@ acpi_ec_probe(device_t dev)
ACPI_STATUS status;
device_t peer;
char desc[64];
int ecdt;
int ret;
struct acpi_ec_params *params;
static char *ec_ids[] = { "PNP0C09", NULL };
@ -362,11 +359,12 @@ acpi_ec_probe(device_t dev)
* duplicate probe.
*/
ret = ENXIO;
params = NULL;
ecdt = 0;
buf.Pointer = NULL;
buf.Length = ACPI_ALLOCATE_BUFFER;
if (DEV_ECDT(dev)) {
params = acpi_get_private(dev);
params = acpi_get_private(dev);
if (params != NULL) {
ecdt = 1;
ret = 0;
} else if (!acpi_disabled("ec") &&
ACPI_ID_PROBE(device_get_parent(dev), dev, ec_ids)) {
@ -439,7 +437,7 @@ acpi_ec_probe(device_t dev)
if (ret == 0) {
snprintf(desc, sizeof(desc), "Embedded Controller: GPE %#x%s%s",
params->gpe_bit, (params->glk) ? ", GLK" : "",
DEV_ECDT(dev) ? ", ECDT" : "");
ecdt ? ", ECDT" : "");
device_set_desc_copy(dev, desc);
}

6
sys/dev/acpica/acpi_hpet.c
View File

@ -61,8 +61,6 @@ static void acpi_hpet_test(struct acpi_hpet_softc *sc);
static char *hpet_ids[] = { "PNP0103", NULL };
#define DEV_HPET(x) (acpi_get_magic(x) == (uintptr_t)&acpi_hpet_devclass)
struct timecounter hpet_timecounter = {
.tc_get_timecount = hpet_get_timecount,
.tc_counter_mask = ~0u,
@ -133,8 +131,6 @@ acpi_hpet_identify(driver_t *driver, device_t parent)
return;
}
/* Record a magic value so we can detect this device later. */
acpi_set_magic(child, (uintptr_t)&acpi_hpet_devclass);
bus_set_resource(child, SYS_RES_MEMORY, 0, hpet->Address.Address,
HPET_MEM_WIDTH);
}
@ -146,7 +142,7 @@ acpi_hpet_probe(device_t dev)
if (acpi_disabled("hpet"))
return (ENXIO);
if (!DEV_HPET(dev) &&
if (acpi_get_handle(dev) != NULL &&
(ACPI_ID_PROBE(device_get_parent(dev), dev, hpet_ids) == NULL ||
device_get_unit(dev) != 0))
return (ENXIO);