diff --git a/sys/arch/arm/nvidia/tegra124_cpu.c b/sys/arch/arm/nvidia/tegra124_cpu.c index ffc2ff2ec10d..c4586b4924b3 100644 --- a/sys/arch/arm/nvidia/tegra124_cpu.c +++ b/sys/arch/arm/nvidia/tegra124_cpu.c @@ -140,9 +140,14 @@ tegra124_cpu_attach(device_t parent, device_t self, void *aux) config_finalize_register(self, tegra124_cpu_init_cpufreq); } +static in tegra124_cpu_init_done = false + static int tegra124_cpu_init_cpufreq(device_t dev) { + if (tegra124_cpu_init_done) + return 0; + tegra124_speedo_init(); int cpu_node = OF_finddevice("/cpus/cpu@0"); @@ -162,6 +167,8 @@ tegra124_cpu_init_cpufreq(device_t dev) tegra_cpufreq_register(&tegra124_cpufreq_func); + tegra124_cpu_init_done = true; + return 0; } diff --git a/sys/dev/ata/ata_raid.c b/sys/dev/ata/ata_raid.c index c699ea55286d..6aacbcbddb52 100644 --- a/sys/dev/ata/ata_raid.c +++ b/sys/dev/ata/ata_raid.c @@ -176,7 +176,7 @@ ata_raid_finalize(device_t self) ataraid_cd.cd_name); out: - return (1); + return 0; } /* diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c index 68af9a2999a8..c5787f5dbdd2 100644 --- a/sys/dev/raidframe/rf_netbsdkintf.c +++ b/sys/dev/raidframe/rf_netbsdkintf.c @@ -404,7 +404,7 @@ rf_autoconfig(device_t self) RF_ConfigSet_t *config_sets; if (!raidautoconfig || raidautoconfigdone == true) - return (0); + return 0; /* XXX This code can only be run once. */ raidautoconfigdone = true; @@ -432,7 +432,7 @@ rf_autoconfig(device_t self) */ rf_buildroothack(config_sets); - return 1; + return 0; } int diff --git a/sys/dev/sbus/dbri.c b/sys/dev/sbus/dbri.c index 9e131d6e2456..a16c128b62ff 100644 --- a/sys/dev/sbus/dbri.c +++ b/sys/dev/sbus/dbri.c @@ -372,7 +372,7 @@ dbri_attach_sbus(device_t parent, device_t self, void *aux) sc->sc_playing = 0; sc->sc_recording = 0; sc->sc_init_done = 0; - config_finalize_register(self, &dbri_config_interrupts); + config_finalize_register(self, dbri_config_interrupts); return; }